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 |
|
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 |
|
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 |
|
puhui999
|
831983e314
|
营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法
|
2 years ago |
|
puhui999
|
57407a39d2
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2 years ago |
|
puhui999
|
c869d99a0f
|
修复：启动报错-循环依赖
|
2 years ago |
|
puhui999
|
53e67c0437
|
拼团活动：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
7b727d5ce2
|
code review：拼团记录流程
|
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 |
|
YunaiV
|
c7b5df930e
|
promotion：修复拼团下单时，相关字段记录不正确的情况。
|
2 years ago |
|
YunaiV
|
c8f1269d6e
|
promotion：修复砍价活动返回的 combinationPrice 为空的问题
|
2 years ago |
|
puhui999
|
6099786c1b
|
拼团记录：完善拼团记录后台管理接口
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
34bf360da6
|
trade：调整拼团活动列表接口
|
2 years ago |
|
puhui999
|
ce77d510bb
|
拼团记录：添加拼团记录后台管理接口
|
2 years ago |
|
owen
|
383439f902
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
4f33a0c9c0
|
统计：交易统计Review修改
|
2 years ago |
|
芋道源码
|
a76760c419
|
!653 完善拼团活动下单流程
Merge pull request !653 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
8e7b295d24
|
trade：砍价记录的详情 100%
|
2 years ago |
|
YunaiV
|
5f57cc6247
|
trade：砍价记录的详情 50%
|
2 years ago |
|
puhui999
|
3d51c67f1a
|
拼团活动：app-api 获得拼团活动列表增加 Spring Cache 缓存
|
2 years ago |
|
puhui999
|
92da91a7dc
|
订单：修改订单收货地址添加日志记录
|
2 years ago |
|
puhui999
|
9d7285c4ed
|
营销活动：实现 list-by-spu-ids 接口
|
2 years ago |
|
puhui999
|
07493bc7e5
|
营销活动：实现 list-by-spu-id 接口
|
2 years ago |
|
puhui999
|
3f6f7f404b
|
拼团活动：更改创建拼团记录的校验方式
|
2 years ago |
|
puhui999
|
474eebd8c9
|
拼团活动：更改创建拼团记录的校验方式
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
038e23a6b3
|
拼团活动：完善拼团 app-api 相关接口
|
2 years ago |
|
YunaiV
|
aec8e853e4
|
trade：完善砍价的下单流程
|
2 years ago |
|
puhui999
|
0b2943ba8b
|
拼团活动：完善拼团下单金额结算
|
2 years ago |
|
puhui999
|
07d6ab5842
|
拼团活动：完善 TradeCombinationHandler
|
2 years ago |
|
YunaiV
|
1bda3c8b53
|
promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！
|
2 years ago |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2 years ago |
|
YunaiV
|
269da3d56d
|
promotion：新增砍价记录列表
|
2 years ago |
|
YunaiV
|
cd45be1fe2
|
promotion：优化砍价活动的分页结果
|
2 years ago |
|
YunaiV
|
16e436a0f5
|
promotion：增加助力砍价的接口
|
2 years ago |
|
YunaiV
|
cc087e4eca
|
promotion：增加创建砍价的接口
|
2 years ago |
|
YunaiV
|
a37427c355
|
stat：增加用户统计的设计
|
2 years ago |
|
YunaiV
|
c5824eedf7
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2 years ago |
|
YunaiV
|
6f39b2c030
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2 years ago |
|
YunaiV
|
8dbabb9efc
|
trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算
|
2 years ago |
|
owen
|
7a15b340b0
|
交易：核销
|
3 years ago |
|
owen
|
60ea719b46
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
|
3 years ago |
|
owen
|
8e905f706d
|
交易：核销
|
3 years ago |
|
YunaiV
|
dc1347184f
|
code review：拼团、砍价活动
|
3 years ago |
|
YunaiV
|
20f5834d9a
|
trade：价格计算时，接入优惠劵逻辑
|
3 years ago |
|
YunaiV
|
a1e9bedf34
|
promotion：完善秒杀的 uniapp 接口
|
3 years ago |
|
owen
|
5819b08740
|
交易：Review修改
|
3 years ago |
|
owen
|
3c5917a6cd
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
a9e822762d
|
统计：交易统计定时任务
|
3 years ago |
|
YunaiV
|
ac55a9657c
|
promotion：完善秒杀模块
|
3 years ago |
|
YunaiV
|
df4716d5a1
|
code review：分销
|
3 years ago |
|
owen
|
b7359706db
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
d0f0bc5888
|
分销：调整推广人列表查询方式
|
3 years ago |
|
owen
|
7fdd36d979
|
Review代码修改
|
3 years ago |
|
YunaiV
|
1f910992d6
|
trade：新增是否自提的配置项
|
3 years ago |
|
YunaiV
|
fdb10aeced
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
3 years ago |
|
YunaiV
|
0c1f5c9582
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
3 years ago |
|
owen
|
abfebebdd5
|
交易：增加 积分抵扣计算器 单元测试
|
3 years ago |
|
owen
|
afd306a71d
|
交易：增加 赠送积分计算器 单元测试
|
3 years ago |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
3 years ago |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
3 years ago |
|
owen
|
a04a3a27a9
|
Review代码修改
|
3 years ago |
|
puhui999
|
d3f03540f8
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
82210a9583
|
订单：完善拼团活动
|
3 years ago |
|
owen
|
7d68bdc7c8
|
分销：重构下级分销统计
|
3 years ago |
|
owen
|
cafa938ff4
|
common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间
|
3 years ago |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
d2c5eaf916
|
优惠券：重构是否领取检查方式
|
3 years ago |