YunaiV
|
482a84a6f1
|
603 mall: 优惠券退还优化
|
2 years ago |
|
芋道源码
|
670f2ef5da
|
!603 mall: 优惠券退还优化
Merge pull request !603 from 疯狂的世界/mall_order_cancel
|
2 years ago |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
owen
|
71efa0ed6f
|
promotion: 订单使用品类券时，根据品类过滤可用商品
|
2 years ago |
|
owen
|
8bbaaf1ce9
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2 years ago |
|
owen
|
11ad7ad5e4
|
mall: 优惠券退还优化
|
2 years ago |
|
YunaiV
|
c25bf38f50
|
code review：交易订单的取消
|
2 years ago |
|
YunaiV
|
9c0d0c809a
|
Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2 years ago |
|
YunaiV
|
68c1113ed1
|
code review：优惠劵发放
|
2 years ago |
|
YunaiV
|
a6ec3fefcf
|
code review：优惠劵发放
|
2 years ago |
|
owen
|
3fbce643ee
|
mall: 发送优惠券功能优化
|
2 years ago |
|
YunaiV
|
76f510f247
|
code review：优惠劵发放
|
2 years ago |
|
owen
|
b3fcefa677
|
trade: 会员取消订单
|
2 years ago |
|
芋道源码
|
af0771a175
|
!597 优惠券
Merge pull request !597 from 疯狂的世界/owen_dev
|
2 years ago |
|
YunaiV
|
28adfff10e
|
code review：订单逻辑
|
2 years ago |
|
芋道源码
|
8dd600a300
|
!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
Merge pull request !600 from puhui999/feature/mall_product
|
2 years ago |
|
zhijiantianya@gmail.com
|
dd6adb8ee6
|
code review order
|
2 years ago |
puhui999
|
e26814be31
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
1f9968d784
|
订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
|
2 years ago |
|
YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
f28b960319
|
调整最新图片 url
|
2 years ago |
|
YunaiV
|
60d4aa97fb
|
code review：售后详情接口
|
2 years ago |
|
YunaiV
|
059202a588
|
购物车：调整购物车接口
|
2 years ago |
chenchen
|
73f1636daa
|
售后日志添加售前售后状态
|
2 years ago |
|
YunaiV
|
3e4b1c0552
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
5a788af084
|
购物车：简化 cart 表命名
|
2 years ago |
|
puhui999
|
d5fe7708ce
|
订单售后退款：添加获取售后订单详情接口
|
2 years ago |
|
puhui999
|
0411b3464a
|
订单售后退款：添加获取售后订单详情接口
|
2 years ago |
|
puhui999
|
498edfffb1
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
655eefc340
|
订单管理：完善订单管理提到的一些问题
|
2 years ago |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
02bc9d28de
|
解决 MapStruct 的时区问题
|
2 years ago |
|
owen
|
530ec7ab24
|
mall: 完善后台发送优惠券
|
2 years ago |
|
YunaiV
|
f5c5d38303
|
code review：商品评论
|
2 years ago |
|
owen
|
1e2c83d90f
|
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
|
2 years ago |
|
owen
|
02abe86253
|
member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
|
2 years ago |
|
YunaiV
|
b75d777670
|
code review：订单评论、订单积分的变更
|
2 years ago |
|
owen
|
d4acacec60
|
trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分
|
2 years ago |
|
owen
|
dad56fd096
|
trade: 1.支付成功后，增加用户经验；2.退款成功后，扣减用户经验
|
2 years ago |
|
owen
|
2132de9dd1
|
商品：完善后台商品评论功能
|
2 years ago |
shizhong
|
eb4434ecbc
|
解决MapStruct的时区问题
|
2 years ago |
|
YunaiV
|
5932e8e931
|
code review：订单列表、详情
|
2 years ago |
|
puhui999
|
002475f33a
|
订单管理：完善订单管理 补全相关接口
|
2 years ago |
|
puhui999
|
d2c135eda9
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2 years ago |
|
puhui999
|
d29c5a556c
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2 years ago |
|
puhui999
|
716f11e80b
|
fix: 合并差异
|
2 years ago |
|
puhui999
|
8123354f09
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
|
2 years ago |
|
puhui999
|
c2b6c0d72a
|
fix: 订单列表重构 ①
|
2 years ago |
|
YunaiV
|
94a32d34b2
|
1. 会员用户，增加 point 积分字段
2. 增加获得优惠劵、收藏数量的 API 接口
|
3 years ago |
|
YunaiV
|
61fbb9909a
|
订单：
1、简化交易订单的逻辑
|
3 years ago |