YunaiV
|
68c1113ed1
|
code review：优惠劵发放
|
2023-09-02 00:32:16 +08:00 |
|
YunaiV
|
a6ec3fefcf
|
code review：优惠劵发放
|
2023-09-02 00:31:23 +08:00 |
|
owen
|
3fbce643ee
|
mall: 发送优惠券功能优化
|
2023-09-01 23:45:50 +08:00 |
|
YunaiV
|
76f510f247
|
code review：优惠劵发放
|
2023-09-01 22:51:28 +08:00 |
|
芋道源码
|
af0771a175
|
!597 优惠券
Merge pull request !597 from 疯狂的世界/owen_dev
|
2023-09-01 12:12:02 +00:00 |
|
YunaiV
|
28adfff10e
|
code review：订单逻辑
|
2023-09-01 20:00:04 +08:00 |
|
芋道源码
|
8dd600a300
|
!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
Merge pull request !600 from puhui999/feature/mall_product
|
2023-09-01 11:49:23 +00:00 |
|
zhijiantianya@gmail.com
|
dd6adb8ee6
|
code review order
|
2023-09-01 19:08:27 +08:00 |
|
puhui999
|
e26814be31
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-01 12:13:11 +08:00 |
|
puhui999
|
1f9968d784
|
订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
|
2023-09-01 12:12:15 +08:00 |
|
YunaiV
|
f28b960319
|
调整最新图片 url
|
2023-08-31 20:06:02 +08:00 |
|
YunaiV
|
60d4aa97fb
|
code review：售后详情接口
|
2023-08-30 20:18:40 +08:00 |
|
YunaiV
|
059202a588
|
购物车：调整购物车接口
|
2023-08-30 19:14:28 +08:00 |
|
chenchen
|
73f1636daa
|
售后日志添加售前售后状态
|
2023-08-30 10:58:37 +08:00 |
|
YunaiV
|
3e4b1c0552
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-30 08:43:13 +08:00 |
|
YunaiV
|
5a788af084
|
购物车：简化 cart 表命名
|
2023-08-30 08:43:07 +08:00 |
|
puhui999
|
d5fe7708ce
|
订单售后退款：添加获取售后订单详情接口
|
2023-08-29 09:54:14 +08:00 |
|
puhui999
|
0411b3464a
|
订单售后退款：添加获取售后订单详情接口
|
2023-08-28 17:21:29 +08:00 |
|
puhui999
|
498edfffb1
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-08-28 09:24:04 +08:00 |
|
puhui999
|
655eefc340
|
订单管理：完善订单管理提到的一些问题
|
2023-08-28 09:23:30 +08:00 |
|
owen
|
530ec7ab24
|
mall: 完善后台发送优惠券
|
2023-08-26 22:29:56 +08:00 |
|
YunaiV
|
f5c5d38303
|
code review：商品评论
|
2023-08-26 21:23:01 +08:00 |
|
owen
|
1e2c83d90f
|
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
|
2023-08-26 14:40:16 +08:00 |
|
owen
|
02abe86253
|
member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
|
2023-08-26 13:52:20 +08:00 |
|
YunaiV
|
b75d777670
|
code review：订单评论、订单积分的变更
|
2023-08-26 10:54:45 +08:00 |
|
owen
|
d4acacec60
|
trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分
|
2023-08-25 23:07:54 +08:00 |
|
owen
|
dad56fd096
|
trade: 1.支付成功后，增加用户经验；2.退款成功后，扣减用户经验
|
2023-08-25 22:21:14 +08:00 |
|
owen
|
2132de9dd1
|
商品：完善后台商品评论功能
|
2023-08-25 21:02:49 +08:00 |
|
YunaiV
|
5932e8e931
|
code review：订单列表、详情
|
2023-08-23 00:46:28 +08:00 |
|
puhui999
|
002475f33a
|
订单管理：完善订单管理 补全相关接口
|
2023-08-22 18:55:00 +08:00 |
|
puhui999
|
d2c135eda9
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2023-08-22 16:31:28 +08:00 |
|
puhui999
|
d29c5a556c
|
订单管理：添加修改备注、订单调价、修改地址接口
|
2023-08-22 12:19:25 +08:00 |
|
puhui999
|
716f11e80b
|
fix: 合并差异
|
2023-08-22 00:57:36 +08:00 |
|
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
|
2023-08-22 00:46:47 +08:00 |
|
puhui999
|
c2b6c0d72a
|
fix: 订单列表重构 ①
|
2023-08-22 00:42:20 +08:00 |
|
YunaiV
|
94a32d34b2
|
1. 会员用户，增加 point 积分字段
2. 增加获得优惠劵、收藏数量的 API 接口
|
2023-08-19 17:00:40 +08:00 |
|
YunaiV
|
61fbb9909a
|
订单：
1、简化交易订单的逻辑
|
2023-08-18 19:59:30 +08:00 |
|
YunaiV
|
fe07e223e4
|
订单：
1、简化交易订单的逻辑
|
2023-08-18 19:28:36 +08:00 |
|
YunaiV
|
f217ba0807
|
售后：
1、完善整个流程的实现
|
2023-08-18 19:22:08 +08:00 |
|
YunaiV
|
5dd6e5bee8
|
营销：
1. 售后订单，增加对 afterSaleId 的更新
|
2023-08-17 22:32:30 +08:00 |
|
YunaiV
|
c3de25e760
|
营销：
1. 调整店铺装修接口
|
2023-08-16 22:11:18 +08:00 |
|
YunaiV
|
a159a983a2
|
订单：
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
|
2023-08-15 21:19:13 +08:00 |
|
YunaiV
|
159c74ce15
|
订单：
1. review 发货
2. review 拼团逻辑
|
2023-08-15 21:04:20 +08:00 |
|
芋道源码
|
60171ce7e4
|
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
Merge pull request !571 from puhui999/feature/mall_product
|
2023-08-15 12:29:51 +00:00 |
|
YunaiV
|
e4a2c738b2
|
订单：
1. 增加查询物流接口
|
2023-08-15 20:18:22 +08:00 |
|
puhui999
|
5c2723c7bf
|
fix: 修复合并差异
|
2023-08-15 00:02:50 +08:00 |
|
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
|
2023-08-14 21:42:11 +08:00 |
|
puhui999
|
e2a8f7b389
|
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
|
2023-08-14 21:26:07 +08:00 |
|
puhui999
|
651725e3e8
|
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
|
2023-08-14 21:20:03 +08:00 |
|
YunaiV
|
715c42574f
|
订单：
1、订单评价的接入
|
2023-08-13 21:44:48 +08:00 |
|