YunaiV
|
453f69931f
|
code review：营销文章
|
2023-10-19 23:41:39 +08:00 |
|
puhui999
|
ffbf9278b8
|
营销文章：修正文章浏览量类型错误，新增时初始化浏览量
|
2023-10-18 11:27:14 +08:00 |
|
puhui999
|
6081ce30d5
|
营销活动：完善 review 提到的问题
|
2023-10-18 11:09:20 +08:00 |
|
YunaiV
|
d842708c23
|
code review：数据统计
|
2023-10-16 23:42:54 +08:00 |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2023-10-16 22:51:19 +08:00 |
|
puhui999
|
4273b8f09c
|
营销活动：完善 review 提到的问题
|
2023-10-16 18:53:25 +08:00 |
|
puhui999
|
01ef5f7911
|
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/article/ArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
|
2023-10-16 17:47:17 +08:00 |
|
YunaiV
|
7345933d6b
|
code review：文章管理
|
2023-10-16 09:57:57 +08:00 |
|
YunaiV
|
4359c584bb
|
code review：拼团逻辑
|
2023-10-16 09:07:02 +08:00 |
|
puhui999
|
0d45acaf20
|
营销活动：完善文章相关 app 端接口
|
2023-10-15 22:41:18 +08:00 |
|
puhui999
|
26d3672668
|
营销活动: 文章分类管理软件包调整
|
2023-10-15 16:40:27 +08:00 |
|
puhui999
|
1fe6c82899
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-10-15 16:17:14 +08:00 |
|
puhui999
|
55eed1377a
|
营销活动: 新增文章管理
|
2023-10-15 16:16:41 +08:00 |
|
puhui999
|
a47ab32800
|
营销活动: 新增文章分类管理
|
2023-10-15 01:29:30 +08:00 |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2023-10-14 22:00:30 +08:00 |
|
puhui999
|
a4613f0af9
|
拼团活动: 完善 review 提到的问题
|
2023-10-13 12:07:28 +08:00 |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2023-10-11 11:04:22 +08:00 |
|
YunaiV
|
b0179457ce
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑）
|
2023-10-11 07:49:23 +08:00 |
|
puhui999
|
cfbc8b4849
|
拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页
|
2023-10-10 17:21:37 +08:00 |
|
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
|
57407a39d2
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2023-10-09 16:25:06 +08:00 |
|
puhui999
|
c869d99a0f
|
修复：启动报错-循环依赖
|
2023-10-09 16:25:04 +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 |
|
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
|
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 |
|
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 |
|