Commit Graph

593 Commits

Author SHA1 Message Date
YunaiV
9b9f54bb03 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
2024-04-05 13:32:17 +08:00
YunaiV
20583417a4 【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:49:49 +08:00
YunaiV
5faa006dd0 bugfix:修复拼团详情错误传递 groupon_id 的问题 2024-03-30 15:28:46 +08:00
YunaiV
3b379d8cc0 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
2024-03-30 11:54:27 +08:00
YunaiV
a80ba48889 bugfix:同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
puhui999
0dd36f6c5c MALL: fix 订单价格分摊 2024-03-10 19:07:24 +08:00
YunaiV
d556b29214 CRM:code review 权限的优化 2024-03-09 18:27:58 +08:00
YunaiV
dda0909843 🎉 2.0.1 版本发布! 2024-03-01 20:01:16 +08:00
YunaiV
7ef7228f65 MALL:增加返回 vipPrice 减免金额 2024-03-01 19:21:03 +08:00
YunaiV
da6e01f6b5 bugfix:运行失败的单测
bugfix:PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
2024-03-01 12:26:05 +08:00
YunaiV
8ff710e49d 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00
YunaiV
1f4889c68e 全局:将 dict 组件,融合到 excel 组件里,减少 starter 2024-02-28 21:42:32 +08:00
YunaiV
6dcb1277b3 全局:迁移 pay 组件到 pay 模块,迁移 flowable 组件到 bpm 模块 2024-02-28 21:03:40 +08:00
YunaiV
023a7b14d8 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
YunaiV
6dbc942cdd MALL:修复售后确认退款时,缺少退款描述信息 2024-01-16 22:41:37 +08:00
YunaiV
bbee720710 📖 CRM:code review 拼团记录的实现 2024-01-13 19:34:49 +08:00
YunaiV
df9ff3fc5c 🐛 MALL:修复 issue 提到的 bug 2024-01-07 20:51:57 +08:00
YunaiV
f73cb540cf MALL:去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
YunaiV
33c3686bef MALL:合并订单和售后订单的数量接口 2023-12-28 23:15:25 +08:00
YunaiV
c019136f07 Member:增加积分记录的时间筛选 2023-12-27 20:39:14 +08:00
YunaiV
d65c28d7f7 Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
YunaiV
07e610b3f7 🔥 MALL:移除商品收藏的批量操作接口,由前端自身 for 处理 2023-12-15 00:02:40 +08:00
YunaiV
c1429dd3a0 增加售后日志列表 API 2023-12-14 20:07:35 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
YunaiV
126dc610b1 1.8.3 版本发布 2023-10-24 23:14:14 +08:00
YunaiV
7bff98b658 统一 boot 和 cloud 代码 2023-10-23 23:48:06 +08:00
YunaiV
728308cbc0 member:优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV
6c8e82ca5a code review:自提统计 2023-10-20 00:30:27 +08:00
芋道源码
8bd1942083
!676 交易:核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
2023-10-19 15:59:00 +00:00
YunaiV
d256275099 saas:支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
owen
0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
2023-10-17 23:29:11 +08:00
owen
0612a13cce 交易:核销订单 2023-10-17 23:18:08 +08:00
zhijiantianya@gmail.com
4b0333f3e9 code review:订单统计 2023-10-17 20:42:22 +08:00
owen
b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	sql/mysql/statistics.sql
2023-10-17 16:13:46 +08:00
owen
5e65512a92 交易:订单核销 2023-10-17 16:09:37 +08:00
YunaiV
1ff9bc6a71 code review:文章管理 2023-10-16 22:51:19 +08:00
芋道源码
cebdc190b6
!668 营销活动:完善文章相关 app 端接口,完善 review 提到的问题
Merge pull request !668 from puhui999/feature/mall_product
2023-10-16 13:55:47 +00:00
owen
6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
zhijiantianya@gmail.com
b6e63e885d code review:商城统计 2023-10-16 20:01:25 +08:00
puhui999
4273b8f09c 营销活动:完善 review 提到的问题 2023-10-16 18:53:25 +08:00
owen
76f512fc7a 1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
2023-10-16 15:06:59 +08:00
YunaiV
4359c584bb code review:拼团逻辑 2023-10-16 09:07:02 +08:00
puhui999
1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-15 16:17:14 +08:00
YunaiV
3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
puhui999
a4613f0af9 拼团活动: 完善 review 提到的问题 2023-10-13 12:07:28 +08:00
YunaiV
fef808d88c code review:统计代码 2023-10-11 12:32:28 +08:00
YunaiV
704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2023-10-11 11:30:03 +08:00
YunaiV
670a098aa8 code review:拼团记录流程 2023-10-11 11:04:22 +08:00
YunaiV
b0179457ce 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑) 2023-10-11 07:49:23 +08:00
YunaiV
41e5cf5285 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
2023-10-10 20:42:33 +08:00
YunaiV
150a1c9771 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(取消的排重逻辑) 2023-10-10 20:38:20 +08:00
YunaiV
2e5cc0537b 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中 2023-10-10 19:20:12 +08:00
puhui999
42fcbe0501 砍价活动:完成订单取消时恢复活动库存 2023-10-10 10:47:25 +08:00
puhui999
245f14b8f1 秒杀活动:完成订单取消时恢复活动库存和商品库存 2023-10-10 10:25:57 +08:00
owen
91d0bbf8b1 合并代码 2023-10-09 23:40:11 +08:00
owen
74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2023-10-09 23:33:51 +08:00
puhui999
c869d99a0f 修复:启动报错-循环依赖 2023-10-09 16:25:04 +08:00
puhui999
53e67c0437 拼团活动:完善 review 提到的问题 2023-10-09 11:53:02 +08:00
YunaiV
7b727d5ce2 code review:拼团记录流程 2023-10-08 21:14:54 +08:00
puhui999
2e559ebe06 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-08 17:33:21 +08:00
puhui999
c71bdd158a 拼团活动:完善 review 提到的问题 2023-10-08 17:19:39 +08:00
YunaiV
01e6140d67 code review:拼团记录流程 2023-10-08 09:53:09 +08:00
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
89b240c1f9 订单:介入 TradeOrderHandler#cancelOrder 2023-10-07 16:58:40 +08:00
puhui999
c485c6e04d 订单:重构拼团下单流程更改为订单支付后再创建拼团记录 2023-10-07 16:30:28 +08:00
puhui999
f40bd23f6a 拼团记录:完善拼团记录创建前的条件校验规则 2023-10-07 14:30:25 +08:00
YunaiV
c7b5df930e promotion:修复拼团下单时,相关字段记录不正确的情况。 2023-10-07 07:09:15 +08:00
YunaiV
34bf360da6 trade:调整拼团活动列表接口 2023-10-06 21:04:37 +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
puhui999
92da91a7dc 订单:修改订单收货地址添加日志记录 2023-10-06 01:32:57 +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
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
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
owen
5819b08740 交易:Review修改 2023-10-03 21:25:23 +08:00
owen
3c5917a6cd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-03 21:21:48 +08:00
owen
a9e822762d 统计:交易统计定时任务 2023-10-03 21:21:11 +08:00
YunaiV
ac55a9657c promotion:完善秒杀模块 2023-10-03 18:41:41 +08:00
YunaiV
df4716d5a1 code review:分销 2023-10-03 10:23:40 +08:00
owen
b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-02 23:52:25 +08:00
owen
d0f0bc5888 分销:调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
YunaiV
1f910992d6 trade:新增是否自提的配置项 2023-10-02 21:18:52 +08:00
YunaiV
fdb10aeced trade:优化运费模版的实现 2023-10-02 18:30:14 +08:00
YunaiV
6f4c04d944 trade:完善退款详情 2023-10-02 15:44:41 +08:00
YunaiV
0c1f5c9582 trade:完善订单详情 2023-10-02 10:34:52 +08:00
YunaiV
d4417d2474 code review:积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
YunaiV
057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
2023-10-01 22:00:31 +08:00
YunaiV
b74169acfc trade:优化订单列表的查询 2023-10-01 21:59:51 +08:00
owen
abfebebdd5 交易:增加 积分抵扣计算器 单元测试 2023-10-01 17:12:33 +08:00
owen
afd306a71d 交易:增加 赠送积分计算器 单元测试 2023-10-01 16:23:41 +08:00
owen
2168145c3e 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
owen
ab35fcbe9b 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
puhui999
d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-30 23:35:19 +08:00
puhui999
82210a9583 订单:完善拼团活动 2023-09-30 23:34:45 +08:00
owen
7d68bdc7c8 分销:重构下级分销统计 2023-09-30 23:30:06 +08:00
owen
e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
owen
aaa01de21d 分销:修改佣金排名查询算法 2023-09-30 19:55:18 +08:00
owen
d0d21b2787 优惠券:新增/修改时,校验对应的商品、分类是否存在 2023-09-30 19:39:02 +08:00
owen
42a899c5d3 交易:订单增加字段 推广人编号 2023-09-30 17:49:38 +08:00
YunaiV
367b45e3bd code review:数据统计 2023-09-30 12:30:01 +08:00
puhui999
597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
2023-09-30 11:35:51 +08:00
puhui999
0b35d4a7e3 订单:完善拼团活动部分 TODO 2023-09-30 11:27:24 +08:00
puhui999
5ecd0d94eb 订单:添加 order handler 默认抽象实现类,子类可以选择性地实现抽象方法,而不必实现所有方法 2023-09-30 11:24:52 +08:00
owen
6b7f071988 Review代码修改 2023-09-29 22:47:04 +08:00
YunaiV
9ee0aebd3f promotion:增加 coupon 的 code review 2023-09-29 20:52:11 +08:00
YunaiV
666ba351a2 trade:退款理由的维护 2023-09-29 13:35:40 +08:00
YunaiV
3c643f814c trade:补全售后日志的记录 2023-09-29 11:46:43 +08:00
YunaiV
d402bdb7e0 trade:优化售后取消订单的实现代码 2023-09-29 10:08:20 +08:00
YunaiV
f9bf41d773 code review:分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
YunaiV
b1ce971a2f code review:解决分佣的 npe 问题 2023-09-28 16:39:07 +08:00
YunaiV
9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +08:00
YunaiV
5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
2023-09-28 15:18:59 +08:00
YunaiV
eeb8873b1d trade:微调交易配置的注释 2023-09-28 15:10:56 +08:00
YunaiV
9e3564bd6a code review:优惠劵逻辑 2023-09-28 09:23:42 +08:00
owen
b2c608e7a5 交易:发货订单日志 2023-09-27 21:27:55 +08:00
owen
565a8e0e6b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 21:24:37 +08:00
YunaiV
b9018baa03 trade:简化价格调整的逻辑 2023-09-27 19:14:48 +08:00
YunaiV
26dfbfb2ac trade:发货逻辑,增加订单日志 2023-09-27 09:55:04 +08:00
owen
be426235dd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 01:20:40 +08:00
owen
bc07e1dbf4 售后:重构售后更新订单的逻辑 2023-09-27 01:19:49 +08:00
owen
74ef98f8fc 售后:售后成功后,回滚 SKU 库存 2023-09-27 00:24:22 +08:00
owen
11ffa45b89 积分:Review代码修改 2023-09-26 23:54:43 +08:00
YunaiV
53bd1b9ec1 trade:订单评论超时时,自动评论 2023-09-26 23:50:54 +08:00
owen
cd2d0b7089 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 23:23:12 +08:00
YunaiV
cf41347cb3 trade:支付订单成功时,记录订单日志 2023-09-26 22:48:21 +08:00
owen
b1ac3a0b8b 优惠券:完善优惠券匹配接口 2023-09-26 22:46:06 +08:00
YunaiV
debf568750 code review:增加取消售后的优化建议 2023-09-26 20:57:10 +08:00
owen
0a3a6825d5 优惠券:完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
YunaiV
ad535e674f trade:积分相关的价格计算 2023-09-26 20:11:54 +08:00
YunaiV
a8c78f3097 trade:增加自动收货的 job 2023-09-26 19:27:37 +08:00
owen
a431bccc02 分销:Review代码修改 2023-09-26 15:11:48 +08:00
YunaiV
826d792ff2 trade:增加自动取消的 job 2023-09-26 00:04:11 +08:00
puhui999
bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
2023-09-25 15:06:57 +08:00
puhui999
42c47d9b44 秒回活动:订单金额计算初步设计 2023-09-25 14:56:56 +08:00