Commit Graph

Select branches

Hide Pull Requests

ck

hhk

liutao_branch

main

mvm

plp

#1

Mono Color

• d402bdb7e0 trade：优化售后取消订单的实现代码 YunaiV 2023-09-29 10:08:20 +0800
• 62f821abf2 wangfangyuan,fix:修改springdoc版本，解决Swagger文档都是form提交。 wangfy 2023-09-28 23:15:00 +0800
• f9bf41d773 code review：分佣剩余部分的 review YunaiV 2023-09-28 22:22:38 +0800
• b1ce971a2f code review：解决分佣的 npe 问题 YunaiV 2023-09-28 16:39:07 +0800
• 9cd36abf10 同步 master 分支代码 YunaiV 2023-09-28 15:28:40 +0800
• 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-09-28 15:18:59 +0800
• eeb8873b1d trade：微调交易配置的注释 YunaiV 2023-09-28 15:10:56 +0800
• 9e3564bd6a code review：优惠劵逻辑 YunaiV 2023-09-28 09:23:42 +0800
• 8811ce0200
  !637 完善优惠券功能 Merge pull request !637 from 疯狂的世界/feature/mall_product 芋道源码 2023-09-28 00:11:43 +0000
• b2c608e7a5 交易：发货订单日志 owen 2023-09-27 21:27:55 +0800
• 565a8e0e6b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-27 21:24:37 +0800
• b9018baa03 trade：简化价格调整的逻辑 YunaiV 2023-09-27 19:14:48 +0800
• c5f2d07c87 商城：增加 stat 统计设计 YunaiV 2023-09-27 19:14:32 +0800
• 26dfbfb2ac trade：发货逻辑，增加订单日志 YunaiV 2023-09-27 09:55:04 +0800
• be426235dd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-27 01:20:40 +0800
• bc07e1dbf4 售后：重构售后更新订单的逻辑 owen 2023-09-27 01:19:49 +0800
• 74ef98f8fc 售后：售后成功后，回滚 SKU 库存 owen 2023-09-27 00:24:22 +0800
• 2766dd672a 优惠券：过期定时任务 owen 2023-09-27 00:15:12 +0800
• 11ffa45b89 积分：Review代码修改 owen 2023-09-26 23:54:43 +0800
• 53bd1b9ec1 trade：订单评论超时时，自动评论 YunaiV 2023-09-26 23:50:54 +0800
• cd2d0b7089 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product owen 2023-09-26 23:23:12 +0800
• 77f7763560 优惠券：完善优惠券领取接口 owen 2023-09-26 23:21:01 +0800
• cf41347cb3 trade：支付订单成功时，记录订单日志 YunaiV 2023-09-26 22:48:21 +0800
• b1ac3a0b8b 优惠券：完善优惠券匹配接口 owen 2023-09-26 22:46:06 +0800
• f9aec7d8fd 优惠券：完善我的优惠券接口 owen 2023-09-26 21:08:11 +0800
• debf568750 code review：增加取消售后的优化建议 YunaiV 2023-09-26 20:57:10 +0800
• 0a3a6825d5 优惠券：完善APP优惠券查询接口 owen 2023-09-26 20:44:22 +0800
• ad535e674f trade：积分相关的价格计算 YunaiV 2023-09-26 20:11:54 +0800
• a8c78f3097 trade：增加自动收货的 job YunaiV 2023-09-26 19:27:37 +0800
• a431bccc02 分销：Review代码修改 owen 2023-09-26 15:11:48 +0800
• 9e99b04375 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-09-26 00:04:18 +0800
• 826d792ff2 trade：增加自动取消的 job YunaiV 2023-09-26 00:04:11 +0800
• 5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 绮梦 2023-09-25 15:51:48 +0800
• bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-25 15:06:57 +0800
• 42c47d9b44 秒回活动：订单金额计算初步设计 puhui999 2023-09-25 14:56:56 +0800
• f088fdff84 code review：委托逻辑 YunaiV 2023-09-25 13:59:44 +0800
• 8649b285cf
  !631 【工作流】委派 Merge pull request !631 from Youkehai/feature/bpm-delegate 芋道源码 2023-09-25 05:42:12 +0000
