Commit Graph

4861 Commits

Author SHA1 Message Date
YunaiV 4265441e1d 分销:增加商品的分佣金额计算 api mock 2023-09-09 22:28:01 +08:00
YunaiV a47d744f64 分销:绑定分销的 url 调整 2023-09-09 21:05:44 +08:00
YunaiV cd51d57f12 分销:调整 app 的 price 到 brokeragePrice 2023-09-09 19:42:53 +08:00
YunaiV 426594ae00 分销:调整 app 的 price 到 brokeragePrice 2023-09-09 19:34:50 +08:00
jason 5858f57fe9 钱包 review 修改 2023-09-09 18:32:53 +08:00
YunaiV 557b09a157 code review:分销逻辑 2023-09-09 09:41:57 +08:00
芋道源码 3b5215db21
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
2023-09-09 00:48:00 +00:00
owen 4e9be7a181 trade: 分销业务后台功能:修改推广资格 2023-09-09 01:58:46 +08:00
owen 259734964d trade: 分销业务后台功能:清除推广员、修改推广员 2023-09-09 01:54:48 +08:00
owen f97c7a0f6e trade: 分销业务绑定推广员 2023-09-09 01:46:42 +08:00
YunaiV 87c55784c4 code review:营销活动+订单 2023-09-09 01:27:55 +08:00
芋道源码 5235aff8ad
!610 营销活动+订单:完善大部分 TODO 提到的问题
Merge pull request !610 from puhui999/feature/mall_product
2023-09-08 15:36:51 +00:00
owen 6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
owen 1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen 4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:05 +08:00
YunaiV 3e09da0128 code review:支付钱包 2023-09-08 22:47:00 +08:00
owen f36a6c5d6c trade: 优化修改推广员接口字段名称 2023-09-08 22:40:49 +08:00
owen b85d660a5c trade: 分销业务完善校验 2023-09-08 22:33:44 +08:00
owen 0a0c3c0ede trade: 分销业务相关类型移除Trade前缀 2023-09-08 12:56:34 +08:00
owen ddcebb1986 common: MoneyUtils 移到 common 模块 2023-09-08 12:46:43 +08:00
owen 1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
owen 166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
puhui999 5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-08 00:59:53 +08:00
puhui999 0e8755972c 营销活动+订单:完善大部分 TODO 提到的问题 2023-09-08 00:35:54 +08:00
YunaiV 5808f77ade code review:订单分佣 2023-09-08 00:29:25 +08:00
YunaiV b8a4d8cab2 分销:避免报错 2023-09-07 12:29:50 +08:00
YunaiV eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2023-09-06 23:50:55 +08:00
YunaiV 62a4e8242b 分销:增加提现接口 2023-09-06 23:50:23 +08:00
芋道源码 ea26691967
!607 member: 佣金解冻
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
2023-09-06 15:49:39 +00:00
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2023-09-06 21:40:53 +08:00
YunaiV fcca69d243 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com beb385aab4 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2023-09-06 20:04:29 +08:00
puhui999 2591ab5d36 订单中心+营销活动:完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
jason 9074312fe3 后台接入钱包支付 2023-09-06 10:34:24 +08:00
jason 4a0fa2a3a4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-06 08:50:33 +08:00
jason 3f51be6a2d 钱包。删除不需要的类 2023-09-06 08:50:22 +08:00
owen fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
YunaiV e4b153a866 分佣:增加获得分销排行分页 API mock 2023-09-05 23:49:35 +08:00
owen a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
owen 6474502738 trade: 增加交易中心配置表 2023-09-05 22:31:36 +08:00
YunaiV 0329f13fbf 分佣:增加获得分销排行分页 API mock 2023-09-05 21:32:34 +08:00
owen 9eb7837b67 member: 佣金失效 2023-09-05 19:43:07 +08:00
owen a708521b9d member: 佣金解冻 2023-09-05 19:05:01 +08:00
owen 2f6092005b member: 佣金解冻 2023-09-05 18:59:24 +08:00
jason f99e2aec2d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-05 12:44:43 +08:00
jason f3ca0f066b 会员钱包 查询订单和查询退款单的实现 2023-09-05 12:44:34 +08:00
芋道源码 a58d7d63ed
!606 会员:分销佣金计算
Merge pull request !606 from 疯狂的世界/brokerage
2023-09-05 01:58:11 +00:00
owen 090058a2ba member: 佣金不冻结时,直接就是结算状态 2023-09-05 09:27:12 +08:00
owen c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00