YunaiV
|
c38790655f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 22:33:40 +08:00 |
|
YunaiV
|
d31a12aff7
|
🐛 修改了支付 demo 退款单匹配错误问题
|
2023-12-29 22:33:26 +08:00 |
|
YunaiV
|
0f6f204320
|
🐛 修改 pay 模块>支付订单的同步 Job，查询指定创建时间前的待支付订单
|
2023-12-29 21:52:49 +08:00 |
|
wy
|
039a2b1278
|
支付订单的同步 Job，查询指定创建时间前的待支付订单
|
2023-12-29 16:47:28 +08:00 |
|
YunaiV
|
802ac89b73
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-08 22:17:52 +08:00 |
|
YunaiV
|
98697ee075
|
⬆️
|
2023-12-07 20:48:11 +08:00 |
|
YunaiV
|
eeeafcc10c
|
1.9.0 版本发布
|
2023-11-30 21:14:13 +08:00 |
|
jason
|
4ae3d34801
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-11-07 23:11:25 +08:00 |
|
jason
|
15313c2992
|
转账 - 增加转账定时任务
|
2023-11-07 23:11:07 +08:00 |
|
jason
|
09d45e6393
|
转账 - 增加转账通知
|
2023-11-06 11:33:08 +08:00 |
|
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
|
2023-11-04 20:48:27 +08:00 |
|
jason
|
f4d600398c
|
转账 - 管理后台增加转账单查询
|
2023-11-03 08:43:21 +08:00 |
|
jason
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2023-10-29 23:36:06 +08:00 |
|
Jayson Albert
|
f4ea648ac9
|
fix: 修复PayWalletRechargeCerate参数校验
|
2023-10-28 19:45:06 +08:00 |
|
jason
|
626bd0bd55
|
转账 - code review 修改
|
2023-10-25 23:41:59 +08:00 |
|
jason
|
86598dd177
|
转账 - 动态收款人字段修改
|
2023-10-24 08:44:30 +08:00 |
|
YunaiV
|
fc2d30cfaf
|
pay：修复单元测试报错
|
2023-10-24 08:09:47 +08:00 |
|
jason
|
9095394fed
|
钱包 - 创建钱包充值校验修改
|
2023-10-23 21:47:36 +08:00 |
|
YunaiV
|
633a4c5687
|
pay：微调 enum 的包名
|
2023-10-23 19:56:30 +08:00 |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2023-10-23 19:24:04 +08:00 |
|
YunaiV
|
9697aee898
|
code review：钱包的逻辑
|
2023-10-21 21:17:49 +08:00 |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2023-10-21 15:28:07 +08:00 |
|
jason
|
183206e2d3
|
转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式
|
2023-10-20 23:20:47 +08:00 |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2023-10-18 18:39:05 +08:00 |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2023-10-16 22:43:39 +08:00 |
|
jason
|
4f7c7f5619
|
wallet - 管理端 钱包余额流水查询
|
2023-10-16 08:36:28 +08:00 |
|
jason
|
7cb8f8fab9
|
wallet - 管理端 钱包余额查询
|
2023-10-15 17:33:55 +08:00 |
|
jason
|
e06f61ef39
|
wallet - 充值套餐 管理端
|
2023-10-13 10:46:10 +08:00 |
|
jason
|
8cd7941fc3
|
wallet - 充值套餐 管理端
|
2023-10-13 10:43:04 +08:00 |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-12 22:21:17 +08:00 |
|
jason
|
571961b4da
|
充值套餐修改
|
2023-10-12 22:20:42 +08:00 |
|
YunaiV
|
fef808d88c
|
code review：统计代码
|
2023-10-11 12:32:28 +08:00 |
|
owen
|
4f33a0c9c0
|
统计：交易统计Review修改
|
2023-10-06 14:15:59 +08:00 |
|
owen
|
a9e822762d
|
统计：交易统计定时任务
|
2023-10-03 21:21:11 +08:00 |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
2023-10-02 15:44:41 +08:00 |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2023-10-01 23:31:07 +08:00 |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-30 22:09:49 +08:00 |
|
YunaiV
|
3875c80471
|
wallet：钱包支付，接入 user 付款界面
|
2023-09-30 22:08:15 +08:00 |
|
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2023-09-30 18:54:10 +08:00 |
|
owen
|
be6399238b
|
会员详情，查询钱包信息
|
2023-09-30 12:40:22 +08:00 |
|
owen
|
26628913cb
|
错误码分段
|
2023-09-29 21:34:38 +08:00 |
|
jason
|
71ec06393a
|
merge 冲突修改
|
2023-09-29 14:56:32 +08:00 |
|
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
|
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 |
|
jason
|
0f0e6eb8ba
|
Pay Client 新增转账接口
|
2023-09-25 08:34:58 +08:00 |
|
jason
|
60f766f35c
|
钱包充值允许多次退款
|
2023-09-24 10:49:13 +08:00 |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2023-09-22 19:04:59 +08:00 |
|
jason
|
dbd7ab5f23
|
code review 修改
|
2023-09-21 17:31:58 +08:00 |
|