605 Commits

Author	SHA1	Message	Date
owen	637ae8ce1d	分佣: 提现记录	2023-09-22 18:35:43 +08:00
owen	c146c98b72	分佣: 提现	2023-09-22 18:06:11 +08:00
owen	f72a087007	分佣: 我的推广统计接口	2023-09-22 15:42:59 +08:00
owen	a7de955926	trade: 分销业务 - 提现申请	2023-09-22 00:27:45 +08:00
owen	5ed99a9105	trade: 分销业务 - 整理包名	2023-09-22 00:26:32 +08:00
YunaiV	5949727c8d	trade：全局配送价格配置	2023-09-21 22:02:22 +08:00
YunaiV	35569c5ec8	trade：下单时，如果是门店自提，增加核销码的生成	2023-09-20 23:21:00 +08:00
YunaiV	1b477aaa0d	trade：优化下单逻辑的实现	2023-09-20 20:21:41 +08:00
YunaiV	c766f7daa5	code review：砍价、秒杀的逻辑	2023-09-20 01:07:41 +08:00
YunaiV	2278ad4652	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-20 00:03:18 +08:00
YunaiV	962f2bbf69	code review：提现逻辑	2023-09-19 23:58:16 +08:00
芋道源码	de7699d972	!624 trade: 分销业务 - 佣金提现 ... Merge pull request !624 from 疯狂的世界/brokerate	2023-09-19 14:25:43 +00:00
owen	e22c577f7a	trade: 分销业务 - 佣金提现后台管理	2023-09-19 22:20:32 +08:00
YunaiV	8cfb738db3	code review：分销逻辑	2023-09-19 22:16:25 +08:00
owen	32e1fc66ce	trade: 分销业务 - 佣金提现后台管理	2023-09-19 22:03:28 +08:00
puhui999	04a391cd4b	Merge remote-tracking branch 'yudao/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/CombinationActivityApiImpl.java	2023-09-19 18:58:53 +08:00
puhui999	408df683d8	秒杀活动: 完善 app 端获取活动分页、列表、详情接口	2023-09-19 18:57: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
puhui999	af6016bba5	砍价活动: 完善 app 端获取活动分页、列表、详情接口	2023-09-19 16:35:21 +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
puhui999	a10d77cdfe	mall+order: 完善部分 TODO 提到的问题	2023-09-13 12:04:13 +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