689 Commits

Author	SHA1	Message	Date
owen	cafa938ff4	common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间	2023-09-30 22:21:47 +08:00
owen	e7876b1520	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2023-09-30 22:09:49 +08:00
owen	d2c5eaf916	优惠券：重构是否领取检查方式	2023-09-30 22:05:11 +08:00
owen	aaa01de21d	分销：修改佣金排名查询算法	2023-09-30 19:55:18 +08:00
owen	d0d21b2787	优惠券：新增/修改时，校验对应的商品、分类是否存在	2023-09-30 19:39:02 +08:00
owen	42a899c5d3	交易：订单增加字段 推广人编号	2023-09-30 17:49:38 +08:00
owen	fc432ba073	优惠券：新人券使用 MQ 发放	2023-09-30 17:29:32 +08:00
YunaiV	367b45e3bd	code review：数据统计	2023-09-30 12:30:01 +08:00
owen	6b7f071988	Review代码修改	2023-09-29 22:47:04 +08:00
owen	26628913cb	错误码分段	2023-09-29 21:34:38 +08:00
owen	929ff4286a	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2023-09-29 21:08:49 +08:00
owen	171161e6c7	统计：交易统计	2023-09-29 21:08:15 +08:00
YunaiV	9ee0aebd3f	promotion：增加 coupon 的 code review	2023-09-29 20:52:11 +08:00
YunaiV	666ba351a2	trade：退款理由的维护	2023-09-29 13:35:40 +08:00
YunaiV	3c643f814c	trade：补全售后日志的记录	2023-09-29 11:46:43 +08:00
YunaiV	d402bdb7e0	trade：优化售后取消订单的实现代码	2023-09-29 10:08:20 +08:00
YunaiV	f9bf41d773	code review：分佣剩余部分的 review	2023-09-28 22:22:38 +08:00
YunaiV	b1ce971a2f	code review：解决分佣的 npe 问题	2023-09-28 16:39:07 +08:00
YunaiV	9cd36abf10	同步 master 分支代码	2023-09-28 15:28:40 +08:00
YunaiV	5913ee0706	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java # yudao-server/src/main/resources/application-local.yaml	2023-09-28 15:18:59 +08:00
YunaiV	eeb8873b1d	trade：微调交易配置的注释	2023-09-28 15:10:56 +08:00
YunaiV	9e3564bd6a	code review：优惠劵逻辑	2023-09-28 09:23:42 +08:00
owen	b2c608e7a5	交易：发货订单日志	2023-09-27 21:27:55 +08:00
owen	565a8e0e6b	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2023-09-27 21:24:37 +08:00
YunaiV	b9018baa03	trade：简化价格调整的逻辑	2023-09-27 19:14:48 +08:00
YunaiV	c5f2d07c87	商城：增加 stat 统计设计	2023-09-27 19:14:32 +08:00
YunaiV	26dfbfb2ac	trade：发货逻辑，增加订单日志	2023-09-27 09:55:04 +08:00
owen	be426235dd	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2023-09-27 01:20:40 +08:00
owen	bc07e1dbf4	售后：重构售后更新订单的逻辑	2023-09-27 01:19:49 +08:00
owen	74ef98f8fc	售后：售后成功后，回滚 SKU 库存	2023-09-27 00:24:22 +08:00
owen	2766dd672a	优惠券：过期定时任务	2023-09-27 00:15:12 +08:00
owen	11ffa45b89	积分：Review代码修改	2023-09-26 23:54:43 +08:00
YunaiV	53bd1b9ec1	trade：订单评论超时时，自动评论	2023-09-26 23:50:54 +08:00
owen	cd2d0b7089	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2023-09-26 23:23:12 +08:00
owen	77f7763560	优惠券：完善优惠券领取接口	2023-09-26 23:21:01 +08:00
YunaiV	cf41347cb3	trade：支付订单成功时，记录订单日志	2023-09-26 22:48:21 +08:00
owen	b1ac3a0b8b	优惠券：完善优惠券匹配接口	2023-09-26 22:46:06 +08:00
owen	f9aec7d8fd	优惠券：完善我的优惠券接口	2023-09-26 21:08:11 +08:00
YunaiV	debf568750	code review：增加取消售后的优化建议	2023-09-26 20:57:10 +08:00
owen	0a3a6825d5	优惠券：完善APP优惠券查询接口	2023-09-26 20:44:22 +08:00
YunaiV	ad535e674f	trade：积分相关的价格计算	2023-09-26 20:11:54 +08:00
YunaiV	a8c78f3097	trade：增加自动收货的 job	2023-09-26 19:27:37 +08:00
owen	a431bccc02	分销：Review代码修改	2023-09-26 15:11:48 +08:00
YunaiV	826d792ff2	trade：增加自动取消的 job	2023-09-26 00:04:11 +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