hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-29 09:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,016 Commits 20 Branches 0 Tags
75f2b207a43a1a3aa1bfba0fc4e2a0c2f790484d
Commit Graph

79 Commits

Author SHA1 Message Date
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +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
ccccd9f226 转账 - 转账代码修改，新增转账示例 2023-10-29 23:36: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
jason
89e847c8cd 钱包，转账 review 修改 2023-10-21 15:28:07 +08:00
zhijiantianya@gmail.com
00e18a480f code review：钱包、充值、转账的实现 2023-10-18 18:39:05 +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
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
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
60f766f35c 钱包充值允许多次退款 2023-09-24 10:49:13 +08:00
jason
910ffa7a5a 钱包充值退款 2023-09-22 19:04:59 +08:00
YunaiV
080c32b9f3 code review：钱包充值 2023-09-18 13:07:54 +08:00
jason
0e1b8126dd 新增钱包充值。启动报错修复 2023-09-14 16:55:31 +08:00
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
 2023-09-11 16:19:55 +08:00
puhui999
c023209aa5 订单管理：完善订单调价分摊逻辑 2023-09-10 00:50:13 +08:00
puhui999
51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 2023-09-10 00:48:30 +08:00
dhb52
d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
YunaiV
87c55784c4 code review：营销活动+订单 2023-09-09 01:27:55 +08:00
puhui999
0e8755972c 营销活动+订单：完善大部分 TODO 提到的问题 2023-09-08 00:35:54 +08:00
YunaiV
059202a588 购物车：调整购物车接口 2023-08-30 19:14:28 +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
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
YunaiV
c33186569d 优化 mp 账号的刷新机制，使用 Job 轮询，替换 MQ 广播 2023-07-27 20:25:15 +08:00
YunaiV
348d073718 mall + pay： 
1. 发起支付时，增加实际已支付的二次校验，避免重复支付
 2023-07-22 13:19:22 +08:00
YunaiV
b84da30234 mall + pay： 
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型，将 refund status 合并进去
 2023-07-19 21:09:02 +08:00
YunaiV
888c488206 mall + pay： 
1. 优化 PayClient 退款逻辑，返回业务失败 errorCode + errorMsg 错误码
 2023-07-18 22:36:03 +08:00
zhijiantianya@gmail.com
3f410c2735 by gateway: 
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
 2023-07-18 20:21:25 +08:00
YunaiV
6f475f8c85 mall + pay： 
1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码
 2023-07-18 07:37:03 +08:00
YunaiV
c44ace6011 mall + pay： 
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
 2023-07-15 20:36:04 +08:00