sqlicong/kfc-admin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
9,621 Commits 2 Branches 0 Tags
785716e6c88c918eb43b99064cb458f54fff8f95
Commit Graph

1438 Commits

Author SHA1 Message Date
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
YunaiV
d8e1610495 feat: enhance MyBatis utility for sorting and update SQL aliases in TradeOrderStatisticsMapper 2025-07-08 09:39:44 +08:00
YunaiV
eca9307344 fix：【MALL 商城】修复退款通知中 merchantRefundId 字符串转换 Long 类型的问题 2025-07-06 16:38:14 +08:00
芋道源码
ec5281f2e5 !1373 fix: 创建拼团活动时校验商品是否参与了其它活动 
Merge pull request !1373 from puhui999/master-jdk17-2
 2025-06-22 06:46:30 +00:00
puhui999
cac82a13a7 fix: 修复拼团还没成团，虚拟成团是否，这个时候核销也能核销成功 2025-06-18 17:23:59 +08:00
puhui999
9fc4a4061f fix: 创建拼团活动时校验商品是否参与了其它活动 2025-06-18 15:40:51 +08:00
YunaiV
a000048196 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/FileConfigController.java
#	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/service/file/FileServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java
 2025-06-16 08:35:21 +08:00
YunaiV
0fbffdc1d3 reactor：统一导出的 url 都是 export-excel 2025-06-16 08:30:00 +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
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
1b37c47361 fix: deleteBatchIds 已过期 2025-05-26 14:09:31 +08:00
xingyu4j
5caf990920 fix: selectBatchIds 已过期 2025-05-26 14:06:02 +08:00
SuchJack
20241b8bcc fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常 2025-05-24 20:04:07 +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