Commit Graph

Select branches

Hide Pull Requests

ck

hhk

liutao_branch

main

plp

#1

Mono Color

• 4f33a0c9c0 统计：交易统计Review修改 owen 2023-10-06 14:15:59 +0800
• a76760c419
  !653 完善拼团活动下单流程 Merge pull request !653 from puhui999/feature/mall_product 芋道源码 2023-10-06 02:20:21 +0000
• 8e7b295d24 trade：砍价记录的详情 100% YunaiV 2023-10-06 10:17:41 +0800
• 5f57cc6247 trade：砍价记录的详情 50% YunaiV 2023-10-06 02:06:38 +0800
• 3d51c67f1a 拼团活动：app-api 获得拼团活动列表增加 Spring Cache 缓存 puhui999 2023-10-06 01:43:56 +0800
• 92da91a7dc 订单：修改订单收货地址添加日志记录 puhui999 2023-10-06 01:32:57 +0800
• 9d7285c4ed 营销活动：实现 list-by-spu-ids 接口 puhui999 2023-10-06 01:19:32 +0800
• 07493bc7e5 营销活动：实现 list-by-spu-id 接口 puhui999 2023-10-06 01:04:36 +0800
• 3f6f7f404b 拼团活动：更改创建拼团记录的校验方式 puhui999 2023-10-06 00:24:40 +0800
• 474eebd8c9 拼团活动：更改创建拼团记录的校验方式 puhui999 2023-10-06 00:20:00 +0800
• f732e7a750 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-06 00:05:28 +0800
• 038e23a6b3 拼团活动：完善拼团 app-api 相关接口 puhui999 2023-10-06 00:03:03 +0800
• aec8e853e4 trade：完善砍价的下单流程 YunaiV 2023-10-05 23:24:44 +0800
• 0b2943ba8b 拼团活动：完善拼团下单金额结算 puhui999 2023-10-05 21:28:38 +0800
• 07d6ab5842 拼团活动：完善 TradeCombinationHandler puhui999 2023-10-05 19:14:19 +0800
• 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ YunaiV 2023-10-05 17:22:17 +0800
• 6a04d6c458 promotion：新增助力记录列表 YunaiV 2023-10-05 12:43:14 +0800
• 269da3d56d promotion：新增砍价记录列表 YunaiV 2023-10-05 12:07:05 +0800
• cd45be1fe2 promotion：优化砍价活动的分页结果 YunaiV 2023-10-05 02:18:14 +0800
• 16e436a0f5 promotion：增加助力砍价的接口 YunaiV 2023-10-05 00:05:20 +0800
• cc087e4eca promotion：增加创建砍价的接口 YunaiV 2023-10-04 21:55:05 +0800
• a37427c355 stat：增加用户统计的设计 YunaiV 2023-10-04 18:53:49 +0800
• 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 +0800
• 6f39b2c030 trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 YunaiV 2023-10-04 17:30:07 +0800
• 8dbabb9efc trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 YunaiV 2023-10-04 11:29:38 +0800
• 7a15b340b0 交易：核销 owen 2023-10-04 10:51:36 +0800
• 60ea719b46 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-04 09:12:48 +0800
• 8e905f706d 交易：核销 owen 2023-10-04 09:11:51 +0800
• dc1347184f code review：拼团、砍价活动 YunaiV 2023-10-04 00:47:17 +0800
• 20f5834d9a trade：价格计算时，接入优惠劵逻辑 YunaiV 2023-10-04 00:30:03 +0800
• a1e9bedf34 promotion：完善秒杀的 uniapp 接口 YunaiV 2023-10-03 21:45:51 +0800
• 5819b08740 交易：Review修改 owen 2023-10-03 21:25:23 +0800
• 3c5917a6cd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-03 21:21:48 +0800
• a9e822762d 统计：交易统计定时任务 owen 2023-10-03 21:21:11 +0800
• ac55a9657c promotion：完善秒杀模块 YunaiV 2023-10-03 18:41:41 +0800
• c66b4e7bc0 code review：日志清理 Job YunaiV 2023-10-03 11:02:33 +0800
• 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 +0800
• df4716d5a1 code review：分销 YunaiV 2023-10-03 10:23:40 +0800
• d874346d42
  !649 Review代码修改 Merge pull request !649 from 疯狂的世界/feature/mall_product 芋道源码 2023-10-02 15:58:31 +0000
• b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-10-02 23:52:25 +0800
• d0f0bc5888 分销：调整推广人列表查询方式 owen 2023-10-02 23:51:49 +0800
• 7fdd36d979 Review代码修改 owen 2023-10-02 21:27:46 +0800
• 1f910992d6 trade：新增是否自提的配置项 YunaiV 2023-10-02 21:18:52 +0800
• 2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 j-sentinel 2023-10-02 19:18:36 +0800
• fdb10aeced trade：优化运费模版的实现 YunaiV 2023-10-02 18:30:14 +0800
• 6f4c04d944 trade：完善退款详情 YunaiV 2023-10-02 15:44:41 +0800
• 0c1f5c9582 trade：完善订单详情 YunaiV 2023-10-02 10:34:52 +0800
• f8b4a08fae code review：访问日志、错误日志的清理 Job 实现 YunaiV 2023-10-02 00:06:28 +0800
• d4417d2474 code review：积分、优惠劵、佣金等逻辑 YunaiV 2023-10-01 23:31:07 +0800
• 057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-10-01 22:00:31 +0800
• b74169acfc trade：优化订单列表的查询 YunaiV 2023-10-01 21:59:51 +0800
• 4f7d6b4959
  !643 订单：完善拼团活动和一些 TODO Merge pull request !643 from puhui999/feature/mall_product 芋道源码 2023-10-01 13:56:43 +0000
