p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,257 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

5257 Commits

Author SHA1 Message Date
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 89b240c1f9 订单：介入 TradeOrderHandler#cancelOrder 2023-10-07 16:58:40 +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
芋道源码 1d9db4874f
!654 拼团记录：完善拼团记录后台管理接口 
Merge pull request !654 from puhui999/feature/mall_product
 2023-10-06 14:00:23 +00: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
owen 383439f902 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-06 14:17:14 +08:00
owen 4f33a0c9c0 统计：交易统计Review修改 2023-10-06 14:15:59 +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 92da91a7dc 订单：修改订单收货地址添加日志记录 2023-10-06 01:32:57 +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 a37427c355 stat：增加用户统计的设计 2023-10-04 18:53:49 +08:00
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
 2023-10-04 17:33:14 +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
owen 7a15b340b0 交易：核销 2023-10-04 10:51:36 +08:00
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
 2023-10-04 09:12:48 +08:00
owen 8e905f706d 交易：核销 2023-10-04 09:11:51 +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
owen 5819b08740 交易：Review修改 2023-10-03 21:25:23 +08:00