szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,404 Commits 13 Branches 41 Tags 244 MiB
Commit Graph

158 Commits

Author SHA1 Message Date
YunaiV 2b681f90ca 【代码评审】商城：拼团失败的取消支付逻辑 2024-08-20 21:18:56 +08:00
puhui999 aff0446a38 【代码优化】商城: 完成取消支付订单 2024-08-20 16:12:24 +08:00
YunaiV ba18788517 【代码优化】SYSTEM：微信小程序的订阅 2024-07-31 19:48:02 +08:00
puhui999 b678da810e 【新增】MALL：拼团结果通知订阅消息 2024-07-31 16:26:08 +08:00
puhui999 0cca6be63a 【新增】MALL: 订单发货订阅消息 2024-07-30 16:55:58 +08:00
YunaiV f46d47a966 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/MessageTemplateConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/MessageTemplateConstants.java
 2024-07-29 19:09:08 +08:00
YunaiV 512d68f793 【代码评审】SYSTEM：订阅消息 2024-07-29 19:03:18 +08:00
puhui999 9a926e251b 【新增】mall: 钱包充值成功发送订阅消息 2024-07-29 17:14:41 +08:00
puhui999 4696105210 【优化】SYSTEM: 根据代码评审优化小程序的订阅消息 2024-07-25 17:37:50 +08:00
YunaiV 7f87f26f3a 【代码评审】SYSTEM：微信小程序的订阅消息 2024-07-24 19:30:28 +08:00
puhui999 8054847b05 【新增】SYSTEM: 发送微信小程序订阅消息测试接口 2024-07-24 17:18:48 +08:00
YunaiV f9a50116bc 【修复】商城系统：管理后台修改待支付订单，调整价格取值错误 2024-05-02 09:13:31 +08:00
zhijiantianya@gmail.com 4b0333f3e9 code review：订单统计 2023-10-17 20:42:22 +08:00
YunaiV 3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
YunaiV fef808d88c code review：统计代码 2023-10-11 12:32:28 +08:00
YunaiV 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-11 11:30:03 +08:00
YunaiV 670a098aa8 code review：拼团记录流程 2023-10-11 11:04:22 +08:00
owen 74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-09 23:33:51 +08:00
puhui999 53e67c0437 拼团活动：完善 review 提到的问题 2023-10-09 11:53:02 +08:00
puhui999 c71bdd158a 拼团活动：完善 review 提到的问题 2023-10-08 17:19:39 +08:00
YunaiV 6a38da4ad9 promotion：合并最新代码 2023-10-07 23:00:13 +08:00
YunaiV c917f01d83 promotion：code review 拼团相关的部分代码 2023-10-07 22:47:45 +08:00
puhui999 6636ee7420 拼团记录(APP)：新增一个取消拼团的接口 2023-10-07 18:46:19 +08:00
puhui999 89b240c1f9 订单：介入 TradeOrderHandler#cancelOrder 2023-10-07 16:58:40 +08:00
puhui999 c485c6e04d 订单：重构拼团下单流程更改为订单支付后再创建拼团记录 2023-10-07 16:30:28 +08:00
owen 383439f902 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-06 14:17:14 +08:00
owen 4f33a0c9c0 统计：交易统计Review修改 2023-10-06 14:15:59 +08:00
芋道源码 a76760c419
!653 完善拼团活动下单流程 
Merge pull request !653 from puhui999/feature/mall_product
 2023-10-06 02:20:21 +00:00
YunaiV 8e7b295d24 trade：砍价记录的详情 100% 2023-10-06 10:17:41 +08:00
puhui999 92da91a7dc 订单：修改订单收货地址添加日志记录 2023-10-06 01:32:57 +08:00
YunaiV 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2023-10-05 17:22:17 +08:00
owen 7a15b340b0 交易：核销 2023-10-04 10:51:36 +08:00
owen 60ea719b46 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
 2023-10-04 09:12:48 +08:00
YunaiV dc1347184f code review：拼团、砍价活动 2023-10-04 00:47:17 +08:00
YunaiV 20f5834d9a trade：价格计算时，接入优惠劵逻辑 2023-10-04 00:30:03 +08:00
owen a9e822762d 统计：交易统计定时任务 2023-10-03 21:21:11 +08:00
YunaiV df4716d5a1 code review：分销 2023-10-03 10:23:40 +08:00
owen b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-02 23:52:25 +08:00
owen d0f0bc5888 分销：调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
YunaiV 6f4c04d944 trade：完善退款详情 2023-10-02 15:44:41 +08:00
puhui999 82210a9583 订单：完善拼团活动 2023-09-30 23:34:45 +08:00
owen 26628913cb 错误码分段 2023-09-29 21:34:38 +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 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 b9018baa03 trade：简化价格调整的逻辑 2023-09-27 19:14:48 +08:00
YunaiV 26dfbfb2ac trade：发货逻辑，增加订单日志 2023-09-27 09:55:04 +08:00
YunaiV 53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00