YunaiV
|
7caf8e900f
|
mall + pay：
1. 增加微信 bar 和 native 的集成测试，方便调试配置
|
2023-07-16 19:24:29 +08:00 |
|
YunaiV
|
c44ace6011
|
mall + pay：
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
|
2023-07-15 20:36:04 +08:00 |
|
YunaiV
|
518e89dc4b
|
mall + pay：
1. 重构支付回调的逻辑，将回调解析改成 PayOrderRespDTO，为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
|
2023-07-15 10:35:41 +08:00 |
|
YunaiV
|
fbb63ee262
|
mall + pay：
1. 修复 PayNotifyTask 首次通知时，可能会失败的情况；原因：MySQL 时间的精度问题；
|
2023-07-12 22:40:39 +08:00 |
|
zhijiantianya@gmail.com
|
47ba5b7b44
|
by gateway: 支付渠道的代码优化
|
2023-07-12 20:34:43 +08:00 |
|
zhijiantianya@gmail.com
|
35ceef371c
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-07-12 12:52:58 +08:00 |
|
zhijiantianya@gmail.com
|
052e4689ee
|
by gateway: 支付应用的代码优化
|
2023-07-12 12:52:48 +08:00 |
|
YunaiV
|
0ac599a3d9
|
mall + pay：
1. 修复支付宝沙箱地址的调整
2. 收银台的前端 URL 支付走整个网页跳转
3. 收银台的支付成功后，增加 returnUrl 回跳
4. 修复 PayNotifyTask 首次通知时，可能会失败的情况；原因：租户未传递；
|
2023-07-12 00:04:19 +08:00 |
|
zhijiantianya@gmail.com
|
f1c4c7964a
|
gateway commit test
|
2023-07-11 21:18:24 +08:00 |
|
YunaiV
|
cad508def6
|
mall + pay：
1. bar 扫码支付成功后，额外返回 notify
2. notify 在支付回调时，增加幂等处理
|
2023-07-10 23:06:00 +08:00 |
|
YunaiV
|
2485a5ebc9
|
mall + pay：
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
|
2023-07-10 17:35:26 +08:00 |
|
YunaiV
|
5d2d52020e
|
mall + pay：简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
|
2023-07-09 12:40:26 +08:00 |
|
YunaiV
|
b06a21f9af
|
mall + pay：
1. 实现 WxNativePayClient 的支付功能
|
2023-07-09 00:36:40 +08:00 |
|
YunaiV
|
e31b40eefa
|
mall + pay：
1. 实现 WxBarPayClient 的支付功能
|
2023-07-08 23:37:25 +08:00 |
|
YunaiV
|
4014137a4c
|
mall + pay：调整异常的处理
1. 在 PayOrderUnifiedRespDTO 增加 status 字段，用于后续微信付款码支付时，直接支付成功的场景。
|
2023-07-08 22:40:27 +08:00 |
|
YunaiV
|
e615be971e
|
mall + pay：
1、测试通过微信小程序支付
|
2023-07-08 12:44:50 +08:00 |
|
YunaiV
|
d76bc7aa82
|
mall + pay：
1、初步完成微信扫码支付，暂时缺少状态的处理
|
2023-07-08 00:08:05 +08:00 |
|
YunaiV
|
3f33ca2d6b
|
mall + pay：
1、增加获得支付渠道接口
|
2023-07-06 23:16:53 +08:00 |
|
YunaiV
|
cbc61184bd
|
mall + pay：
1、优化微信公众号 MP 支付的实现
|
2023-07-06 19:11:32 +08:00 |
|
YunaiV
|
67d60e32f8
|
mall + pay：
1、调整微信支付，修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
|
2023-07-06 00:19:05 +08:00 |
|
YunaiV
|
20eb0a2a88
|
mall + pay：
1、调整 returnUrl 的实现
|
2023-07-04 23:43:16 +08:00 |
|
YunaiV
|
040a66965c
|
mall + member：
1、review 积分
|
2023-07-02 23:19:13 +08:00 |
|
jason
|
3a1e5c1b5f
|
pay : 会员电子钱包表结构
|
2023-06-30 10:24:36 +08:00 |
|
xingyu
|
573ad59edc
|
Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
|
2023-06-14 15:18:12 +08:00 |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
2023-05-14 17:35:34 +08:00 |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +08:00 |
|
YunaiV
|
5656a0b0b7
|
修复支付通知的通知 Transaction 不生效的问题
|
2023-04-09 10:13:42 +08:00 |
|
yuzhengwei
|
70514a0ac2
|
fix:同一个类中:A方法（无事务）调B方法（有事务）,事务不生效问题
|
2023-04-03 14:00:24 +08:00 |
|
YunaiV
|
102d56ff7d
|
修复单测报错的问题
|
2023-03-05 19:39:00 +08:00 |
|
YunaiV
|
14893c4cff
|
pay: 优化回调的逻辑
|
2023-02-20 23:41:03 +08:00 |
|
YunaiV
|
4390e28eea
|
pay: 新增支付宝 App 支付的接入
|
2023-02-19 23:37:29 +08:00 |
|
YunaiV
|
2093c3bdb5
|
pay: 重构支付客户端，移除 PayCommonResult 累
|
2023-02-19 22:16:15 +08:00 |
|
YunaiV
|
b34801f303
|
pay: 接入支付宝 PC 支付的跳转模式
|
2023-02-18 20:59:18 +08:00 |
|
YunaiV
|
df702e8d24
|
pay: 临时性的提交，准备 client 部分的重构
|
2023-02-18 10:39:48 +08:00 |
|
YunaiV
|
96ecd5028d
|
1. 优化支付订单回调任务，避免重复打 SQL 查询日志
2. 修复定时任务的回调，回调成功未更新状态的问题。
|
2023-02-16 23:54:23 +08:00 |
|
YunaiV
|
44b0346e5e
|
pay：示例订单，接入退款回调逻辑
|
2023-02-16 00:42:54 +08:00 |
|
YunaiV
|
eb660ca619
|
pay：示例订单，增加发起退款的操作
|
2023-02-15 22:40:56 +08:00 |
|
YunaiV
|
333adc989f
|
pay：示例订单，接入支付回调逻辑
|
2023-02-15 09:58:20 +08:00 |
|
YunaiV
|
4d2ebcd898
|
pay：前端收银台接入支付宝扫码
|
2023-02-15 00:11:34 +08:00 |
|
YunaiV
|
84e9c0bba0
|
pay：前端收银台的信息接入
|
2023-02-13 23:59:03 +08:00 |
|
YunaiV
|
7fbdfec396
|
增加接入示例的查询
|
2023-02-11 23:04:35 +08:00 |
|
YunaiV
|
063d5e3a8a
|
增加支付接入的示例 10%
|
2023-02-11 21:34:13 +08:00 |
|
xingyu
|
ffb0358ce2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
|
2023-01-29 16:11:51 +08:00 |
|
YunaiV
|
c744e115e3
|
简化本地缓存的实现，萌新更容易看懂！
|
2023-01-25 10:11:16 +08:00 |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
2023-01-19 15:03:46 +08:00 |
|
xingyu
|
854ba3315c
|
marge master
|
2023-01-04 10:57:19 +08:00 |
|
xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
YunaiV
|
3443aa6f5f
|
优化本地缓存的刷新实现，数据变更时，强制刷新
|
2022-12-29 00:09:58 +08:00 |
|
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
|
2022-12-23 19:12:45 +08:00 |
|