YunaiV
|
482a84a6f1
|
603 mall: 优惠券退还优化
|
3 years ago |
|
芋道源码
|
670f2ef5da
|
!603 mall: 优惠券退还优化
Merge pull request !603 from 疯狂的世界/mall_order_cancel
|
3 years ago |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
3 years ago |
owen
|
8bbaaf1ce9
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
3 years ago |
|
owen
|
11ad7ad5e4
|
mall: 优惠券退还优化
|
3 years ago |
|
YunaiV
|
c25bf38f50
|
code review：交易订单的取消
|
3 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
|
3 years ago |
|
YunaiV
|
68c1113ed1
|
code review：优惠劵发放
|
3 years ago |
|
YunaiV
|
a6ec3fefcf
|
code review：优惠劵发放
|
3 years ago |
|
owen
|
3fbce643ee
|
mall: 发送优惠券功能优化
|
3 years ago |
|
YunaiV
|
76f510f247
|
code review：优惠劵发放
|
3 years ago |
|
owen
|
b3fcefa677
|
trade: 会员取消订单
|
3 years ago |
|
芋道源码
|
af0771a175
|
!597 优惠券
Merge pull request !597 from 疯狂的世界/owen_dev
|
3 years ago |
|
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
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
|
YunaiV
|
02bc9d28de
|
解决 MapStruct 的时区问题
|
3 years ago |
|
owen
|
530ec7ab24
|
mall: 完善后台发送优惠券
|
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
|
5dd6e5bee8
|
营销：
1. 售后订单，增加对 afterSaleId 的更新
|
3 years ago |
|
YunaiV
|
c3de25e760
|
营销：
1. 调整店铺装修接口
|
3 years ago |
|
YunaiV
|
159c74ce15
|
订单：
1. review 发货
2. review 拼团逻辑
|
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
|
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 |
|
puhui999
|
5f9184904a
|
fix: 完善拼团、秒杀、砍价活动管理
|
3 years ago |
|
YunaiV
|
5e2fa48f20
|
code review：拼团、秒杀活动的代码
|
3 years ago |
|
puhui999
|
f5079b1c57
|
feat: 添加砍价活动相关 DO
|
3 years ago |
|
puhui999
|
d156d43d63
|
fix：完善 review 拼团、秒杀活动的实现提到的问题
|
3 years ago |
|
puhui999
|
446951bd11
|
fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。
|
3 years ago |
|
YunaiV
|
b84f7825c5
|
review 拼团、秒杀活动的实现
|
3 years ago |
|
puhui999
|
7957cfa50d
|
fix：优化拼团与订单集成逻辑
|
3 years ago |
|
puhui999
|
8d13ecc9c8
|
fix：优化订单发货逻辑使其支持一单分发
|
3 years ago |
|
puhui999
|
259807600a
|
feat：拼团订单集成
|
3 years ago |
|
puhui999
|
147cd271b8
|
fix：完善拼团活动列表展示
|
3 years ago |
|
puhui999
|
7cdb321fe4
|
fix：完善拼团活动CRUD
|
3 years ago |
|
puhui999
|
e7d8643665
|
fix：修复 mall review @puhui999
|
3 years ago |
|
puhui999
|
b78f814552
|
fix：mall promotion SeckillActivity
|
3 years ago |
|
puhui999
|
78b3d2a20f
|
fix：mall promotion Combination
|
3 years ago |
|
puhui999
|
41d996f7f3
|
feat：mall promotion CombinationProduct
|
3 years ago |
|
puhui999
|
409ec555e8
|
feat：mall CombinationActivity
|
3 years ago |