YunaiV
|
970e524088
|
code review：交易统计
|
2023-10-14 13:15:14 +08:00 |
|
YunaiV
|
1ac2f2b5c2
|
code review：会员统计
|
2023-10-14 01:26:06 +08:00 |
|
YunaiV
|
0eb86ca269
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
|
2023-10-13 20:41:17 +08:00 |
|
puhui999
|
a4613f0af9
|
拼团活动: 完善 review 提到的问题
|
2023-10-13 12:07:28 +08:00 |
|
jason
|
e06f61ef39
|
wallet - 充值套餐 管理端
|
2023-10-13 10:46:10 +08:00 |
|
jason
|
8cd7941fc3
|
wallet - 充值套餐 管理端
|
2023-10-13 10:43:04 +08:00 |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-12 22:21:17 +08:00 |
|
jason
|
571961b4da
|
充值套餐修改
|
2023-10-12 22:20:42 +08:00 |
|
YunaiV
|
a72869b97e
|
code review：修复部分统计报错
|
2023-10-12 21:54:06 +08:00 |
|
owen
|
4be709b815
|
统计：Review修改
|
2023-10-11 15:26:17 +08:00 |
|
owen
|
66cdf4ca4c
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-11 15:06:09 +08:00 |
|
YunaiV
|
fef808d88c
|
code review：统计代码
|
2023-10-11 12:32:28 +08:00 |
|
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
|
2023-10-11 11:30:03 +08:00 |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2023-10-11 11:04:22 +08:00 |
|
owen
|
8d40f1d71a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-11 08:27:57 +08:00 |
|
芋道源码
|
708af92a0f
|
!660 优化订单 OrderHandler 实现
Merge pull request !660 from 芋道源码/feature/mall_product_tmp
|
2023-10-10 23:51:10 +00:00 |
|
YunaiV
|
b0179457ce
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑）
|
2023-10-11 07:49:23 +08:00 |
|
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
|
2023-10-10 20:42:33 +08:00 |
|
芋道源码
|
7181ccbcef
|
!657 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
Merge pull request !657 from puhui999/feature/mall_product
|
2023-10-10 12:39:26 +00:00 |
|
YunaiV
|
150a1c9771
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑）
|
2023-10-10 20:38:20 +08:00 |
|
YunaiV
|
2e5cc0537b
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中
|
2023-10-10 19:20:12 +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 |
|
youkehai
|
bc781d9473
|
fix: 【工作流】按 review 修改代码
|
2023-10-10 10:46:16 +08:00 |
|
puhui999
|
245f14b8f1
|
秒杀活动：完成订单取消时恢复活动库存和商品库存
|
2023-10-10 10:25:57 +08:00 |
|
owen
|
2c10dde195
|
统计：修复错误
|
2023-10-09 23:53:50 +08:00 |
|
owen
|
91d0bbf8b1
|
合并代码
|
2023-10-09 23:40:11 +08:00 |
|
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
|
2023-10-09 23:33:51 +08:00 |
|
owen
|
df16278a03
|
统计：会员统计
|
2023-10-09 23:27:10 +08:00 |
|
zhijiantianya@gmail.com
|
6388950ab2
|
code review：【工作流】—— 加签的实现
|
2023-10-09 20:57:23 +08:00 |
|
puhui999
|
831983e314
|
营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法
|
2023-10-09 18:17:20 +08:00 |
|
zhijiantianya@gmail.com
|
45a2cd70f0
|
Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro
|
2023-10-09 17:45:46 +08:00 |
|
youkehai
|
5d6faa8023
|
fix: 【工作流】-加减签父任务处理逻辑完善
|
2023-10-09 16:40:31 +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 |
|
kehaiyou
|
10af05066c
|
feat: 【工作流】--任务列表只返回顶级任务，拼装成父子关系并返回
|
2023-10-08 22:35: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 |
|