1501 Commits

Author	SHA1	Message	Date
YunaiV	7d1a33ca89	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/AppTenantController.java	2026-03-08 10:08:26 +08:00
YunaiV	d844f06f5c	fix(trade): 修复订单项价格计算逻辑,分摊比例修改成用子订单支付金额来计算	2026-03-08 09:54:55 +08:00
YunaiV	9392da82b2	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-dependencies/pom.xml # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.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-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java	2026-01-29 22:17:13 +08:00
Jarrett	7580b8cf28	modify(mall): 自提订单核销校验订单是否是待核销状态	2026-01-28 08:59:50 +08:00
YunaiV	f8ebdbdd76	fix：【mall】移除 firstFixedPrice 的校验，对应 https://t.zsxq.com/zIbji	2026-01-25 21:24:26 +08:00
YunaiV	f3ef0e72e2	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java	2026-01-18 18:15:27 +08:00
YunaiV	3db0c41bf3	feat：【mall】优化订单日志切面中的用户信息获取逻辑，同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/231/files	2026-01-18 15:27:58 +08:00
YunaiV	6520514426	fix：【system】增加 node 的 parentId 为空下的兼容性，对应 https://t.zsxq.com/ktTUO	2026-01-18 15:16:31 +08:00
YunaiV	fdfca8588f	fix：【mall】分销用户创建时，缺少对 bindUserId 的校验	2026-01-18 12:14:58 +08:00
芋道源码	696463d95b	!1492 fix(mall): 修复创建商品时，未设置sku销量，导致只能统计spu销量，不能统计sku销量问题 ... Merge pull request !1492 from Jarrett/fix-sku-sales-count	2026-01-05 12:10:15 +00:00
lijian	605b401610	fix(mall): 修复创建商品时，未设置sku销量，导致只能统计spu销量，不能统计sku销量问题	2026-01-05 10:19:35 +08:00
lijian	d1f85163da	fix(mall): 修复商品SPU库存计算溢出问题	2026-01-04 16:59:22 +08:00
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