Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• fef808d88c code review：统计代码 YunaiV 2023-10-11 12:32:28 +08:00
• 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-11 11:30:03 +08:00
• 670a098aa8 code review：拼团记录流程 YunaiV 2023-10-11 11:04:22 +08:00
• 8d40f1d71a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 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
• b0179457ce 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑） YunaiV 2023-10-11 07:49:23 +08:00
• 41e5cf5285 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp YunaiV 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
• 150a1c9771 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑） YunaiV 2023-10-10 20:38:20 +08:00
• 2e5cc0537b 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中 YunaiV 2023-10-10 19:20:12 +08:00
• cfbc8b4849 拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页 puhui999 2023-10-10 17:21:37 +08:00
• bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 puhui999 2023-10-10 15:30:58 +08:00
• 599d13b1ac feat: 随便测试 youkehai 2023-10-10 11:36:24 +08:00
• fdbebc406c 秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题 puhui999 2023-10-10 10:57:17 +08:00
• 42fcbe0501 砍价活动：完成订单取消时恢复活动库存 puhui999 2023-10-10 10:47:25 +08:00
• bc781d9473 fix: 【工作流】按 review 修改代码 youkehai 2023-10-10 10:46:16 +08:00
• 245f14b8f1 秒杀活动：完成订单取消时恢复活动库存和商品库存 puhui999 2023-10-10 10:25:57 +08:00
• 2c10dde195 统计：修复错误 owen 2023-10-09 23:53:50 +08:00
• 91d0bbf8b1 合并代码 owen 2023-10-09 23:40:11 +08:00
• 74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-09 23:33:51 +08:00
• df16278a03 统计：会员统计 owen 2023-10-09 23:27:10 +08:00
• 6388950ab2 code review：【工作流】—— 加签的实现 zhijiantianya@gmail.com 2023-10-09 20:57:23 +08:00
• 831983e314 营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法 puhui999 2023-10-09 18:17:20 +08:00
• 45a2cd70f0 Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro zhijiantianya@gmail.com 2023-10-09 17:45:46 +08:00
• 5d6faa8023 fix: 【工作流】-加减签父任务处理逻辑完善 youkehai 2023-10-09 16:40:31 +08:00
• e845872adc Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product puhui999 2023-10-09 16:26:42 +08:00
• 57407a39d2 营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试 puhui999 2023-10-09 16:18:00 +08:00
• c869d99a0f 修复：启动报错-循环依赖 puhui999 2023-10-09 16:11:02 +08:00
• cd887511d8 营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试 puhui999 2023-10-09 16:18:00 +08:00
• e09f07475a 修复：启动保存-循环依赖 puhui999 2023-10-09 16:11:02 +08:00
• 53e67c0437 拼团活动：完善 review 提到的问题 puhui999 2023-10-09 11:53:02 +08:00
• 10af05066c feat: 【工作流】--任务列表只返回顶级任务，拼装成父子关系并返回 kehaiyou 2023-10-08 22:35:02 +08:00
• 7b727d5ce2 code review：拼团记录流程 YunaiV 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
• 2c0f1121ca 拼团活动：完善 review 提到的问题 puhui999 2023-10-08 17:46:48 +08:00
• 2e559ebe06 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-08 17:33:21 +08:00
• c71bdd158a 拼团活动：完善 review 提到的问题 puhui999 2023-10-08 17:19:39 +08:00
• c8a9d68933 拼团活动：完善 review 提到的问题 puhui999 2023-10-08 12:08:17 +08:00
• 8a11ca8126 code review：拼团记录流程 YunaiV 2023-10-08 09:59:53 +08:00
• 01e6140d67 code review：拼团记录流程 YunaiV 2023-10-08 09:53:09 +08:00
• 99649bfdb8 code review：拼团记录流程 YunaiV 2023-10-08 07:43:25 +08:00
• 6a38da4ad9 promotion：合并最新代码 YunaiV 2023-10-07 23:00:13 +08:00
• c917f01d83 promotion：code review 拼团相关的部分代码 YunaiV 2023-10-07 22:47:45 +08:00
• 6636ee7420 拼团记录(APP)：新增一个取消拼团的接口 puhui999 2023-10-07 18:46:19 +08:00
• 1a0fda23b1 拼团记录：调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP puhui999 2023-10-07 17:11:25 +08:00
• 89b240c1f9 订单：介入 TradeOrderHandler#cancelOrder puhui999 2023-10-07 16:58:40 +08:00
• c485c6e04d 订单：重构拼团下单流程更改为订单支付后再创建拼团记录 puhui999 2023-10-07 16:30:28 +08:00
• c95317577d Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-07 14:33:09 +08:00
• f40bd23f6a 拼团记录：完善拼团记录创建前的条件校验规则 puhui999 2023-10-07 14:30:25 +08:00
• ec2c3e508a promotion：优化拼团记录的详情代码 YunaiV 2023-10-07 13:58:12 +08:00
• c7b5df930e promotion：修复拼团下单时，相关字段记录不正确的情况。 YunaiV 2023-10-07 07:09:15 +08:00
• c8f1269d6e promotion：修复砍价活动返回的 combinationPrice 为空的问题 YunaiV 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
• 6099786c1b 拼团记录：完善拼团记录后台管理接口 puhui999 2023-10-06 21:26:53 +08:00
• 8b480c52cc Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-06 21:15:06 +08:00
• 34bf360da6 trade：调整拼团活动列表接口 YunaiV 2023-10-06 21:04:37 +08:00
• ce77d510bb 拼团记录：添加拼团记录后台管理接口 puhui999 2023-10-06 20:27:22 +08:00
• 383439f902 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-06 14:17:14 +08:00
• 4f33a0c9c0 统计：交易统计Review修改 owen 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
• 8e7b295d24 trade：砍价记录的详情 100% YunaiV 2023-10-06 10:17:41 +08:00
• 5f57cc6247 trade：砍价记录的详情 50% YunaiV 2023-10-06 02:06:38 +08:00
• 3d51c67f1a 拼团活动：app-api 获得拼团活动列表增加 Spring Cache 缓存 puhui999 2023-10-06 01:43:56 +08:00
• 92da91a7dc 订单：修改订单收货地址添加日志记录 puhui999 2023-10-06 01:32:57 +08:00
• 9d7285c4ed 营销活动：实现 list-by-spu-ids 接口 puhui999 2023-10-06 01:19:32 +08:00
• 07493bc7e5 营销活动：实现 list-by-spu-id 接口 puhui999 2023-10-06 01:04:36 +08:00
• 3f6f7f404b 拼团活动：更改创建拼团记录的校验方式 puhui999 2023-10-06 00:24:40 +08:00
• 474eebd8c9 拼团活动：更改创建拼团记录的校验方式 puhui999 2023-10-06 00:20:00 +08:00
• f732e7a750 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-06 00:05:28 +08:00
• 038e23a6b3 拼团活动：完善拼团 app-api 相关接口 puhui999 2023-10-06 00:03:03 +08:00
• aec8e853e4 trade：完善砍价的下单流程 YunaiV 2023-10-05 23:24:44 +08:00
• 0b2943ba8b 拼团活动：完善拼团下单金额结算 puhui999 2023-10-05 21:28:38 +08:00
• 07d6ab5842 拼团活动：完善 TradeCombinationHandler puhui999 2023-10-05 19:14:19 +08:00
• 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ YunaiV 2023-10-05 17:22:17 +08:00
• 6a04d6c458 promotion：新增助力记录列表 YunaiV 2023-10-05 12:43:14 +08:00
• 269da3d56d promotion：新增砍价记录列表 YunaiV 2023-10-05 12:07:05 +08:00
• cd45be1fe2 promotion：优化砍价活动的分页结果 YunaiV 2023-10-05 02:18:14 +08:00
• 16e436a0f5 promotion：增加助力砍价的接口 YunaiV 2023-10-05 00:05:20 +08:00
• cc087e4eca promotion：增加创建砍价的接口 YunaiV 2023-10-04 21:55:05 +08:00
• a37427c355 stat：增加用户统计的设计 YunaiV 2023-10-04 18:53:49 +08:00
• c5824eedf7 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-04 17:33:14 +08:00
• 6f39b2c030 trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 YunaiV 2023-10-04 17:30:07 +08:00
• 8dbabb9efc trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 YunaiV 2023-10-04 11:29:38 +08:00
• 7a15b340b0 交易：核销 owen 2023-10-04 10:51:36 +08:00
• 60ea719b46 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-04 09:12:48 +08:00
• 8e905f706d 交易：核销 owen 2023-10-04 09:11:51 +08:00
• dc1347184f code review：拼团、砍价活动 YunaiV 2023-10-04 00:47:17 +08:00
• 20f5834d9a trade：价格计算时，接入优惠劵逻辑 YunaiV 2023-10-04 00:30:03 +08:00
• a1e9bedf34 promotion：完善秒杀的 uniapp 接口 YunaiV 2023-10-03 21:45:51 +08:00
• 5819b08740 交易：Review修改 owen 2023-10-03 21:25:23 +08:00
• 3c5917a6cd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-03 21:21:48 +08:00
• a9e822762d 统计：交易统计定时任务 owen 2023-10-03 21:21:11 +08:00
• ac55a9657c promotion：完善秒杀模块 YunaiV 2023-10-03 18:41:41 +08:00
• c66b4e7bc0 code review：日志清理 Job YunaiV 2023-10-03 11:02:33 +08:00
• 1bc1be14fb Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-03 10:33:22 +08:00
• df4716d5a1 code review：分销 YunaiV 2023-10-03 10:23:40 +08:00
• d874346d42 !649 Review代码修改 Merge pull request !649 from 疯狂的世界/feature/mall_product 芋道源码 2023-10-02 15:58:31 +00:00
• b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-02 23:52:25 +08:00
• d0f0bc5888 分销：调整推广人列表查询方式 owen 2023-10-02 23:51:49 +08:00
• 7fdd36d979 Review代码修改 owen 2023-10-02 21:27:46 +08:00