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

176 Commits

Author SHA1 Message Date
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
YunaiV 059202a588 购物车：调整购物车接口 2023-08-30 19:14:28 +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
jason 7237bc07bb 钱包退款的实现 2023-08-28 10:25:50 +08:00
jason c7f6f92159 钱包支付 Client 的实现 2023-08-28 07:39:03 +08:00
jason f33b66558c 新增查询钱包余额明细接口 2023-08-25 22:08:40 +08:00
jason 1ffbd9399e 新增获得支付钱包接口 2023-08-25 22:08:40 +08:00
YunaiV 5932e8e931 code review：订单列表、详情 2023-08-23 00:46:28 +08:00
puhui999 d29c5a556c 订单管理：添加修改备注、订单调价、修改地址接口 2023-08-22 12:19:25 +08:00
zhijiantianya@gmail.com ba59ec85e0 code review 各种活动 2023-08-07 19:30:26 +08:00
YunaiV 105f1a2707 fix: banner 日志打印 2023-08-05 16:35:11 +08:00
YunaiV bf3e848c17 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-29 11:06:59 +08:00
YunaiV 5e7e3d816c 彻底移除 RedisKeyDefine 2023-07-29 07:16:10 +08:00
YunaiV c33186569d 优化 mp 账号的刷新机制，使用 Job 轮询，替换 MQ 广播 2023-07-27 20:25:15 +08:00
jason 6a38738760 新增模拟支付渠道，通知查询为空bug 修改 2023-07-27 08:19:24 +08:00
YunaiV 7c165fb1f6 1. 完善 PayNotifyServiceImpl 的单元测试 2023-07-24 23:04:38 +08:00
zhijiantianya@gmail.com 73e1158836 by gateway: 
1. notify 部分单元测试
 2023-07-24 20:11:21 +08:00
YunaiV 3a24d05bdc mall + pay： 
1. 修复单元测试的报错
 2023-07-24 07:04:11 +08:00
YunaiV 6aea461e8d mall + pay： 
1. 完善 PayRefundServiceTest 的单元测试
 2023-07-23 23:20:52 +08:00
YunaiV ebeb14be2f mall + pay： 
1. 完善 PayRefundServiceTest 的单元测试
 2023-07-23 22:29:33 +08:00
YunaiV 9812881094 mall + pay： 
1. 增加退款同步的 Job
 2023-07-23 21:16:03 +08:00
YunaiV 0e5e6c7ce0 mall + pay： 
1. 增加微信退款的查询接口
 2023-07-23 20:39:52 +08:00
YunaiV 5b066ea693 mall + pay： 
1. 增加支付宝退款查询接口
 2023-07-22 20:46:38 +08:00