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
|
f4d600398c
|
转账 - 管理后台增加转账单查询
|
2 years ago |
|
jason
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2 years ago |
Jayson Albert
|
f4ea648ac9
|
fix: 修复PayWalletRechargeCerate参数校验
|
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 |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2 years ago |
|
YunaiV
|
9697aee898
|
code review：钱包的逻辑
|
2 years ago |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2 years ago |
|
jason
|
183206e2d3
|
转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式
|
2 years ago |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2 years ago |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2 years ago |
|
jason
|
4f7c7f5619
|
wallet - 管理端 钱包余额流水查询
|
2 years ago |
|
jason
|
7cb8f8fab9
|
wallet - 管理端 钱包余额查询
|
2 years ago |
|
jason
|
e06f61ef39
|
wallet - 充值套餐 管理端
|
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 |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
2 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2 years ago |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
3875c80471
|
wallet：钱包支付，接入 user 付款界面
|
2 years ago |
|
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2 years ago |
|
owen
|
be6399238b
|
会员详情，查询钱包信息
|
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
|
ce6f7ab1b1
|
Pay: 新增转账示例单
|
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
|
0f0e6eb8ba
|
Pay Client 新增转账接口
|
2 years ago |
|
jason
|
60f766f35c
|
钱包充值允许多次退款
|
2 years ago |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2 years ago |
|
jason
|
dbd7ab5f23
|
code review 修改
|
2 years ago |
|
YunaiV
|
9630f236f8
|
Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
README.md
|
2 years ago |
|
YunaiV
|
080c32b9f3
|
code review：钱包充值
|
2 years ago |
|
YunaiV
|
222daa5366
|
pay 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效
|
2 years ago |
|
jason
|
bbc16bb937
|
钱包充值 Mapper 类
|
2 years ago |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2 years ago |
xingyu
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
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 |
|
xingyu
|
5e9e41c045
|
fix: required 过期
|
2 years ago |
puhui999
|
3976011af0
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
c023209aa5
|
订单管理：完善订单调价分摊逻辑
|
2 years ago |
|
puhui999
|
51dab96889
|
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
|
2 years ago |
|
YunaiV
|
cd51d57f12
|
分销：调整 app 的 price 到 brokeragePrice
|
2 years ago |
|
jason
|
5858f57fe9
|
钱包 review 修改
|
2 years ago |
|
芋道源码
|
3b5215db21
|
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
|
2 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
2 years ago |
|
YunaiV
|
87c55784c4
|
code review：营销活动+订单
|
2 years ago |
|
芋道源码
|
5235aff8ad
|
!610 营销活动+订单：完善大部分 TODO 提到的问题
Merge pull request !610 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
3e09da0128
|
code review：支付钱包
|
2 years ago |
|
owen
|
ddcebb1986
|
common: MoneyUtils 移到 common 模块
|
2 years ago |
|
puhui999
|
5d6bb84d25
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
0e8755972c
|
营销活动+订单：完善大部分 TODO 提到的问题
|
2 years ago |
|
YunaiV
|
eb342d5abf
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2 years ago |
|
YunaiV
|
bf92727b27
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2 years ago |
|
jason
|
3f51be6a2d
|
钱包。删除不需要的类
|
2 years ago |
|
jason
|
f3ca0f066b
|
会员钱包 查询订单和查询退款单的实现
|
2 years ago |
|
jason
|
cc4c924717
|
钱包 review DO 类修改
|
2 years ago |
|
jason
|
91b03e7c93
|
钱包 review 修改
|
2 years ago |
|
YunaiV
|
379c143dbb
|
修复：#320 支付手续费计算不正确，超过付款金额 #334
|
2 years ago |
|
芋道源码
|
05fc322919
|
Merge pull request #334 from freesme/fix-master-#320-calculation-error
修复：#320 支付手续费计算不正确，超过付款金额
|
2 years ago |
|
YunaiV
|
ba444c9538
|
code review：支付钱包
|
2 years ago |
|
jason
|
457312d5aa
|
修改 PayClientFactory 创建 PayClient 方法
|
2 years ago |
|
jason
|
7d4d3bea55
|
Revert "创建 PayClient 迁移到 PayChannelService"
This reverts commit 716727bfa7.
|
2 years ago |
|
YunaiV
|
059202a588
|
购物车：调整购物车接口
|
2 years ago |
|
jason
|
278f2af8f8
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
716727bfa7
|
创建 PayClient 迁移到 PayChannelService
|
2 years ago |
|
YunaiV
|
cc71aabd3d
|
钱包：钱包流水 api
|
2 years ago |
|
YunaiV
|
6132443d26
|
code review：钱包实现
|
2 years ago |
|
jason
|
9077f14bae
|
钱包支付 Client 失败问题修改
|
2 years ago |
耿林猛
|
3d894ca7f5
|
修复：#320 支付手续费计算不正确，超过付款金额
(cherry picked from commit 0df2d7191f7a467f2eeeb5bd19217a4a039395db)
|
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 |
|
zhijiantianya@gmail.com
|
ba59ec85e0
|
code review 各种活动
|
3 years ago |
|
YunaiV
|
105f1a2707
|
fix: banner 日志打印
|
3 years ago |
|
YunaiV
|
bf3e848c17
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
3 years ago |
|
YunaiV
|
5e7e3d816c
|
彻底移除 RedisKeyDefine
|
3 years ago |
|
YunaiV
|
c33186569d
|
优化 mp 账号的刷新机制，使用 Job 轮询，替换 MQ 广播
|
3 years ago |
|
jason
|
6a38738760
|
新增模拟支付渠道，通知查询为空bug 修改
|
3 years ago |
|
YunaiV
|
7c165fb1f6
|
1. 完善 PayNotifyServiceImpl 的单元测试
|
3 years ago |
|
zhijiantianya@gmail.com
|
73e1158836
|
by gateway:
1. notify 部分单元测试
|
3 years ago |
|
YunaiV
|
3a24d05bdc
|
mall + pay：
1. 修复单元测试的报错
|
3 years ago |
|
YunaiV
|
6aea461e8d
|
mall + pay：
1. 完善 PayRefundServiceTest 的单元测试
|
3 years ago |
|
YunaiV
|
ebeb14be2f
|
mall + pay：
1. 完善 PayRefundServiceTest 的单元测试
|
3 years ago |
|
YunaiV
|
9812881094
|
mall + pay：
1. 增加退款同步的 Job
|
3 years ago |