587 Commits

Author	SHA1	Message	Date
owen	32e1fc66ce	trade: 分销业务 - 佣金提现后台管理	2023-09-19 22:03:28 +08:00
owen	a3e161a9a3	trade: 分销业务review代码修改	2023-09-19 16:50:43 +08:00
owen	a3e8b42be6	trade: 分销业务review代码修改	2023-09-19 16:37:51 +08:00
jason	ebd4ea548c	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationApiImpl.java	2023-09-14 16:59:05 +08:00
jason	0e1b8126dd	新增钱包充值。启动报错修复	2023-09-14 16:55:31 +08:00
YunaiV	1b9a3f9f63	code review：调整操作日志的封装	2023-09-13 23:25:52 +08:00
YunaiV	9358639c41	code review：订单部分逻辑	2023-09-12 23:01:12 +08:00
YunaiV	e8bdd8349c	code review：订单部分逻辑	2023-09-12 13:54:52 +08:00
YunaiV	bdd81e4cbc	Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java	2023-09-12 12:22:55 +08:00
YunaiV	82c6354e1d	code review：分销逻辑	2023-09-12 09:20:42 +08:00
puhui999	254d7828aa	mall+order: 订单活动特殊逻辑的抽离	2023-09-11 17:48:01 +08:00
owen	77daa0085e	trade: 分销业务review代码修改	2023-09-11 00:54:12 +08:00
puhui999	7fb455096c	商城活动: 完善活动商品并发库存扣减逻辑	2023-09-11 00:13:45 +08:00
owen	cddeb37289	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java	2023-09-10 23:56:00 +08:00
owen	290d1671a2	trade: 分销业务后台功能：推广订单列表	2023-09-10 23:36:38 +08:00
owen	6c193f723f	trade: 分销业务后台功能：推广订单列表	2023-09-10 23:30:43 +08:00
puhui999	3976011af0	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-09-10 22:54:01 +08:00
owen	499a054eb9	trade: 分销业务后台功能：推广用户列表	2023-09-10 22:32:39 +08:00
puhui999	57f0ea04f7	mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）	2023-09-10 11:06:39 +08:00
puhui999	c023209aa5	订单管理：完善订单调价分摊逻辑	2023-09-10 00:50:13 +08:00
puhui999	51dab96889	支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突	2023-09-10 00:48:30 +08:00
puhui999	50354462fe	spu：分佣属性和分佣保持一致	2023-09-09 23:18:09 +08:00
puhui999	95d8be0455	订单管理：完善订单聚合搜索	2023-09-09 23:04:13 +08:00
YunaiV	4265441e1d	分销：增加商品的分佣金额计算 api mock	2023-09-09 22:28:01 +08:00
YunaiV	a47d744f64	分销：绑定分销的 url 调整	2023-09-09 21:05:44 +08:00
owen	797680895b	trade: 分销业务后台功能：佣金格式化	2023-09-09 20:00:57 +08:00
YunaiV	426594ae00	分销：调整 app 的 price 到 brokeragePrice	2023-09-09 19:34:50 +08:00
owen	643602d038	trade: 分销业务后台功能：修改上级推广人	2023-09-09 19:20:12 +08:00
owen	ca55e61dd2	trade: 分销业务后台功能：清除推广员、修改推广资格	2023-09-09 14:38:47 +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
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
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	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