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 |
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 |
|
YunaiV
|
c7b5df930e
|
promotion：修复拼团下单时，相关字段记录不正确的情况。
|
2 years ago |
|
YunaiV
|
c8f1269d6e
|
promotion：修复砍价活动返回的 combinationPrice 为空的问题
|
2 years ago |
|
芋道源码
|
1d9db4874f
|
!654 拼团记录：完善拼团记录后台管理接口
Merge pull request !654 from puhui999/feature/mall_product
|
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 |