YunaiV
|
7a9dbfe41d
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
YunaiV
|
b30754a0a4
|
同步最新 mall 代码
|
2 years ago |
|
YunaiV
|
a72869b97e
|
code review：修复部分统计报错
|
2 years ago |
|
YunaiV
|
fef808d88c
|
code review：统计代码
|
2 years ago |
|
YunaiV
|
704087ce86
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
|
2 years ago |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2 years ago |
|
芋道源码
|
708af92a0f
|
!660 优化订单 OrderHandler 实现
Merge pull request !660 from 芋道源码/feature/mall_product_tmp
|
2 years ago |
|
YunaiV
|
b0179457ce
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑）
|
2 years ago |
|
YunaiV
|
41e5cf5285
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
|
2 years ago |
|
芋道源码
|
7181ccbcef
|
!657 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
Merge pull request !657 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
150a1c9771
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑）
|
2 years ago |
|
YunaiV
|
2e5cc0537b
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中
|
2 years ago |
puhui999
|
cfbc8b4849
|
拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页
|
2 years ago |
|
puhui999
|
bccd270fc7
|
营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
|
2 years ago |
|
puhui999
|
fdbebc406c
|
秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题
|
2 years ago |
|
puhui999
|
42fcbe0501
|
砍价活动：完成订单取消时恢复活动库存
|
2 years ago |
|
puhui999
|
245f14b8f1
|
秒杀活动：完成订单取消时恢复活动库存和商品库存
|
2 years ago |
owen
|
2c10dde195
|
统计：修复错误
|
2 years ago |
|
owen
|
91d0bbf8b1
|
合并代码
|
2 years ago |
|
owen
|
74a5e40d8d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
|
2 years ago |
|
owen
|
df16278a03
|
统计：会员统计
|
2 years ago |
|
zhijiantianya@gmail.com
|
6388950ab2
|
code review：【工作流】—— 加签的实现
|
2 years ago |
|
puhui999
|
831983e314
|
营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法
|
2 years ago |
|
zhijiantianya@gmail.com
|
45a2cd70f0
|
Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro
|
2 years ago |
youkehai
|
5d6faa8023
|
fix: 【工作流】-加减签父任务处理逻辑完善
|
2 years ago |
|
puhui999
|
e845872adc
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
57407a39d2
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2 years ago |
|
puhui999
|
c869d99a0f
|
修复：启动报错-循环依赖
|
2 years ago |
|
puhui999
|
cd887511d8
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2 years ago |
|
puhui999
|
e09f07475a
|
修复：启动保存-循环依赖
|
2 years ago |
|
puhui999
|
53e67c0437
|
拼团活动：完善 review 提到的问题
|
2 years ago |
kehaiyou
|
10af05066c
|
feat: 【工作流】--任务列表只返回顶级任务，拼装成父子关系并返回
|
2 years ago |
|
YunaiV
|
7b727d5ce2
|
code review：拼团记录流程
|
2 years ago |
|
芋道源码
|
781ec1028f
|
!656 拼团活动：完善 review 提到的问题
Merge pull request !656 from puhui999/feature/mall_product
|
2 years ago |
|
puhui999
|
2c0f1121ca
|
拼团活动：完善 review 提到的问题
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
c71bdd158a
|
拼团活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
c8a9d68933
|
拼团活动：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
8a11ca8126
|
code review：拼团记录流程
|
2 years ago |
|
YunaiV
|
01e6140d67
|
code review：拼团记录流程
|
2 years ago |
|
YunaiV
|
99649bfdb8
|
code review：拼团记录流程
|
2 years ago |
|
YunaiV
|
6a38da4ad9
|
promotion：合并最新代码
|
2 years ago |
|
YunaiV
|
c917f01d83
|
promotion：code review 拼团相关的部分代码
|
2 years ago |
|
puhui999
|
6636ee7420
|
拼团记录(APP)：新增一个取消拼团的接口
|
2 years ago |
|
puhui999
|
1a0fda23b1
|
拼团记录：调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP
|
2 years ago |
|
puhui999
|
89b240c1f9
|
订单：介入 TradeOrderHandler#cancelOrder
|
2 years ago |
|
puhui999
|
c485c6e04d
|
订单：重构拼团下单流程更改为订单支付后再创建拼团记录
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
f40bd23f6a
|
拼团记录：完善拼团记录创建前的条件校验规则
|
2 years ago |
|
YunaiV
|
ec2c3e508a
|
promotion：优化拼团记录的详情代码
|
2 years ago |