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 |
|
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
|
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 |
|
YunaiV
|
1bda3c8b53
|
promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！
|
2023-10-05 17:22:17 +08:00 |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2023-10-05 12:43:14 +08:00 |
|
YunaiV
|
269da3d56d
|
promotion：新增砍价记录列表
|
2023-10-05 12:07:05 +08:00 |
|
YunaiV
|
cd45be1fe2
|
promotion：优化砍价活动的分页结果
|
2023-10-05 02:18:14 +08:00 |
|
YunaiV
|
16e436a0f5
|
promotion：增加助力砍价的接口
|
2023-10-05 00:05:20 +08:00 |
|
YunaiV
|
cc087e4eca
|
promotion：增加创建砍价的接口
|
2023-10-04 21:55:05 +08:00 |
|
YunaiV
|
6f39b2c030
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2023-10-04 17:30:07 +08:00 |
|
YunaiV
|
8dbabb9efc
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2023-10-04 11:29:38 +08:00 |
|
YunaiV
|
dc1347184f
|
code review：拼团、砍价活动
|
2023-10-04 00:47:17 +08:00 |
|
YunaiV
|
20f5834d9a
|
trade：价格计算时，接入优惠劵逻辑
|
2023-10-04 00:30:03 +08:00 |
|
YunaiV
|
a1e9bedf34
|
promotion：完善秒杀的 uniapp 接口
|
2023-10-03 21:45:51 +08:00 |
|
YunaiV
|
ac55a9657c
|
promotion：完善秒杀模块
|
2023-10-03 18:41:41 +08:00 |
|
owen
|
7fdd36d979
|
Review代码修改
|
2023-10-02 21:27:46 +08:00 |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2023-10-01 23:31:07 +08:00 |
|
YunaiV
|
057952bdeb
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
|
2023-10-01 22:00:31 +08:00 |
|
owen
|
a04a3a27a9
|
Review代码修改
|
2023-09-30 23:41:11 +08:00 |
|
puhui999
|
82210a9583
|
订单：完善拼团活动
|
2023-09-30 23:34:45 +08:00 |
|
owen
|
d2c5eaf916
|
优惠券：重构是否领取检查方式
|
2023-09-30 22:05:11 +08:00 |
|
owen
|
d0d21b2787
|
优惠券：新增/修改时，校验对应的商品、分类是否存在
|
2023-09-30 19:39:02 +08:00 |
|
owen
|
fc432ba073
|
优惠券：新人券使用 MQ 发放
|
2023-09-30 17:29:32 +08:00 |
|
puhui999
|
597eacaaeb
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2023-09-30 11:35:51 +08:00 |
|
puhui999
|
0b35d4a7e3
|
订单：完善拼团活动部分 TODO
|
2023-09-30 11:27:24 +08:00 |
|
owen
|
6b7f071988
|
Review代码修改
|
2023-09-29 22:47:04 +08:00 |
|
YunaiV
|
9ee0aebd3f
|
promotion：增加 coupon 的 code review
|
2023-09-29 20:52:11 +08:00 |
|
YunaiV
|
9cd36abf10
|
同步 master 分支代码
|
2023-09-28 15:28:40 +08:00 |
|
YunaiV
|
5913ee0706
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
# yudao-server/src/main/resources/application-local.yaml
|
2023-09-28 15:18:59 +08:00 |
|
YunaiV
|
9e3564bd6a
|
code review：优惠劵逻辑
|
2023-09-28 09:23:42 +08:00 |
|
owen
|
2766dd672a
|
优惠券：过期定时任务
|
2023-09-27 00:15:12 +08:00 |
|
owen
|
77f7763560
|
优惠券：完善优惠券领取接口
|
2023-09-26 23:21:01 +08:00 |
|
owen
|
b1ac3a0b8b
|
优惠券：完善优惠券匹配接口
|
2023-09-26 22:46:06 +08:00 |
|
owen
|
f9aec7d8fd
|
优惠券：完善我的优惠券接口
|
2023-09-26 21:08:11 +08:00 |
|
owen
|
0a3a6825d5
|
优惠券：完善APP优惠券查询接口
|
2023-09-26 20:44:22 +08:00 |
|
puhui999
|
bce96b29a6
|
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/convert/order/TradeOrderConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
|
2023-09-25 15:06:57 +08:00 |
|
puhui999
|
42c47d9b44
|
秒回活动：订单金额计算初步设计
|
2023-09-25 14:56:56 +08:00 |
|
YunaiV
|
aa5525d1f5
|
code review：营销活动 & 交易订单的对接
|
2023-09-23 22:21:23 +08:00 |
|
YunaiV
|
71d6311bd4
|
code review：拼团、秒杀等逻辑
|
2023-09-23 09:27:29 +08:00 |
|
puhui999
|
8060aeb5e7
|
秒杀: app 端返回增加秒杀活动状态
|
2023-09-21 09:07:37 +08:00 |
|
puhui999
|
583a0a2dd5
|
砍价+拼团: 修复 selectList limit 条件执行报错问题
|
2023-09-20 16:28:41 +08:00 |
|
puhui999
|
6ef94ade6a
|
完善订单和活动 review 提到的问题
|
2023-09-20 16:06:29 +08:00 |
|
puhui999
|
52848d6341
|
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/app/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
|
2023-09-20 10:14:43 +08:00 |
|
puhui999
|
1d2a6ad065
|
拼团活动: 完善 app 端获取活动分页、列表、详情接口
|
2023-09-20 10:09:15 +08:00 |
|
YunaiV
|
c766f7daa5
|
code review：砍价、秒杀的逻辑
|
2023-09-20 01:07:41 +08:00 |
|
puhui999
|
04a391cd4b
|
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/combination/CombinationActivityApiImpl.java
|
2023-09-19 18:58:53 +08:00 |
|
puhui999
|
408df683d8
|
秒杀活动: 完善 app 端获取活动分页、列表、详情接口
|
2023-09-19 18:57:28 +08:00 |
|