496 Commits

Author	SHA1	Message	Date
YunaiV	826d792ff2	trade：增加自动取消的 job	2023-09-26 00:04:11 +08:00
puhui999	bce96b29a6	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java	2023-09-25 15:06:57 +08:00
puhui999	42c47d9b44	秒回活动：订单金额计算初步设计	2023-09-25 14:56:56 +08:00
YunaiV	e384b810bf	code review：分销逻辑	2023-09-25 09:39:39 +08:00
owen	16af31d980	分销：@Select sql语句增加逻辑删除字段过滤	2023-09-25 08:36:55 +08:00
owen	3dca66eefa	分销：提现统计	2023-09-25 08:05:29 +08:00
owen	0b84c18736	分销：修正分享海报	2023-09-24 23:18:51 +08:00
owen	967e578d54	分销：重命名提现类型字段	2023-09-24 22:32:13 +08:00
owen	9856e17974	分销：根据商品，计算推广员可以得到的佣金	2023-09-24 22:27:24 +08:00
owen	e9fd377772	分销：Review代码修改	2023-09-24 20:28:44 +08:00
YunaiV	421bb7d154	code review：分销逻辑	2023-09-24 11:56:00 +08:00
owen	f7296d18b9	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java	2023-09-24 10:10:53 +08:00
YunaiV	b4587fd79e	product：订单表，增加 vip 优惠字段	2023-09-24 00:45:32 +08:00
YunaiV	53e789dfdc	trade：订单表，增加 vip 优惠字段	2023-09-23 23:58:22 +08:00
YunaiV	aa5525d1f5	code review：营销活动 & 交易订单的对接	2023-09-23 22:21:23 +08:00
YunaiV	1da14a3f53	trade：删除订单的实现	2023-09-23 20:23:28 +08:00
YunaiV	a9485ad6bf	trade：取消订单、确认收货，增加订单日志	2023-09-23 18:13:35 +08:00
YunaiV	e9c9ac0cab	trade：确认收货时，增加订单日志	2023-09-23 17:47:39 +08:00
owen	052328c5fa	积分：完善积分获得、退还、使用 相关逻辑	2023-09-23 14:11:16 +08:00
YunaiV	71d6311bd4	code review：拼团、秒杀等逻辑	2023-09-23 09:27:29 +08:00
芋道源码	54fe0174bc	!625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口 ... Merge pull request !625 from puhui999/feature/mall_product	2023-09-23 01:03:00 +00:00
YunaiV	9451342aae	trade：营销商品（拼团、砍价）不能使用优惠劵	2023-09-22 23:54:18 +08:00
owen	dc46dff62c	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate	2023-09-22 23:15:31 +08:00
owen	bbd18afbcc	分佣: 简化推广用户关系树查询方式	2023-09-22 23:13:39 +08:00
owen	6e6486ccae	Trade: 完善配置	2023-09-22 22:51:46 +08:00
owen	ad0513c87c	分佣: 推广人列表	2023-09-22 22:12:15 +08:00
YunaiV	7c4fbc63dc	trade：物流费用计算，增加金额 divide 分拆逻辑	2023-09-22 21:56:09 +08:00
owen	ee15b802b2	分佣: 推广人排行	2023-09-22 21:12:09 +08:00
owen	972b01c001	分佣: 佣金排行	2023-09-22 20:55:05 +08:00
owen	7a8a440eb6	分佣: 佣金记录	2023-09-22 18:49:26 +08:00
owen	eddc897cd8	分佣: 提现记录	2023-09-22 18:48:16 +08:00
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
puhui999	6ef94ade6a	完善订单和活动 review 提到的问题	2023-09-20 16:06:29 +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
owen	a3e161a9a3	trade: 分销业务review代码修改	2023-09-19 16:50:43 +08:00
owen	a3e8b42be6	trade: 分销业务review代码修改	2023-09-19 16:37:51 +08:00