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 |
|
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 |
|
YunaiV
|
9630f236f8
|
Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
README.md
|
2023-09-19 22:28:45 +08:00 |
|
YunaiV
|
080c32b9f3
|
code review：钱包充值
|
2023-09-18 13:07:54 +08:00 |
|
YunaiV
|
222daa5366
|
pay 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效
|
2023-09-16 23:22:58 +08:00 |
|
jason
|
bbc16bb937
|
钱包充值 Mapper 类
|
2023-09-15 16:14:04 +08:00 |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2023-09-14 16:55:31 +08:00 |
|
xingyu
|
437131cc7a
|
Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
# yudao-dependencies/pom.xml
|
2023-09-13 12:00:10 +08:00 |
|
xingyu
|
5e9e41c045
|
fix: required 过期
|
2023-09-11 12:30:33 +08:00 |
|
puhui999
|
3976011af0
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-10 22:54:01 +08:00 |
|
puhui999
|
c023209aa5
|
订单管理：完善订单调价分摊逻辑
|
2023-09-10 00:50:13 +08:00 |
|
puhui999
|
51dab96889
|
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
|
2023-09-10 00:48:30 +08:00 |
|
YunaiV
|
cd51d57f12
|
分销：调整 app 的 price 到 brokeragePrice
|
2023-09-09 19:42:53 +08:00 |
|
jason
|
5858f57fe9
|
钱包 review 修改
|
2023-09-09 18:32:53 +08:00 |
|
芋道源码
|
3b5215db21
|
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
|
2023-09-09 00:48:00 +00:00 |
|
YunaiV
|
87c55784c4
|
code review：营销活动+订单
|
2023-09-09 01:27:55 +08:00 |
|
芋道源码
|
5235aff8ad
|
!610 营销活动+订单：完善大部分 TODO 提到的问题
Merge pull request !610 from puhui999/feature/mall_product
|
2023-09-08 15:36:51 +00:00 |
|
YunaiV
|
3e09da0128
|
code review：支付钱包
|
2023-09-08 22:47:00 +08:00 |
|
owen
|
ddcebb1986
|
common: MoneyUtils 移到 common 模块
|
2023-09-08 12:46:43 +08:00 |
|
puhui999
|
5d6bb84d25
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-08 00:59:53 +08:00 |
|
puhui999
|
0e8755972c
|
营销活动+订单：完善大部分 TODO 提到的问题
|
2023-09-08 00:35:54 +08:00 |
|
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
|
2023-09-06 23:50:55 +08:00 |
|
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
|
2023-09-06 21:40:53 +08:00 |
|
jason
|
3f51be6a2d
|
钱包。删除不需要的类
|
2023-09-06 08:50:22 +08:00 |
|
jason
|
f3ca0f066b
|
会员钱包 查询订单和查询退款单的实现
|
2023-09-05 12:44:34 +08:00 |
|
jason
|
cc4c924717
|
钱包 review DO 类修改
|
2023-09-04 14:54:38 +08:00 |
|
jason
|
91b03e7c93
|
钱包 review 修改
|
2023-09-04 12:18:56 +08:00 |
|
YunaiV
|
379c143dbb
|
修复：#320 支付手续费计算不正确，超过付款金额 #334
|
2023-09-03 18:39:51 +08:00 |
|
芋道源码
|
05fc322919
|
Merge pull request #334 from freesme/fix-master-#320-calculation-error
修复：#320 支付手续费计算不正确，超过付款金额
|
2023-09-03 18:37:52 +08:00 |
|
YunaiV
|
ba444c9538
|
code review：支付钱包
|
2023-08-31 20:13:12 +08:00 |
|
jason
|
457312d5aa
|
修改 PayClientFactory 创建 PayClient 方法
|
2023-08-31 14:30:12 +08:00 |
|
jason
|
7d4d3bea55
|
Revert "创建 PayClient 迁移到 PayChannelService"
This reverts commit 716727bfa7.
|
2023-08-31 08:27:22 +08:00 |
|
jason
|
278f2af8f8
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-29 15:29:02 +08:00 |
|
jason
|
716727bfa7
|
创建 PayClient 迁移到 PayChannelService
|
2023-08-29 15:28:24 +08:00 |
|
YunaiV
|
cc71aabd3d
|
钱包：钱包流水 api
|
2023-08-29 00:31:54 +08:00 |
|
YunaiV
|
6132443d26
|
code review：钱包实现
|
2023-08-28 18:54:40 +08:00 |
|
jason
|
9077f14bae
|
钱包支付 Client 失败问题修改
|
2023-08-28 13:54:25 +08:00 |
|
耿林猛
|
3d894ca7f5
|
修复：#320 支付手续费计算不正确，超过付款金额
(cherry picked from commit 0df2d7191f7a467f2eeeb5bd19217a4a039395db)
|
2023-08-28 11:20:19 +08:00 |
|