szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,351 Commits 13 Branches 41 Tags 244 MiB
Commit Graph

1395 Commits

Author SHA1 Message Date
YunaiV 8eb76c210d 【同步】jdk21 和 jdk8 的代码 2025-05-06 20:58:00 +08:00
YunaiV e633c7cfe3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
 2025-05-06 20:50:33 +08:00
YunaiV a34de9f223 feat：【MALL 商城】增加微信物流的对接（和社区同学，一起测试中。。。） 2025-05-06 20:49:13 +08:00
YunaiV 8e0398bce6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
 2025-05-05 09:33:51 +08:00
YunaiV 0343c4d2ba fix：【MALL 商城】秒杀、积分商品库存剩余 1 时，无法下单 2025-05-04 11:39:47 +08:00
YunaiV fe0840cde8 fix：【MALL 商城】linux 部署时，express.client 配置项，因为大写无法识别 2025-05-04 10:51:53 +08:00
YunaiV 00ed548ef5 【同步】jdk21 和 jdk8 的代码 2025-05-02 21:09:14 +08:00
YunaiV a557f0733f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/template/AppCouponTemplateRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
 2025-05-02 21:01:58 +08:00
YunaiV d778184213 feat：【MALL】增加优惠模版的领取信息的返回 2025-05-01 09:01:57 +08:00
YunaiV 95b8cf00fd fix：【商城】已删除的商品，无法评论，导致 TradeOrderAutoCommentJob 重复持续运行 2025-04-30 21:29:50 +08:00
YunaiV 4d925f69db 【同步】jdk21 和 jdk8 的代码 2025-04-30 09:45:18 +08:00
YunaiV 54941f1361 Merge branch 'develop' 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/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
 2025-04-30 00:11:24 +08:00
YunaiV 4cebe4af14 reactor：使用 justauth 官方 1.16.7 2025-04-30 00:05:54 +08:00
YunaiV dad0cc4cb1 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-04-29 22:12:35 +08:00
xingyu4j 5a906a7b20 fix: requiredMode 调成为 Schema.RequiredMode.REQUIRED 的方式，解决提示 REQUIRED 找不到的问题 2025-04-29 14:26:37 +08:00
YunaiV 4dde700f35 feat：【MALL】App 售后筛选时，增加 status 过滤 2025-04-28 23:16:54 +08:00
YunaiV 00a08d6cb6 reactor：【MALL】修改购物车查询接口，返回库存、状态等状态，默认不自动取消 selected 状态 2025-04-28 00:24:59 +08:00
YunaiV ec76c1ae6e fix：【MALL】修复 addBrokerage 创建分销记录时，每个订单项，生成分销记录 2025-04-27 09:44:27 +08:00
YunaiV 3395a3d86b feat：【MALL】商城订单取消时，额外校验支付单的状态，进一步兜底回调情况 2025-04-27 08:58:54 +08:00
YunaiV 03e510adfd fix：【MALL】修复了一些问题 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1315 2025-04-26 17:34:17 +08:00
芋道源码 f6acc9dea5
!1315 修复了一些问题 
Merge pull request !1315 from puhui999/develop-tmp
 2025-04-26 09:26:25 +00:00
YunaiV d621d8254d 【同步】jdk21 和 jdk8 的代码 2025-04-12 12:06:00 +08:00
YunaiV d8451b004e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
 2025-04-12 11:56:35 +08:00
YunaiV be416b7d78 【代码优化】MALL：在线客服的注释 2025-04-03 23:33:21 +08:00
puhui999 d5c1a2ff9f 【缺陷修复】商城：订单取消收回优惠券失败导致管理员确认退款不成功的问题 2025-04-02 17:48:10 +08:00
puhui999 09aa6b2567 【缺陷修复】商城：优惠券在领取类型为指定发放和新人券时无法发送的问题 2025-04-02 11:35:36 +08:00
YunaiV 1e4e02ec2f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-04-01 19:16:02 +08:00
puhui999 40b6e5a3bb 【缺陷修复】商城：检查是否包邮 2025-04-01 18:04:17 +08:00
puhui999 81124292fd 【代码优化】商城：客服消息携带用户头像信息 2025-04-01 16:28:02 +08:00
YunaiV 7609c74c8b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
 2025-03-16 17:22:39 +08:00
YunaiV 8ccc55d1aa 【功能优化】商城：KdNiaoExpressClient 增加 requestType 配置，使用免费版，还是增值版 2025-03-16 16:45:48 +08:00
YunaiV 2dc8071faa 【功能优化】全局：增加 selectFirstOne 方法，解决容易出现并发场景下的查询 2025-03-16 16:31:36 +08:00
芋道源码 0debd8e069
!1247 【bugfix】新人券已关闭但是注册时仍然发放了update module/promotion/dal/mysql/coupon/CouponTemplateMapper.java. 
Merge pull request !1247 from 山野羡民/N/A
 2025-03-15 13:18:36 +00:00
YunaiV a4815b30d0 【缺陷修复】商城：修正商城中将会员等级关闭，还继续计算折扣价格 2025-03-15 21:16:53 +08:00
YunaiV 41640642d4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
 2025-03-15 06:56:16 +08:00
山野羡民 db9534073b
【bugfix】新人券已关闭但是注册时仍然发放了update module/promotion/dal/mysql/coupon/CouponTemplateMapper.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2025-02-20 02:43:13 +00:00
山野羡民 12170402e2
【性能优化】循环中减少不必要的查询 update r/yudao/module/promotion/service/coupon/CouponServiceImpl.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2025-02-20 02:39:48 +00:00
YunaiV 21a9d37f97 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-02-15 10:03:12 +08:00
YunaiV 3c10dcf392 【功能修复】MALL：管理后台，无法查询到订单的情况 2025-02-15 10:02:48 +08:00
YunaiV a44a45a2cb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
 2025-02-09 11:36:21 +08:00
YunaiV d75d71d7d0 1218 如果没查到用户也有可能是空结果集，不一定是null 2025-02-09 07:26:30 +08:00
mcwindy 4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
YunaiV aab61f7963 【代码评审】Bpm：更多设置-摘要设置 2025-01-24 21:03:55 +08:00
YunaiV 0911d42e49 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
 2025-01-24 20:56:26 +08:00
YunaiV 295fad7d97 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:17 +08:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型，通过泛型指定 2025-01-24 17:31:41 +08:00
puhui999 e89e3c946d 【缺陷修复】商城：虚拟成团后所有成员添加虚拟成团标记 2025-01-23 12:08:05 +08:00
puhui999 30a24601cd 【缺陷修复】商城：修复积分不够还能兑换商品的 bug 2025-01-23 11:55:30 +08:00
puhui999 d3352308d4 【代码优化】积分商城 2025-01-23 10:49:08 +08:00
YunaiV 2725376b91 【缺陷修复】商城：分销用户累计已提现查询使用 WITHDRAW_SUCCESS 体现成功状态查询 2025-01-17 20:04:09 +08:00