• 00c2153fd3
  !646 ApiAccessLog、ApiErrorLog、JobLog 3 个日志的 定时 物理清理 Merge pull request !646 from lanxindx/feature/mall_product 芋道源码 2023-10-01 13:55:00 +0000
• abfebebdd5 交易：增加 积分抵扣计算器 单元测试 owen 2023-10-01 17:12:33 +0800
• 11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 j-sentinel 2023-10-01 16:53:17 +0800
• afd306a71d 交易：增加 赠送积分计算器 单元测试 owen 2023-10-01 16:23:41 +0800
• 2168145c3e 会员：会员配置的积分相关字段加上point前缀 owen 2023-10-01 10:41:21 +0800
• ab35fcbe9b 会员：积分配置改为会员配置 owen 2023-10-01 10:25:18 +0800
• 4f03635fcd 签到：签到后增加用户积分、经验 owen 2023-10-01 09:53:54 +0800
• a04a3a27a9 Review代码修改 owen 2023-09-30 23:41:11 +0800
• d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-30 23:35:19 +0800
• 82210a9583 订单：完善拼团活动 puhui999 2023-09-30 23:34:45 +0800
• 7d68bdc7c8 分销：重构下级分销统计 owen 2023-09-30 23:30:06 +0800
• cafa938ff4 common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间 owen 2023-09-30 22:21:47 +0800
• e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-30 22:09:49 +0800
• 3875c80471 wallet：钱包支付，接入 user 付款界面 YunaiV 2023-09-30 22:08:15 +0800
• d2c5eaf916 优惠券：重构是否领取检查方式 owen 2023-09-30 22:05:11 +0800
• aaa01de21d 分销：修改佣金排名查询算法 owen 2023-09-30 19:55:18 +0800
• d0d21b2787 优惠券：新增/修改时，校验对应的商品、分类是否存在 owen 2023-09-30 19:39:02 +0800
• 16cea61435 wallet：增加充值套餐 YunaiV 2023-09-30 18:54:10 +0800
• 42a899c5d3 交易：订单增加字段 推广人编号 owen 2023-09-30 17:49:38 +0800
• fc432ba073 优惠券：新人券使用 MQ 发放 owen 2023-09-30 17:29:32 +0800
• 9d71dff2a4
  操作日志搜索参数名修改 ligiteezhanghao 2023-09-30 09:10:02 +0000
• 497ea2eee8 会员详情，修改会员积分 owen 2023-09-30 15:50:13 +0800
• d7ae944438 feat: 【工作流】--减签逻辑优化 kehaiyou 2023-09-30 15:35:14 +0800
• cd678e997a feat: 【工作流】--减签和加签共用处理父任务逻辑 kehaiyou 2023-09-30 14:56:16 +0800
• be6399238b 会员详情，查询钱包信息 owen 2023-09-30 12:40:22 +0800
• 86e2523069
  !638 修改springdoc版本，解决Swagger文档都是form提交。 Merge pull request !638 from fangyuan/master 芋道源码 2023-09-30 04:35:25 +0000
• 3489144757 新任务：日志的清理 job YunaiV 2023-09-30 12:31:18 +0800
• 367b45e3bd code review：数据统计 YunaiV 2023-09-30 12:30:01 +0800
• 597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-30 11:35:51 +0800
• 0b35d4a7e3 订单：完善拼团活动部分 TODO puhui999 2023-09-30 11:27:24 +0800
• 5ecd0d94eb 订单：添加 order handler 默认抽象实现类，子类可以选择性地实现抽象方法，而不必实现所有方法 puhui999 2023-09-30 11:24:52 +0800
• b376de1ad3
  !640 交易统计 Merge pull request !640 from 疯狂的世界/feature/mall_product 芋道源码 2023-09-30 03:00:12 +0000
• 6b7f071988 Review代码修改 owen 2023-09-29 22:47:04 +0800
• 26628913cb 错误码分段 owen 2023-09-29 21:34:38 +0800
• 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-29 21:08:49 +0800
• 171161e6c7 统计：交易统计 owen 2023-09-29 21:08:15 +0800
• 96b1662e4a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-09-29 20:52:22 +0800
• 9ee0aebd3f promotion：增加 coupon 的 code review YunaiV 2023-09-29 20:52:11 +0800
• 80d532b0f1 feat: 【工作流】--减签 kehaiyou 2023-09-29 15:51:00 +0800
• 7d497ce09b feat: 【工作流】--加签 kehaiyou 2023-09-29 14:57:28 +0800
• 71ec06393a merge 冲突修改 jason 2023-09-29 14:56:32 +0800
• 57d782bc94 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-29 14:06:12 +0800
• ce6f7ab1b1 Pay: 新增转账示例单 jason 2023-09-29 14:01:58 +0800
• aa2f651124 Pay: 转账单实现 jason 2023-09-29 13:50:06 +0800
• 666ba351a2 trade：退款理由的维护 YunaiV 2023-09-29 13:35:40 +0800
• 3c643f814c trade：补全售后日志的记录 YunaiV 2023-09-29 11:46:43 +0800
• d402bdb7e0 trade：优化售后取消订单的实现代码 YunaiV 2023-09-29 10:08:20 +0800
• 62f821abf2 wangfangyuan,fix:修改springdoc版本，解决Swagger文档都是form提交。 wangfy 2023-09-28 23:15:00 +0800