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
|
f28b960319
|
调整最新图片 url
|
2023-08-31 20:06:02 +08:00 |
|
owen
|
530ec7ab24
|
mall: 完善后台发送优惠券
|
2023-08-26 22:29:56 +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
|
5dd6e5bee8
|
营销：
1. 售后订单，增加对 afterSaleId 的更新
|
2023-08-17 22:32:30 +08:00 |
|
YunaiV
|
c3de25e760
|
营销：
1. 调整店铺装修接口
|
2023-08-16 22:11:18 +08:00 |
|
YunaiV
|
159c74ce15
|
订单：
1. review 发货
2. review 拼团逻辑
|
2023-08-15 21:04:20 +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
|
503c996acd
|
订单：
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
|
2023-08-13 20:12:24 +08:00 |
|
YunaiV
|
e159b2e500
|
code review：砍价的代码
|
2023-08-13 00:49:35 +08:00 |
|
YunaiV
|
ba31d5f6fb
|
优化拼团活动的管理后台代码
|
2023-08-13 00:06:46 +08:00 |
|
YunaiV
|
6fdd4da0b3
|
优化秒杀活动的管理后台代码
|
2023-08-12 16:05:47 +08:00 |
|
zhijiantianya@gmail.com
|
ba59ec85e0
|
code review 各种活动
|
2023-08-07 19:30:26 +08:00 |
|
puhui999
|
384359c9d4
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 20:21:53 +08:00 |
|
puhui999
|
5f9184904a
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 17:46:16 +08:00 |
|
YunaiV
|
5e2fa48f20
|
code review：拼团、秒杀活动的代码
|
2023-08-05 20:51:48 +08:00 |
|
puhui999
|
f5079b1c57
|
feat: 添加砍价活动相关 DO
|
2023-07-31 18:36:21 +08:00 |
|
puhui999
|
d156d43d63
|
fix：完善 review 拼团、秒杀活动的实现提到的问题
|
2023-07-31 18:34:56 +08:00 |
|
puhui999
|
446951bd11
|
fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。
|
2023-07-28 16:30:38 +08:00 |
|
YunaiV
|
b84f7825c5
|
review 拼团、秒杀活动的实现
|
2023-07-26 19:09:47 +08:00 |
|
puhui999
|
7957cfa50d
|
fix：优化拼团与订单集成逻辑
|
2023-07-24 17:29:51 +08:00 |
|
puhui999
|
8d13ecc9c8
|
fix：优化订单发货逻辑使其支持一单分发
|
2023-07-24 15:14:16 +08:00 |
|
puhui999
|
259807600a
|
feat：拼团订单集成
|
2023-07-21 16:47:04 +08:00 |
|
puhui999
|
147cd271b8
|
fix：完善拼团活动列表展示
|
2023-07-14 17:34:37 +08:00 |
|
puhui999
|
7cdb321fe4
|
fix：完善拼团活动CRUD
|
2023-07-14 17:08:37 +08:00 |
|
puhui999
|
e7d8643665
|
fix：修复 mall review @puhui999
|
2023-07-10 16:35:49 +08:00 |
|
puhui999
|
b78f814552
|
fix：mall promotion SeckillActivity
|
2023-07-05 22:05:05 +08:00 |
|
puhui999
|
78b3d2a20f
|
fix：mall promotion Combination
|
2023-07-05 11:31:16 +08:00 |
|
puhui999
|
41d996f7f3
|
feat：mall promotion CombinationProduct
|
2023-07-04 11:21:03 +08:00 |
|
puhui999
|
409ec555e8
|
feat：mall CombinationActivity
|
2023-07-03 08:07:05 +08:00 |
|
YunaiV
|
ef656cf762
|
mall + promotion：
1、增加获得符合条件的优惠劵
|
2023-06-29 20:20:00 +08:00 |
|
YunaiV
|
846405d8b1
|
mall + promotion：
1、增加 article mock 接口
|
2023-06-27 22:44:38 +08:00 |
|
YunaiV
|
7036a6652c
|
mall + member：
1、调整收获地址的返回
|
2023-06-26 20:07:46 +08:00 |
|
YunaiV
|
5c9a99c83e
|
mall + promotion：
1、mock 优惠劵模版分页
2、mock 批量删除收藏
|
2023-06-25 17:40:04 +08:00 |
|
YunaiV
|
4a3703e302
|
mall + promotion：review 页面装修
|
2023-06-25 11:24:55 +08:00 |
|
jason
|
050f0bb6a2
|
页面装修 review 修改
|
2023-06-24 21:09:49 +08:00 |
|
YunaiV
|
b582206003
|
mall + promotion：review 页面装修
|
2023-06-24 12:54:59 +08:00 |
|
jason
|
ad1f656dfa
|
页面装修修改,后端只负责存取
|
2023-06-24 00:11:04 +08:00 |
|
YunaiV
|
2efdbf93cb
|
mall + promotion：review 秒杀、评论代码
|
2023-06-23 21:14:36 +08:00 |
|
芋道源码
|
b16632ea41
|
!522 mall seckill
Merge pull request !522 from puhui999/feature/mall_product
|
2023-06-23 06:04:47 +00:00 |
|
jason
|
6b1d996b66
|
页面装修数据结构定义
|
2023-06-23 10:53:29 +08:00 |
|
puhui999
|
26f563df57
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-23 00:57:49 +08:00 |
|
puhui999
|
ab30ff6480
|
fix：完善 mall seckill 相关 ②
|
2023-06-23 00:57:27 +08:00 |
|
YunaiV
|
b0fcd96dfe
|
mall + promotion：增加砍价记录的 mock
|
2023-06-23 00:26:04 +08:00 |
|