39 Commits (afd306a71d9ddcfd2f96571f6ecc5a827f4dbd86)

Author SHA1 Message Date
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
3 years ago
YunaiV 222daa5366 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
puhui999 51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 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 ac5646b84d mall + pay:
1. 支付订单的过期关闭 Job[单测]
3 years ago
YunaiV cc853a2b92 mall + pay:
1. 支付订单的状态同步 Job[单测]
3 years ago
YunaiV 348d073718 mall + pay:
1. 发起支付时,增加实际已支付的二次校验,避免重复支付
3 years ago
zhijiantianya@gmail.com e27ec2fd50 by gateway:
1. 完善部分 refund 单元测试
3 years ago
zhijiantianya@gmail.com b54f7e9256 by gateway:
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
3 years ago
YunaiV 3caa5f14bd mall + pay:
1. 优化退款管理的接口实现
3 years ago
YunaiV b84da30234 mall + pay:
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去
3 years ago
zhijiantianya@gmail.com 3f410c2735 by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
3 years ago
YunaiV 7cf4c5415e mall + pay:
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
3 years ago
YunaiV 7caf8e900f mall + pay:
1. 增加微信 bar 和 native 的集成测试,方便调试配置
3 years ago
YunaiV c44ace6011 mall + pay:
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
3 years ago
YunaiV 518e89dc4b mall + pay:
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
3 years ago
zhijiantianya@gmail.com 47ba5b7b44 by gateway: 支付渠道的代码优化 3 years ago
zhijiantianya@gmail.com 35ceef371c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
zhijiantianya@gmail.com 052e4689ee by gateway: 支付应用的代码优化 3 years ago
YunaiV 0ac599a3d9 mall + pay:
1. 修复支付宝沙箱地址的调整
2. 收银台的前端 URL 支付走整个网页跳转
3. 收银台的支付成功后,增加 returnUrl 回跳
4. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:租户未传递;
3 years ago
YunaiV 2485a5ebc9 mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
3 years ago
YunaiV 5d2d52020e mall + pay:简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
3 years ago
YunaiV 4014137a4c mall + pay:调整异常的处理
1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。
3 years ago
YunaiV cbc61184bd mall + pay:
1、优化微信公众号 MP 支付的实现
3 years ago
YunaiV 67d60e32f8 mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
3 years ago
YunaiV 102d56ff7d 修复单测报错的问题 3 years ago
YunaiV a83b8e8fbc 修复报错的单元测试 3 years ago
YunaiV 3443aa6f5f 优化本地缓存的刷新实现,数据变更时,强制刷新 3 years ago
YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
3 years ago
YunaiV fc48ab4928 trade:前端订单管理,联调接口 3 years ago
xingyu 0d0f64e30a feat: 删除过期方法 4 years ago
xingyu4j cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 4 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 4 years ago
xingyu f84f3a3631 refactor: 时间区间查询传入数组-测试模块 4 years ago
YunaiV 09103f310b 1. 【修复】单元测试报错
2. 【优化】yudao-module-xx-impl 调整成 yudao-module-xx-biz,更加符合定位
4 years ago