YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
|
YunaiV
|
f28b960319
|
调整最新图片 url
|
3 years ago |
|
YunaiV
|
60d4aa97fb
|
code review：售后详情接口
|
3 years ago |
|
YunaiV
|
059202a588
|
购物车：调整购物车接口
|
3 years ago |
chenchen
|
73f1636daa
|
售后日志添加售前售后状态
|
3 years ago |
|
YunaiV
|
3e4b1c0552
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
5a788af084
|
购物车：简化 cart 表命名
|
3 years ago |
puhui999
|
d5fe7708ce
|
订单售后退款：添加获取售后订单详情接口
|
3 years ago |
|
puhui999
|
0411b3464a
|
订单售后退款：添加获取售后订单详情接口
|
3 years ago |
|
puhui999
|
498edfffb1
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
655eefc340
|
订单管理：完善订单管理提到的一些问题
|
3 years ago |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
|
YunaiV
|
02bc9d28de
|
解决 MapStruct 的时区问题
|
3 years ago |
|
YunaiV
|
f5c5d38303
|
code review：商品评论
|
3 years ago |
owen
|
1e2c83d90f
|
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
|
3 years ago |
|
owen
|
02abe86253
|
member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
|
3 years ago |
|
YunaiV
|
b75d777670
|
code review：订单评论、订单积分的变更
|
3 years ago |
|
owen
|
d4acacec60
|
trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分
|
3 years ago |
|
owen
|
dad56fd096
|
trade: 1.支付成功后，增加用户经验；2.退款成功后，扣减用户经验
|
3 years ago |
|
owen
|
2132de9dd1
|
商品：完善后台商品评论功能
|
3 years ago |
shizhong
|
eb4434ecbc
|
解决MapStruct的时区问题
|
3 years ago |
|
YunaiV
|
5932e8e931
|
code review：订单列表、详情
|
3 years ago |
|
puhui999
|
002475f33a
|
订单管理：完善订单管理 补全相关接口
|
3 years ago |
|
puhui999
|
d2c135eda9
|
订单管理：添加修改备注、订单调价、修改地址接口
|
3 years ago |
|
puhui999
|
d29c5a556c
|
订单管理：添加修改备注、订单调价、修改地址接口
|
3 years ago |
|
puhui999
|
716f11e80b
|
fix: 合并差异
|
3 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
|
3 years ago |
|
puhui999
|
c2b6c0d72a
|
fix: 订单列表重构 ①
|
3 years ago |
|
YunaiV
|
94a32d34b2
|
1. 会员用户，增加 point 积分字段
2. 增加获得优惠劵、收藏数量的 API 接口
|
3 years ago |
|
YunaiV
|
61fbb9909a
|
订单：
1、简化交易订单的逻辑
|
3 years ago |
|
YunaiV
|
fe07e223e4
|
订单：
1、简化交易订单的逻辑
|
3 years ago |
|
YunaiV
|
f217ba0807
|
售后：
1、完善整个流程的实现
|
3 years ago |
|
YunaiV
|
5dd6e5bee8
|
营销：
1. 售后订单，增加对 afterSaleId 的更新
|
3 years ago |
|
YunaiV
|
c3de25e760
|
营销：
1. 调整店铺装修接口
|
3 years ago |
|
YunaiV
|
a159a983a2
|
订单：
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
|
3 years ago |
|
YunaiV
|
159c74ce15
|
订单：
1. review 发货
2. review 拼团逻辑
|
3 years ago |
|
芋道源码
|
60171ce7e4
|
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
Merge pull request !571 from puhui999/feature/mall_product
|
3 years ago |
|
YunaiV
|
e4a2c738b2
|
订单：
1. 增加查询物流接口
|
3 years ago |
|
puhui999
|
5c2723c7bf
|
fix: 修复合并差异
|
3 years ago |
|
puhui999
|
de828e3d04
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
|
3 years ago |
|
puhui999
|
e2a8f7b389
|
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
|
3 years ago |
|
puhui999
|
651725e3e8
|
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
|
3 years ago |
|
YunaiV
|
715c42574f
|
订单：
1、订单评价的接入
|
3 years ago |
|
YunaiV
|
7dc398717a
|
订单：
1、实现确认收货接口
|
3 years ago |
|
YunaiV
|
503c996acd
|
订单：
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
|
3 years ago |
|
YunaiV
|
e159b2e500
|
code review：砍价的代码
|
3 years ago |
|
YunaiV
|
ba31d5f6fb
|
优化拼团活动的管理后台代码
|
3 years ago |
|
YunaiV
|
6fdd4da0b3
|
优化秒杀活动的管理后台代码
|
3 years ago |
|
zhijiantianya@gmail.com
|
ba59ec85e0
|
code review 各种活动
|
3 years ago |
|
puhui999
|
384359c9d4
|
fix: 完善拼团、秒杀、砍价活动管理
|
3 years ago |