YunaiV
|
802ac89b73
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2 years ago |
|
YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
jason
|
4ae3d34801
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
15313c2992
|
转账 - 增加转账定时任务
|
2 years ago |
|
jason
|
09d45e6393
|
转账 - 增加转账通知
|
2 years ago |
|
YunaiV
|
787de1be94
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
# sql/mysql/ruoyi-vue-pro.sql
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
|
2 years ago |
|
jason
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2 years ago |
|
jason
|
626bd0bd55
|
转账 - code review 修改
|
2 years ago |
|
jason
|
86598dd177
|
转账 - 动态收款人字段修改
|
2 years ago |
|
YunaiV
|
fc2d30cfaf
|
pay：修复单元测试报错
|
2 years ago |
|
jason
|
9095394fed
|
钱包 - 创建钱包充值校验修改
|
2 years ago |
|
YunaiV
|
633a4c5687
|
pay：微调 enum 的包名
|
2 years ago |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2 years ago |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2 years ago |
|
jason
|
8cd7941fc3
|
wallet - 充值套餐 管理端
|
2 years ago |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
571961b4da
|
充值套餐修改
|
2 years ago |
|
YunaiV
|
fef808d88c
|
code review：统计代码
|
2 years ago |
owen
|
4f33a0c9c0
|
统计：交易统计Review修改
|
2 years ago |
|
owen
|
a9e822762d
|
统计：交易统计定时任务
|
2 years ago |
|
owen
|
26628913cb
|
错误码分段
|
2 years ago |
|
jason
|
71ec06393a
|
merge 冲突修改
|
2 years ago |
|
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
|
2 years ago |
|
jason
|
aa2f651124
|
Pay: 转账单实现
|
2 years ago |
|
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
|
2 years ago |
|
jason
|
60f766f35c
|
钱包充值允许多次退款
|
2 years ago |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2 years ago |
|
YunaiV
|
080c32b9f3
|
code review：钱包充值
|
2 years ago |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2 years ago |
|
YunaiV
|
8b50cd9661
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
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/combination/AppCombinationRecordController.java
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.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
|
2 years ago |
puhui999
|
c023209aa5
|
订单管理：完善订单调价分摊逻辑
|
2 years ago |
|
puhui999
|
51dab96889
|
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
|
2 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
2 years ago |
|
YunaiV
|
87c55784c4
|
code review：营销活动+订单
|
2 years ago |
|
puhui999
|
0e8755972c
|
营销活动+订单：完善大部分 TODO 提到的问题
|
2 years ago |
|
YunaiV
|
059202a588
|
购物车：调整购物车接口
|
2 years ago |
|
YunaiV
|
cc71aabd3d
|
钱包：钱包流水 api
|
2 years ago |
|
YunaiV
|
6132443d26
|
code review：钱包实现
|
2 years ago |
|
jason
|
7237bc07bb
|
钱包退款的实现
|
2 years ago |
|
jason
|
c7f6f92159
|
钱包支付 Client 的实现
|
2 years ago |
|
jason
|
f33b66558c
|
新增查询钱包余额明细接口
|
2 years ago |
|
jason
|
1ffbd9399e
|
新增获得支付钱包接口
|
2 years ago |
|
YunaiV
|
5932e8e931
|
code review：订单列表、详情
|
2 years ago |
|
puhui999
|
d29c5a556c
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2 years ago |
|
YunaiV
|
c33186569d
|
优化 mp 账号的刷新机制，使用 Job 轮询，替换 MQ 广播
|
3 years ago |
|
YunaiV
|
348d073718
|
mall + pay：
1. 发起支付时，增加实际已支付的二次校验，避免重复支付
|
3 years ago |
|
YunaiV
|
b84da30234
|
mall + pay：
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型，将 refund status 合并进去
|
3 years ago |
|
YunaiV
|
888c488206
|
mall + pay：
1. 优化 PayClient 退款逻辑，返回业务失败 errorCode + errorMsg 错误码
|
3 years ago |
|
zhijiantianya@gmail.com
|
3f410c2735
|
by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
|
3 years ago |
|
YunaiV
|
6f475f8c85
|
mall + pay：
1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码
|
3 years ago |