YunaiV
|
07f1681b50
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
e96422a47e
|
trade：完成支付成功后的回调，更新订单为已支付
|
3 years ago |
|
YunaiV
|
2d78b02086
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
YunaiV
|
1cd9085c59
|
pay: PayNotifyJob 增加多租户的支持
|
3 years ago |
|
YunaiV
|
0247fd5c69
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
8798944069
|
优化 pay 支付成功后的回调逻辑
|
3 years ago |
|
芋道源码
|
1465d064dd
|
!307 调用获取地址参数顺序错误
Merge pull request !307 from plimlips/N/A
|
3 years ago |
|
芋道源码
|
250d18ad13
|
!308 解决新建订单时,订单Id使用使用了address Id的问题
Merge pull request !308 from plimlips/N/A
|
3 years ago |
sfmind
|
b4cde69ddb
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
3 years ago |
|
sfmind
|
49fe926cb8
|
uni-app调整vuex目录结构
|
3 years ago |
|
sfmind
|
a72c68ce87
|
微调组件显示
|
3 years ago |
|
YunaiV
|
73d847ae2e
|
调整支付模块的回调地址
|
3 years ago |
|
YunaiV
|
64df5ce5f4
|
trade：【交易售后】增加会员取消售后
|
3 years ago |
|
YunaiV
|
ed9c8d4a78
|
trade：【交易售后】增加售后日志
|
3 years ago |
plimlips
|
453669c7d9
|
解决新建订单时,订单Id使用使用了address Id的问题
Signed-off-by: plimlips <156839224@qq.com>
|
3 years ago |
|
plimlips
|
19a6fc79a2
|
调用获取地址参数顺序错误
Signed-off-by: plimlips <156839224@qq.com>
|
3 years ago |
|
芋道源码
|
dbf237a1f3
|
修复 Swagger 注解错误，导致文档 404 问题
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
|
3 years ago |
|
YunaiV
|
d884303df6
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
YunaiV
|
8f6c37755c
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
00e66216c5
|
trade：【交易售后】查询分页列表的前端
|
3 years ago |
|
sfmind
|
dc3e353a80
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
3 years ago |
|
sfmind
|
dbf2597d3b
|
重构页面抽取组件
|
3 years ago |
|
YunaiV
|
35528e8267
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
sfmind
|
987c0218fa
|
删除多余无用文件
|
3 years ago |
|
sfmind
|
fb097f7a5b
|
uView版本升级到2.0.34
|
3 years ago |
|
芋道源码
|
277cbce58f
|
!303 fix:加入异步注解配置后redis消费者不能正常消费
Merge pull request !303 from zy_2021/master
|
3 years ago |
|
YunaiV
|
73b92190c6
|
trade：【交易售后】增加申请售后的单元测试
|
3 years ago |
|
YunaiV
|
af71a19241
|
trade：【商品】sku 表增加 spu_name 字段，冗余
|
3 years ago |
|
YunaiV
|
964f8cb35b
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
e95402ab92
|
trade：【交易订单】调整交易订单的 afterSale 字段
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
b3cea2d4bf
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
|
LAPTOP-CNV4CMCJ\cheng
|
78ae018320
|
新增退款列表页 调整商品列表页的tab切换
|
3 years ago |
zy
|
9b667448ea
|
fix: 加入异步注解配置后redis消费者不能正常消费
|
3 years ago |
|
YunaiV
|
cd2bc112cc
|
trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑
|
3 years ago |
|
YunaiV
|
ee1d362a7c
|
trade：【交易售后】回调退款
|
3 years ago |
|
YunaiV
|
67050eeaa8
|
trade：【交易售后】确认收货
|
3 years ago |
|
YunaiV
|
40f0117130
|
trade：售后增加发货
|
3 years ago |
|
YunaiV
|
92dbf093ea
|
trade：增加管理员审批
|
3 years ago |
|
YunaiV
|
969b9c3458
|
修复 swagger 404 的问题
|
3 years ago |
|
YunaiV
|
10f2dbc8cd
|
trade: 增加创建售后订单的接口
|
3 years ago |
|
YunaiV
|
b8d1d31df0
|
trade: 调整退款单
|
3 years ago |
|
YunaiV
|
f6420e301e
|
修复部分单元测试报错的问题
|
3 years ago |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中
|
3 years ago |
|
YunaiV
|
12d045ea58
|
修复部分单元测试报错的问题
|
3 years ago |
|
YunaiV
|
a543b8c67a
|
同步商城的最新代码
|
3 years ago |
|
YunaiV
|
38d6b51fcc
|
v3.8.4:优化页面内嵌iframe切换tab不刷新数据
|
3 years ago |
|
YunaiV
|
89580e7903
|
合并 master 代码
|
3 years ago |
|
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
|
3 years ago |
|
芋道源码
|
29cd9b79de
|
!299 refactor vue3 vxe crud
Merge pull request !299 from xingyu/feature/vue3
|
3 years ago |