puhui999
|
bccd270fc7
|
营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
|
2023-10-10 15:30:58 +08:00 |
|
puhui999
|
fdbebc406c
|
秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题
|
2023-10-10 10:57:17 +08:00 |
|
puhui999
|
42fcbe0501
|
砍价活动：完成订单取消时恢复活动库存
|
2023-10-10 10:47:25 +08:00 |
|
puhui999
|
245f14b8f1
|
秒杀活动：完成订单取消时恢复活动库存和商品库存
|
2023-10-10 10:25:57 +08:00 |
|
puhui999
|
831983e314
|
营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法
|
2023-10-09 18:17:20 +08:00 |
|
puhui999
|
e845872adc
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-09 16:26:42 +08:00 |
|
puhui999
|
57407a39d2
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2023-10-09 16:25:06 +08:00 |
|
puhui999
|
c869d99a0f
|
修复：启动报错-循环依赖
|
2023-10-09 16:25:04 +08:00 |
|
puhui999
|
cd887511d8
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2023-10-09 16:18:00 +08:00 |
|
puhui999
|
e09f07475a
|
修复：启动保存-循环依赖
|
2023-10-09 16:11:02 +08:00 |
|
puhui999
|
53e67c0437
|
拼团活动：完善 review 提到的问题
|
2023-10-09 11:53:02 +08:00 |
|
YunaiV
|
7b727d5ce2
|
code review：拼团记录流程
|
2023-10-08 21:14:54 +08:00 |
|
芋道源码
|
781ec1028f
|
!656 拼团活动：完善 review 提到的问题
Merge pull request !656 from puhui999/feature/mall_product
|
2023-10-08 12:06:35 +00:00 |
|
puhui999
|
2c0f1121ca
|
拼团活动：完善 review 提到的问题
|
2023-10-08 17:46:48 +08:00 |
|
puhui999
|
2e559ebe06
|
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/service/combination/CombinationRecordServiceImpl.java
|
2023-10-08 17:33:21 +08:00 |
|
puhui999
|
c71bdd158a
|
拼团活动：完善 review 提到的问题
|
2023-10-08 17:19:39 +08:00 |
|
puhui999
|
c8a9d68933
|
拼团活动：完善 review 提到的问题
|
2023-10-08 12:08:17 +08:00 |
|
YunaiV
|
8a11ca8126
|
code review：拼团记录流程
|
2023-10-08 09:59:53 +08:00 |
|
YunaiV
|
01e6140d67
|
code review：拼团记录流程
|
2023-10-08 09:53:09 +08:00 |
|
YunaiV
|
99649bfdb8
|
code review：拼团记录流程
|
2023-10-08 07:43:25 +08:00 |
|
YunaiV
|
6a38da4ad9
|
promotion：合并最新代码
|
2023-10-07 23:00:13 +08:00 |
|
YunaiV
|
c917f01d83
|
promotion：code review 拼团相关的部分代码
|
2023-10-07 22:47:45 +08:00 |
|
puhui999
|
6636ee7420
|
拼团记录(APP)：新增一个取消拼团的接口
|
2023-10-07 18:46:19 +08:00 |
|
puhui999
|
1a0fda23b1
|
拼团记录：调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP
|
2023-10-07 17:11:25 +08:00 |
|
puhui999
|
89b240c1f9
|
订单：介入 TradeOrderHandler#cancelOrder
|
2023-10-07 16:58:40 +08:00 |
|
puhui999
|
c485c6e04d
|
订单：重构拼团下单流程更改为订单支付后再创建拼团记录
|
2023-10-07 16:30:28 +08:00 |
|
puhui999
|
c95317577d
|
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/service/combination/CombinationRecordServiceImpl.java
|
2023-10-07 14:33:09 +08:00 |
|
puhui999
|
f40bd23f6a
|
拼团记录：完善拼团记录创建前的条件校验规则
|
2023-10-07 14:30:25 +08:00 |
|
YunaiV
|
ec2c3e508a
|
promotion：优化拼团记录的详情代码
|
2023-10-07 13:58:12 +08:00 |
|
YunaiV
|
c7b5df930e
|
promotion：修复拼团下单时，相关字段记录不正确的情况。
|
2023-10-07 07:09:15 +08:00 |
|
YunaiV
|
c8f1269d6e
|
promotion：修复砍价活动返回的 combinationPrice 为空的问题
|
2023-10-06 22:29:11 +08:00 |
|
芋道源码
|
1d9db4874f
|
!654 拼团记录：完善拼团记录后台管理接口
Merge pull request !654 from puhui999/feature/mall_product
|
2023-10-06 14:00:23 +00:00 |
|
puhui999
|
6099786c1b
|
拼团记录：完善拼团记录后台管理接口
|
2023-10-06 21:26:53 +08:00 |
|
puhui999
|
8b480c52cc
|
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/dal/mysql/combination/CombinationRecordMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
|
2023-10-06 21:15:06 +08:00 |
|
YunaiV
|
34bf360da6
|
trade：调整拼团活动列表接口
|
2023-10-06 21:04:37 +08:00 |
|
puhui999
|
ce77d510bb
|
拼团记录：添加拼团记录后台管理接口
|
2023-10-06 20:27:22 +08:00 |
|
芋道源码
|
a76760c419
|
!653 完善拼团活动下单流程
Merge pull request !653 from puhui999/feature/mall_product
|
2023-10-06 02:20:21 +00:00 |
|
YunaiV
|
8e7b295d24
|
trade：砍价记录的详情 100%
|
2023-10-06 10:17:41 +08:00 |
|
YunaiV
|
5f57cc6247
|
trade：砍价记录的详情 50%
|
2023-10-06 02:06:38 +08:00 |
|
puhui999
|
3d51c67f1a
|
拼团活动：app-api 获得拼团活动列表增加 Spring Cache 缓存
|
2023-10-06 01:43:56 +08:00 |
|
puhui999
|
92da91a7dc
|
订单：修改订单收货地址添加日志记录
|
2023-10-06 01:32:57 +08:00 |
|
puhui999
|
9d7285c4ed
|
营销活动：实现 list-by-spu-ids 接口
|
2023-10-06 01:19:32 +08:00 |
|
puhui999
|
07493bc7e5
|
营销活动：实现 list-by-spu-id 接口
|
2023-10-06 01:04:36 +08:00 |
|
puhui999
|
3f6f7f404b
|
拼团活动：更改创建拼团记录的校验方式
|
2023-10-06 00:24:40 +08:00 |
|
puhui999
|
474eebd8c9
|
拼团活动：更改创建拼团记录的校验方式
|
2023-10-06 00:20:00 +08:00 |
|
puhui999
|
f732e7a750
|
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/api/bargain/BargainRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java
|
2023-10-06 00:05:28 +08:00 |
|
puhui999
|
038e23a6b3
|
拼团活动：完善拼团 app-api 相关接口
|
2023-10-06 00:03:03 +08:00 |
|
YunaiV
|
aec8e853e4
|
trade：完善砍价的下单流程
|
2023-10-05 23:24:44 +08:00 |
|
puhui999
|
0b2943ba8b
|
拼团活动：完善拼团下单金额结算
|
2023-10-05 21:28:38 +08:00 |
|
puhui999
|
07d6ab5842
|
拼团活动：完善 TradeCombinationHandler
|
2023-10-05 19:14:19 +08:00 |
|