• 3972fbd1d9 fix: 根据review结果修改 youkehai 2023-09-25 11:30:44 +0800
• 437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-25 10:48:32 +0800
• 6fcff0863a 支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态 jason 2023-09-25 10:43:23 +0800
• 56c4595058
  !633 up springboot 2.7.16 Merge pull request !633 from xingyu/feature/v2.7.16 芋道源码 2023-09-25 01:41:32 +0000
• e384b810bf code review：分销逻辑 YunaiV 2023-09-25 09:39:39 +0800
• 1553900193 fix: 解决冲突 youkehai 2023-09-25 09:22:11 +0800
• d6e736bd56 Merge branch 'master' into feature/bpm-delegate youkehai 2023-09-25 09:15:59 +0800
• c92365128a
  !635 分销Review代码修改 Merge pull request !635 from 疯狂的世界/feature/mall_product 芋道源码 2023-09-25 00:39:16 +0000
• 16af31d980 分销：@Select sql语句增加逻辑删除字段过滤 owen 2023-09-25 08:36:55 +0800
• 0f0e6eb8ba Pay Client 新增转账接口 jason 2023-09-25 08:34:58 +0800
• 3dca66eefa 分销：提现统计 owen 2023-09-25 08:05:29 +0800
• f864aa1cfd Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro YunaiV 2023-09-24 23:25:14 +0800
• 0669b9da34 Merge remote-tracking branch 'origin/master' YunaiV 2023-09-24 23:24:32 +0800
• 9b7c757942 1.8.2 版本发布 YunaiV 2023-09-24 23:24:24 +0800
• 0b84c18736 分销：修正分享海报 owen 2023-09-24 23:18:51 +0800
• 3a297271eb
  !634 fix: MemberUserServiceImpl需要填充exception错误信息中的参数 Merge pull request !634 from dhb52/master 芋道源码 2023-09-24 15:09:19 +0000
• 83a133b344 bpm：优化 BpmnModelUtils YunaiV 2023-09-24 23:06:04 +0800
• 967e578d54 分销：重命名提现类型字段 owen 2023-09-24 22:32:13 +0800
• 9856e17974 分销：根据商品，计算推广员可以得到的佣金 owen 2023-09-24 22:27:24 +0800
• 96d4e7bc56 fix: 需要填充错误信息中的参数 dhb52 2023-09-24 22:23:31 +0800
• ffdaf3a859 bpm：简化流程驳回的逻辑实现，提升可读性 YunaiV 2023-09-24 22:19:36 +0800
• e9fd377772 分销：Review代码修改 owen 2023-09-24 20:28:44 +0800
• 63fee66657 chore: update okio fix minio bug xingyu 2023-09-24 18:04:48 +0800
• cfec4b12ca docs: update springboot 2.7.16 xingyu 2023-09-24 17:46:48 +0800
• 13f135abe9 chore: update deps xingyu 2023-09-24 17:44:35 +0800
• a98a7c7645 chore: lombok 1.18.30 xingyu 2023-09-24 17:38:18 +0800
• 22041b6f8d chore: hutool 5.8.22 xingyu 2023-09-24 17:36:42 +0800
• 8187398bdf chore: springboot 2.7.16 xingyu 2023-09-24 17:36:09 +0800
• 0b649fd3e1 bpm：简化获得可回退节点的实现 YunaiV 2023-09-24 16:08:50 +0800
• 4efa93b03b feat: 【工作流】--委派 kehaiyou 2023-09-24 15:43:35 +0800
• 3826846368
  !629 工作流-》流程实例的任务节点回退 Merge pull request !629 from Youkehai/master 芋道源码 2023-09-24 07:17:51 +0000
