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
|
e761721b2e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-12-13 12:30:16 +08:00 |
|
YunaiV
|
7041baf178
|
fix：【mall】交易日志、售后日志，增加 USER_ID 的读取
|
2025-12-13 11:43:32 +08:00 |
|
dafang
|
0a7fa72b3a
|
fix(product): 修复@Select查询JSON字段无法解析的问题
|
2025-12-08 16:04:43 +08:00 |
|
dafang
|
91f37e756a
|
fix(product): 修复@Select查询JSON字段无法解析的问题
@Select注解不会应用autoResultMap，需手动指定@Results和typeHandler：
- ProductSpuMapper: sliderPicUrls字段添加JacksonTypeHandler
- ProductSkuMapper: properties字段添加JacksonTypeHandler
|
2025-12-08 15:58:29 +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
|
887594ec2e
|
fix: 【mall】兼容纯积分订单的退款逻辑
|
2025-11-22 17:49:20 +08:00 |
|
YunaiV
|
5c4fedb69d
|
fix: 【mall】调整佣金计算逻辑，确保佣金乘以购买数量
|
2025-11-22 15:57:19 +08:00 |
|
YunaiV
|
3aa9ea997b
|
fix: 【mall】修正分销提现时，金额计算逻辑带上手续费，确保转账金额与实际提现金额一致
|
2025-11-22 11:45:02 +08:00 |
|
YunaiV
|
d886f8196a
|
fix: 【member】清理 socialUser 对象以确保 updateTime 正确更新
|
2025-11-22 10:10:28 +08:00 |
|
YunaiV
|
319b34addb
|
fix：【mall】BrokerageRecordDO 的 id 改成 Long
|
2025-11-21 22:23:20 +08:00 |
|
YunaiV
|
485a70de6d
|
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
|
2025-11-21 20:04:46 +08:00 |
|
YunaiV
|
ec2bca7331
|
!1441 【轻量级 PR】：fix: 【mall】找不到所在区域的运费收费模板和运费免费模板时（即：未配置所在区域的运费模板），不把模板对象put进result中。
|
2025-11-21 20:04:20 +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
|
269c1fdabf
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
|
2025-08-31 10:08:12 +08:00 |
|
YunaiV
|
040899d8c9
|
reactor：移除 @Accessors 和 @EqualsAndHashCode 注解
|
2025-08-30 17:48:16 +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
|
b5d5fa8ea4
|
fix：【mall 商城】门店自提时，缺少上传订单物流信息到微信小程序
|
2025-08-17 10:56:13 +08:00 |
|
YunaiV
|
e44d9fe136
|
fix：【mall 商城】优惠劵在“领取之后”场景下，计算不正确的问题
|
2025-08-17 10:37:06 +08:00 |
|
YunaiV
|
ef9fcc9aa4
|
reactor：@MockBean => @MockitoBean
|
2025-08-02 17:58:49 +08:00 |
|
YunaiV
|
863ec14f0b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java
# yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java
# yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceTest.java
# yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
# yudao-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
|
2025-08-02 17:34:02 +08:00 |
|
YunaiV
|
e79005a0a0
|
reactor：@MockBean => @MockitoBean
|
2025-08-02 17:32:12 +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
|
8ffe9272e8
|
feat：【pay 支付】增加 userid、usertype，并额外支持权限校验
|
2025-07-27 19:18:04 +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
|
a2dcbd7afe
|
【同步】jdk21 和 jdk8 的代码
|
2025-07-26 16:34:03 +08:00 |
|
YunaiV
|
d1c58b1c37
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-07-26 12:45:54 +08:00 |
|
YunaiV
|
529c570bbd
|
reactor：优化日志格式，解决 FILE 里存在 highlight、cyan高亮
reactor：弱化对 skywalking 依赖，可按需引入，更灵活
|
2025-07-26 12:45:41 +08: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
|
942f51dd59
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-07-25 21:18:11 +08:00 |
|
芋道源码
|
8c6dc8fcf9
|
!1381 refactor.trade: 优化 Kd100ExpressQueryRespDTO 中时间字段的处理
Merge pull request !1381 from binny1024/master-jdk17-fix-kd100-time
|
2025-07-25 12:42:03 +00: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 |
|