YunaiV
|
d0293ea2fa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2025-12-27 21:38:07 +08:00 |
|
YunaiV
|
0eed2fa74c
|
没问题
|
2025-12-27 21:35:44 +08:00 |
|
YunaiV
|
3accf80700
|
fix：【mall】优惠劵：相关的判断不对，关联 https://t.zsxq.com/fYaKv
|
2025-12-27 21:35:19 +08:00 |
|
YunaiV
|
91870831d2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-12-07 10:38:30 +08:00 |
|
YunaiV
|
0531651efc
|
fix：最大分页从 100-> 200，更好的适应 vben，对应 issue：https://github.com/yudaocode/yudao-ui-admin-vben/issues/176
|
2025-12-07 10:21:00 +08:00 |
|
YunaiV
|
ec0c4eebdb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-11-24 17:03:53 +08:00 |
|
YunaiV
|
073ffb5c71
|
fix: 【coupon】更新发放数量校验逻辑，确保用户领取时剩余数量充足
|
2025-11-22 18:09:50 +08:00 |
|
YunaiV
|
c80ffe437f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
|
2025-10-02 18:52:15 +08:00 |
|
YunaiV
|
2a97a49a00
|
fix：【mall 商城】CouponServiceImpl 报错的问题
|
2025-10-01 16:16:37 +08:00 |
|
YunaiV
|
aaa3f55339
|
!1438 修复用户领取不限发放数量的优惠券时的校验错误
|
2025-09-27 10:31:52 +08:00 |
|
YunaiV
|
455a012644
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
|
2025-09-20 21:32:03 +08:00 |
|
YunaiV
|
6d1b7ec414
|
fix：【mall 商城】RewardActivityRespVO 的 id 类型不正确
|
2025-09-20 18:16:39 +08:00 |
|
YunaiV
|
4bed44868c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2025-08-29 09:24:09 +08:00 |
|
YunaiV
|
441fe18720
|
feat：【framework 框架】优化 jackson 的初始化
|
2025-08-24 16:03:39 +08:00 |
|
YunaiV
|
7a8f2f51e6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-24 16:01:30 +08:00 |
|
wusongwen
|
16efe7b6aa
|
修复确认退款报错和取消订单定时任务报错
|
2025-08-20 19:44:30 +08:00 |
|
YunaiV
|
fbec7d030d
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-17 15:02:24 +08:00 |
|
YunaiV
|
e44d9fe136
|
fix：【mall 商城】优惠劵在“领取之后”场景下，计算不正确的问题
|
2025-08-17 10:37:06 +08:00 |
|
YunaiV
|
8939c04282
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
|
2025-07-27 19:20:31 +08:00 |
|
YunaiV
|
1b412546eb
|
fix：【Mall 商城】修复积分商品新增时校验商品是否参与其他活动校验失败
|
2025-07-26 19:49:50 +08:00 |
|
YunaiV
|
b208f100a6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java
|
2025-07-26 17:25:10 +08:00 |
|
芋道源码
|
b8889a94c7
|
!1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
|
2025-07-26 09:20:20 +00:00 |
|
YunaiV
|
b535716084
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/api/websocket/WebSocketSenderApiImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/websocket/DemoWebSocketMessageListener.java
|
2025-07-26 09:49:46 +08:00 |
|
YunaiV
|
fb6771aad0
|
fix：【MALL 商城】秒杀时间段的校验
|
2025-07-21 19:45:30 +08:00 |
|
YunaiV
|
adece67532
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
|
2025-07-15 22:37:27 +08:00 |
|
YunaiV
|
a9c7b584cc
|
fix：【MALL 商城管理】优惠劵扣减时，增加 WHERE 乐观锁
|
2025-07-13 17:06:40 +08:00 |
|
YunaiV
|
4d5e501a41
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/utils/FileTypeUtils.java
# yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/service/handler/user/SubscribeHandler.java
|
2025-07-11 21:54:11 +08:00 |
|
puhui999
|
9fc4a4061f
|
fix: 创建拼团活动时校验商品是否参与了其它活动
|
2025-06-18 15:40:51 +08:00 |
|
xingyu4j
|
f38485ffd5
|
Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
|
2025-06-15 18:54:13 +08:00 |
|
YunaiV
|
39fcac4d5f
|
!1357 fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
|
2025-06-15 15:05:27 +08:00 |
|
芋道源码
|
69b896a688
|
!1357 fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
Merge pull request !1357 from SuchJack/master-jdk17-dev
|
2025-06-15 06:55:54 +00:00 |
|
YunaiV
|
7d867909d7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# sql/oracle/ruoyi-vue-pro.sql
# sql/sqlserver/ruoyi-vue-pro.sql
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
|
2025-06-15 10:21:55 +08:00 |
|
YunaiV
|
4aa9efc0dc
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-15 10:14:32 +08:00 |
|
芋道源码
|
f5f7061e00
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
Merge pull request !1358 from SuchJack/master-jdk17-dev1
|
2025-06-15 02:12:18 +00:00 |
|
xingyu4j
|
9dec02d02e
|
feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel)
|
2025-06-10 14:51:41 +08:00 |
|
SuchJack
|
25106e2efd
|
fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-01 18:22:43 +08:00 |
|
SuchJack
|
bed36f684f
|
fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-01 18:15:24 +08:00 |
|
xingyu4j
|
5caf990920
|
fix: selectBatchIds 已过期
|
2025-05-26 14:06:02 +08:00 |
|
YunaiV
|
e00bfd02a1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion/pom.xml
# yudao-module-mall/yudao-module-trade/pom.xml
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2025-05-17 14:14:23 +08:00 |
|
YunaiV
|
dfffc93584
|
reactor：移除 mall-trade 的 api 包
|
2025-05-17 11:31:10 +08:00 |
|
YunaiV
|
31b8ee425f
|
reactor：移除 promotion-statistics 的 api 包
|
2025-05-17 10:56:17 +08:00 |
|