• 921f99d39d fix: 方法，变量名词，注释规范 kehaiyou 2023-09-24 13:13:55 +0800
• 421bb7d154 code review：分销逻辑 YunaiV 2023-09-24 11:56:00 +0800
• 60f766f35c 钱包充值允许多次退款 jason 2023-09-24 10:49:13 +0800
• 51899c4c13
  !627 trade: 分销业务 - 提现申请 Merge pull request !627 from 疯狂的世界/brokerate 芋道源码 2023-09-24 02:15:39 +0000
• f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate owen 2023-09-24 10:10:53 +0800
• b420c5b8fe
  !630 对具有软删除的表去除UNIQUE INDEX Merge pull request !630 from dhb52/master 芋道源码 2023-09-24 02:01:53 +0000
• 9b8312f596
  !626 发起流程成功后，用户流程列表未刷新 Merge pull request !626 from samisgod/master 芋道源码 2023-09-24 02:01:33 +0000
• 29b806e675 Framework：增加LocalDate、LocalTime序列化 owen 2023-09-24 09:57:09 +0800
• 798ae7c2c7
  Merge pull request #344 from Shimada666/patch-1 芋道源码 2023-09-24 09:24:09 +0800
• 2a9aa357cb fix: 对具有软删除的表去除UNIQUE INDEX dhb52 2023-09-24 08:29:56 +0800
• b4587fd79e product：订单表，增加 vip 优惠字段 YunaiV 2023-09-24 00:45:32 +0800
• 53e789dfdc trade：订单表，增加 vip 优惠字段 YunaiV 2023-09-23 23:58:22 +0800
• bf0e7d2c77 System：字典数据列表过滤已关闭的数据 owen 2023-09-23 23:42:20 +0800
• aa5525d1f5 code review：营销活动 & 交易订单的对接 YunaiV 2023-09-23 22:21:23 +0800
• 1da14a3f53 trade：删除订单的实现 YunaiV 2023-09-23 20:23:28 +0800
• a9485ad6bf trade：取消订单、确认收货，增加订单日志 YunaiV 2023-09-23 18:13:35 +0800
• e9c9ac0cab trade：确认收货时，增加订单日志 YunaiV 2023-09-23 17:47:39 +0800
• b13f71424b feat: 工作流-》流程实例的任务节点回退 kehaiyou 2023-09-23 14:47:34 +0800
• 052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 owen 2023-09-23 14:11:16 +0800
• 71d6311bd4 code review：拼团、秒杀等逻辑 YunaiV 2023-09-23 09:27:29 +0800
• 54fe0174bc
  !625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口 Merge pull request !625 from puhui999/feature/mall_product 芋道源码 2023-09-23 01:03:00 +0000
• 9451342aae trade：营销商品（拼团、砍价）不能使用优惠劵 YunaiV 2023-09-22 23:54:18 +0800
• dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate owen 2023-09-22 23:15:31 +0800
• f30fa39067 修改Review代码 owen 2023-09-22 23:15:10 +0800
• bbd18afbcc 分佣: 简化推广用户关系树查询方式 owen 2023-09-22 23:13:39 +0800
• 6e6486ccae Trade: 完善配置 owen 2023-09-22 22:51:46 +0800
• ad0513c87c 分佣: 推广人列表 owen 2023-09-22 22:12:15 +0800
• bf40767fa1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-09-22 21:56:17 +0800
• 7c4fbc63dc trade：物流费用计算，增加金额 divide 分拆逻辑 YunaiV 2023-09-22 21:56:09 +0800
• ee15b802b2 分佣: 推广人排行 owen 2023-09-22 21:12:09 +0800
• 972b01c001 分佣: 佣金排行 owen 2023-09-22 20:55:05 +0800
• 92f6c8f4d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-22 19:05:20 +0800