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
|
20eb0a2a88
|
mall + pay：
1、调整 returnUrl 的实现
|
2023-07-04 23:43:16 +08:00 |
|
jason
|
3a1e5c1b5f
|
pay : 会员电子钱包表结构
|
2023-06-30 10:24:36 +08:00 |
|
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
2023-05-19 10:47: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
|
e96422a47e
|
trade：完成支付成功后的回调，更新订单为已支付
|
2022-11-26 18:40:51 +08:00 |
|
YunaiV
|
1cd9085c59
|
pay: PayNotifyJob 增加多租户的支持
|
2022-11-24 23:56:13 +08:00 |
|
YunaiV
|
8798944069
|
优化 pay 支付成功后的回调逻辑
|
2022-11-23 21:09:16 +08:00 |
|
YunaiV
|
ee1d362a7c
|
trade：【交易售后】回调退款
|
2022-11-17 01:05:12 +08:00 |
|
YunaiV
|
92dbf093ea
|
trade：增加管理员审批
|
2022-11-16 22:17:07 +08:00 |
|
YunaiV
|
89580e7903
|
合并 master 代码
|
2022-11-13 12:21:17 +08:00 |
|
YunaiV
|
afc76973ce
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.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/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.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/dal/dataobject/cart/TradeCartItemDO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/application-local.yaml
# yudao-server/src/main/resources/application.yaml
# yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
# yudao-ui-admin/src/views/mall/product/property/index.vue
# yudao-ui-admin/src/views/mall/product/spu/index.vue
# yudao-ui-admin/src/views/mall/product/spu/save.vue
# yudao-ui-admin/src/views/system/role/index.vue
|
2022-11-13 12:07:59 +08:00 |
|
YunaiV
|
5934d6b029
|
trade：完成下单时，创建支付单逻辑
|
2022-11-10 09:27:20 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
zhijiantianya@gmail.com
|
67436ea4c6
|
mall: 下单的代码 review
|
2022-09-30 09:53:45 +00:00 |
|
ex_yang.li@ca-nio.com
|
5889093a64
|
创建交易订单-单元测试
|
2022-09-15 16:57:04 +08:00 |
|
ex_yang.li@ca-nio.com
|
19a703b8c9
|
创建订单接口定义
|
2022-08-26 17:47:43 +08:00 |
|
YunaiV
|
8d59384904
|
多模块重构 10：去除 Freemarker 依赖，修改字典的前缀，从 sys=》system、inf=》infra 见名知意
|
2022-02-02 01:27:04 +08:00 |
|
YunaiV
|
b757e1fccb
|
多模块重构 7：pay 模块的初始化
|
2022-01-31 21:51:23 +08:00 |
|