Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 1f910992d6 trade：新增是否自提的配置项 YunaiV 2023-10-02 21:18:52 +08:00
• 2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 j-sentinel 2023-10-02 19:18:36 +08:00
• fdb10aeced trade：优化运费模版的实现 YunaiV 2023-10-02 18:30:14 +08:00
• 6f4c04d944 trade：完善退款详情 YunaiV 2023-10-02 15:44:41 +08:00
• 0c1f5c9582 trade：完善订单详情 YunaiV 2023-10-02 10:34:52 +08:00
• f8b4a08fae code review：访问日志、错误日志的清理 Job 实现 YunaiV 2023-10-02 00:06:28 +08:00
• d4417d2474 code review：积分、优惠劵、佣金等逻辑 YunaiV 2023-10-01 23:31:07 +08:00
• 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 +08:00
• b74169acfc trade：优化订单列表的查询 YunaiV 2023-10-01 21:59:51 +08:00
• 4f7d6b4959 !643 订单：完善拼团活动和一些 TODO Merge pull request !643 from puhui999/feature/mall_product 芋道源码 2023-10-01 13:56:43 +00:00
• 00c2153fd3 !646 ApiAccessLog、ApiErrorLog、JobLog 3 个日志的 定时 物理清理 Merge pull request !646 from lanxindx/feature/mall_product 芋道源码 2023-10-01 13:55:00 +00:00
• abfebebdd5 交易：增加 积分抵扣计算器 单元测试 owen 2023-10-01 17:12:33 +08:00
• 11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 j-sentinel 2023-10-01 16:53:17 +08:00
• afd306a71d 交易：增加 赠送积分计算器 单元测试 owen 2023-10-01 16:23:41 +08:00
• 2168145c3e 会员：会员配置的积分相关字段加上point前缀 owen 2023-10-01 10:41:21 +08:00
• ab35fcbe9b 会员：积分配置改为会员配置 owen 2023-10-01 10:25:18 +08:00
• 4f03635fcd 签到：签到后增加用户积分、经验 owen 2023-10-01 09:53:54 +08:00
• a04a3a27a9 Review代码修改 owen 2023-09-30 23:41:11 +08:00
• d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-30 23:35:19 +08:00
• 82210a9583 订单：完善拼团活动 puhui999 2023-09-30 23:34:45 +08:00
• 7d68bdc7c8 分销：重构下级分销统计 owen 2023-09-30 23:30:06 +08:00
• cafa938ff4 common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间 owen 2023-09-30 22:21:47 +08:00
• e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-30 22:09:49 +08:00
• 3875c80471 wallet：钱包支付，接入 user 付款界面 YunaiV 2023-09-30 22:08:15 +08:00
• d2c5eaf916 优惠券：重构是否领取检查方式 owen 2023-09-30 22:05:11 +08:00
• aaa01de21d 分销：修改佣金排名查询算法 owen 2023-09-30 19:55:18 +08:00
• d0d21b2787 优惠券：新增/修改时，校验对应的商品、分类是否存在 owen 2023-09-30 19:39:02 +08:00
• 16cea61435 wallet：增加充值套餐 YunaiV 2023-09-30 18:54:10 +08:00
• 42a899c5d3 交易：订单增加字段 推广人编号 owen 2023-09-30 17:49:38 +08:00
• fc432ba073 优惠券：新人券使用 MQ 发放 owen 2023-09-30 17:29:32 +08:00
• 9d71dff2a4 操作日志搜索参数名修改 ligiteezhanghao 2023-09-30 09:10:02 +00:00
• 497ea2eee8 会员详情，修改会员积分 owen 2023-09-30 15:50:13 +08:00
• d7ae944438 feat: 【工作流】--减签逻辑优化 kehaiyou 2023-09-30 15:35:14 +08:00
• cd678e997a feat: 【工作流】--减签和加签共用处理父任务逻辑 kehaiyou 2023-09-30 14:56:16 +08:00
• be6399238b 会员详情，查询钱包信息 owen 2023-09-30 12:40:22 +08:00
• 86e2523069 !638 修改springdoc版本，解决Swagger文档都是form提交。 Merge pull request !638 from fangyuan/master 芋道源码 2023-09-30 04:35:25 +00:00
• 3489144757 新任务：日志的清理 job YunaiV 2023-09-30 12:31:18 +08:00
• 367b45e3bd code review：数据统计 YunaiV 2023-09-30 12:30:01 +08:00
• 597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-30 11:35:51 +08:00
• 0b35d4a7e3 订单：完善拼团活动部分 TODO puhui999 2023-09-30 11:27:24 +08:00
• 5ecd0d94eb 订单：添加 order handler 默认抽象实现类，子类可以选择性地实现抽象方法，而不必实现所有方法 puhui999 2023-09-30 11:24:52 +08:00
• b376de1ad3 !640 交易统计 Merge pull request !640 from 疯狂的世界/feature/mall_product 芋道源码 2023-09-30 03:00:12 +00:00
• 6b7f071988 Review代码修改 owen 2023-09-29 22:47:04 +08:00
• 26628913cb 错误码分段 owen 2023-09-29 21:34:38 +08:00
• 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-29 21:08:49 +08:00
• 171161e6c7 统计：交易统计 owen 2023-09-29 21:08:15 +08:00
• 96b1662e4a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-09-29 20:52:22 +08:00
• 9ee0aebd3f promotion：增加 coupon 的 code review YunaiV 2023-09-29 20:52:11 +08:00
• 80d532b0f1 feat: 【工作流】--减签 kehaiyou 2023-09-29 15:51:00 +08:00
• 7d497ce09b feat: 【工作流】--加签 kehaiyou 2023-09-29 14:57:28 +08:00
• 71ec06393a merge 冲突修改 jason 2023-09-29 14:56:32 +08:00
• 57d782bc94 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-29 14:06:12 +08:00
• ce6f7ab1b1 Pay: 新增转账示例单 jason 2023-09-29 14:01:58 +08:00
• aa2f651124 Pay: 转账单实现 jason 2023-09-29 13:50:06 +08:00
• 666ba351a2 trade：退款理由的维护 YunaiV 2023-09-29 13:35:40 +08:00
• 3c643f814c trade：补全售后日志的记录 YunaiV 2023-09-29 11:46:43 +08:00
• d402bdb7e0 trade：优化售后取消订单的实现代码 YunaiV 2023-09-29 10:08:20 +08:00
• 62f821abf2 wangfangyuan,fix:修改springdoc版本，解决Swagger文档都是form提交。 wangfy 2023-09-28 23:15:00 +08:00
• f9bf41d773 code review：分佣剩余部分的 review YunaiV 2023-09-28 22:22:38 +08:00
• b1ce971a2f code review：解决分佣的 npe 问题 YunaiV 2023-09-28 16:39:07 +08:00
• 9cd36abf10 同步 master 分支代码 YunaiV 2023-09-28 15:28:40 +08:00
• 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-09-28 15:18:59 +08:00
• eeb8873b1d trade：微调交易配置的注释 YunaiV 2023-09-28 15:10:56 +08:00
• 9e3564bd6a code review：优惠劵逻辑 YunaiV 2023-09-28 09:23:42 +08:00
• 8811ce0200 !637 完善优惠券功能 Merge pull request !637 from 疯狂的世界/feature/mall_product 芋道源码 2023-09-28 00:11:43 +00:00
• b2c608e7a5 交易：发货订单日志 owen 2023-09-27 21:27:55 +08:00
• 565a8e0e6b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-27 21:24:37 +08:00
• b9018baa03 trade：简化价格调整的逻辑 YunaiV 2023-09-27 19:14:48 +08:00
• c5f2d07c87 商城：增加 stat 统计设计 YunaiV 2023-09-27 19:14:32 +08:00
• 26dfbfb2ac trade：发货逻辑，增加订单日志 YunaiV 2023-09-27 09:55:04 +08:00
• be426235dd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-27 01:20:40 +08:00
• bc07e1dbf4 售后：重构售后更新订单的逻辑 owen 2023-09-27 01:19:49 +08:00
• 74ef98f8fc 售后：售后成功后，回滚 SKU 库存 owen 2023-09-27 00:24:22 +08:00
• 2766dd672a 优惠券：过期定时任务 owen 2023-09-27 00:15:12 +08:00
• 11ffa45b89 积分：Review代码修改 owen 2023-09-26 23:54:43 +08:00
• 53bd1b9ec1 trade：订单评论超时时，自动评论 YunaiV 2023-09-26 23:50:54 +08:00
• cd2d0b7089 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-26 23:23:12 +08:00
• 77f7763560 优惠券：完善优惠券领取接口 owen 2023-09-26 23:21:01 +08:00
• cf41347cb3 trade：支付订单成功时，记录订单日志 YunaiV 2023-09-26 22:48:21 +08:00
• b1ac3a0b8b 优惠券：完善优惠券匹配接口 owen 2023-09-26 22:46:06 +08:00
• f9aec7d8fd 优惠券：完善我的优惠券接口 owen 2023-09-26 21:08:11 +08:00
• debf568750 code review：增加取消售后的优化建议 YunaiV 2023-09-26 20:57:10 +08:00
• 0a3a6825d5 优惠券：完善APP优惠券查询接口 owen 2023-09-26 20:44:22 +08:00
• ad535e674f trade：积分相关的价格计算 YunaiV 2023-09-26 20:11:54 +08:00
• a8c78f3097 trade：增加自动收货的 job YunaiV 2023-09-26 19:27:37 +08:00
• a431bccc02 分销：Review代码修改 owen 2023-09-26 15:11:48 +08:00
• 9e99b04375 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-09-26 00:04:18 +08:00
• 826d792ff2 trade：增加自动取消的 job YunaiV 2023-09-26 00:04:11 +08:00
• 5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 绮梦 2023-09-25 15:51:48 +08:00
• bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-25 15:06:57 +08:00
• 42c47d9b44 秒回活动：订单金额计算初步设计 puhui999 2023-09-25 14:56:56 +08:00
• f088fdff84 code review：委托逻辑 YunaiV 2023-09-25 13:59:44 +08:00
• 8649b285cf !631 【工作流】委派 Merge pull request !631 from Youkehai/feature/bpm-delegate 芋道源码 2023-09-25 05:42:12 +00:00
• 3972fbd1d9 fix: 根据review结果修改 youkehai 2023-09-25 11:30:44 +08:00
• 437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-25 10:48:32 +08:00
• 6fcff0863a 支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态 jason 2023-09-25 10:43:23 +08:00
• 56c4595058 !633 up springboot 2.7.16 Merge pull request !633 from xingyu/feature/v2.7.16 芋道源码 2023-09-25 01:41:32 +00:00
• e384b810bf code review：分销逻辑 YunaiV 2023-09-25 09:39:39 +08:00
• 1553900193 fix: 解决冲突 youkehai 2023-09-25 09:22:11 +08:00
• d6e736bd56 Merge branch 'master' into feature/bpm-delegate youkehai 2023-09-25 09:15:59 +08:00