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 |
|
SuchJack
|
25106e2efd
|
fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-01 18:22:43 +08:00 |
|
xingyu4j
|
1b37c47361
|
fix: deleteBatchIds 已过期
|
2025-05-26 14:09:31 +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 |
|
YunaiV
|
1519c03c49
|
reactor：移除 mall-statistics 的 api 包
|
2025-05-17 10:48:53 +08:00 |
|
YunaiV
|
5f6d0b3b19
|
reactor：移除 mall-product 的 api 包
|
2025-05-17 10:18:33 +08:00 |
|
YunaiV
|
e4e162a47b
|
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/biz/infra/logger/ApiAccessLogCommonApi.java
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
|
2025-05-14 21:04:37 +08:00 |
|
YunaiV
|
6c6babb4c3
|
reactor：yudao-common 增加 biz 包，将 framework 依赖的 api 统一迁移，方便后续 yudao-framework 独立仓库
|
2025-05-14 19:23:40 +08:00 |
|
YunaiV
|
f3b897ea5d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-05-13 19:30:11 +08:00 |
|
YunaiV
|
2cb4c7ddb4
|
fix：修复工作流的发起时间未返回
|
2025-05-13 19:23:09 +08:00 |
|
YunaiV
|
5421299b09
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-05-12 20:21:52 +08:00 |
|
YunaiV
|
c9ecb27f8b
|
【同步】jdk21 和 jdk8 的代码
|
2025-05-12 09:26:15 +08:00 |
|
YunaiV
|
efc535c051
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersale/core/aop/AfterSaleLogAspect.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/dto/PayTransferNotifyReqDTO.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/refund/PayRefundApiImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoTransferController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/vo/transfer/PayDemoTransferCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/PayTransferController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/vo/PayTransferCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferService.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferService.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
|
2025-05-12 09:19:22 +08:00 |
|
YunaiV
|
7c38a32fc9
|
fix：【MALL 商城】小程序发货，uploadTime 不正确的问题
|
2025-05-11 17:11:38 +08:00 |
|
YunaiV
|
44548ee03f
|
feat：【MALL 商城】商城分佣提现，完成对微信转账（小程序）的对接
|
2025-05-11 12:39:05 +08:00 |
|
YunaiV
|
4d25e810e3
|
feat：【MALL 商城】商城分佣提现，初步对接成功微信支付
|
2025-05-11 08:12:42 +08:00 |
|
YunaiV
|
b91a30dd3e
|
feat：【PAY 支付】增加 channelPackageInfo 字段，对接微信新的转账 API（太难了！！！！！！！！！！！！！！！！！！！！）
|
2025-05-10 20:05:17 +08:00 |
|
YunaiV
|
288d8e3132
|
reactor：【PAY 支付】优化退款回调接口，增加 merchantRefundId 退款编号参数
reactor：【MALL 商城】售后退款时，基于回调处理
|
2025-05-10 16:43:55 +08:00 |
|
YunaiV
|
fe8871b5f1
|
feat：【MALL 商城】佣金提现，支持提现失败时，重新发起
|
2025-05-10 11:48:29 +08:00 |
|
YunaiV
|
423c0b7ea7
|
feat：【MALL 商城】佣金提现，优化字段，以及支持更多 API 自动打款
|
2025-05-10 10:07:11 +08:00 |
|
YunaiV
|
38c76806a3
|
feat：【PAY 支付】微信支付的转账，接入新的 API（需要继续测试，= = 真麻烦）
feat：【PAY 支付】钱包支持转账功能
|
2025-05-08 23:31:23 +08:00 |
|
puhui999
|
99803d1ebf
|
【功能完善】商城：【会员】发送客服消息时也给自己发送一条 websocket 消息
|
2025-05-08 17:08:37 +08:00 |
|
YunaiV
|
7653be9d48
|
feat：【PAY 支付】示例转账单，改成示例提现单，理解成本更低
|
2025-05-08 13:09:14 +08:00 |
|
YunaiV
|
1e7f22cde0
|
feat：【PAY 支付】完善支付转账示例，以及转账功能（支付宝）
|
2025-05-07 23:37:24 +08:00 |
|
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 |
|