p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,093 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

5093 Commits

Author SHA1 Message Date
jason 57d782bc94 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-29 14:06:12 +08:00
jason ce6f7ab1b1 Pay: 新增转账示例单 2023-09-29 14:01:58 +08:00
jason aa2f651124 Pay: 转账单实现 2023-09-29 13:50:06 +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
芋道源码 8811ce0200
!637 完善优惠券功能 
Merge pull request !637 from 疯狂的世界/feature/mall_product
 2023-09-28 00:11:43 +00: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 9e99b04375 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 00:04:18 +08:00
YunaiV 826d792ff2 trade：增加自动取消的 job 2023-09-26 00:04:11 +08:00
YunaiV f088fdff84 code review：委托逻辑 2023-09-25 13:59:44 +08:00
芋道源码 8649b285cf
!631 【工作流】委派 
Merge pull request !631 from Youkehai/feature/bpm-delegate
 2023-09-25 05:42:12 +00:00
youkehai 3972fbd1d9 fix: 根据review结果修改 2023-09-25 11:30:44 +08:00
jason 437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-25 10:48:32 +08:00
jason 6fcff0863a 支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态 2023-09-25 10:43:23 +08:00
芋道源码 56c4595058
!633 up springboot 2.7.16 
Merge pull request !633 from xingyu/feature/v2.7.16
 2023-09-25 01:41:32 +00:00
YunaiV e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
youkehai 1553900193 fix: 解决冲突 2023-09-25 09:22:11 +08:00
youkehai d6e736bd56 Merge branch 'master' into feature/bpm-delegate 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
 2023-09-25 09:15:59 +08:00
芋道源码 c92365128a
!635 分销Review代码修改 
Merge pull request !635 from 疯狂的世界/feature/mall_product
 2023-09-25 00:39:16 +00:00
owen 16af31d980 分销：@Select sql语句增加逻辑删除字段过滤 2023-09-25 08:36:55 +08:00
jason 0f0e6eb8ba Pay Client 新增转账接口 2023-09-25 08:34:58 +08:00
owen 3dca66eefa 分销：提现统计 2023-09-25 08:05:29 +08:00
YunaiV f864aa1cfd Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2023-09-24 23:25:14 +08:00