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

560 Commits

Author SHA1 Message Date
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
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
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
ec76c1ae6e fix：【MALL】修复 addBrokerage 创建分销记录时，每个订单项，生成分销记录 2025-04-27 09:44:27 +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
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
芋道源码
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
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
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
mcwindy
4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +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
e89e3c946d 【缺陷修复】商城：虚拟成团后所有成员添加虚拟成团标记 2025-01-23 12:08:05 +08:00
puhui999
d3352308d4 【代码优化】积分商城 2025-01-23 10:49:08 +08:00
壁虎
39ac9053fd 【缺陷修复】退款回收优惠券错误 2025-01-05 16:19:40 +08:00
YunaiV
3871a1f83f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
 2024-12-31 09:22:59 +08:00
YunaiV
cdb31679da 【功能修复】商城：限时折扣在 activityIds、skuIds 为空时，报 SQL 不正确的问题 2024-12-28 19:30:57 +08:00
YunaiV
9039af46d4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
 2024-12-27 21:30:31 +08:00
puhui999
313494400e 【缺陷修复】商城: 订单支付后记录 log error 日志，保证订单最大化可推导。 2024-12-09 14:43:46 +08:00
YunaiV
31ab86dbeb 【同步】jdk21 和 jdk8 的代码 2024-11-25 19:35:57 +08:00
YunaiV
bbb1bec1b9 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/controller/admin/kefu/KeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.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-biz/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApiImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
 2024-11-25 19:32:10 +08:00
YunaiV
396051b41e 【代码合并】商城：合并最新的 master-jdk17 分支 2024-11-19 09:30:40 +08:00
YunaiV
c239d9cc56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
 2024-11-19 09:26:44 +08:00
puhui999
c501172694 【功能完善】商城：客服消息查询 pageSize 改 limit 2024-11-18 17:20:46 +08:00
芋道源码
2775dbbad1 !1126 【功能完善】商城: 客服 
Merge pull request !1126 from puhui999/develop
 2024-11-10 10:36:32 +00:00
puhui999
43cb8b1f21 【功能完善】商城: 客服 2024-11-10 18:01:58 +08:00
YunaiV
e46163cba7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-11-09 18:38:24 +08:00
puhui999
6695aeeb8f 【功能完善】商城: 客服 2024-11-09 17:35:35 +08:00
YunaiV
71bc5d56f1 【代码评审】商城：消息获取改为游标查询 2024-11-05 20:37:25 +08:00
puhui999
4057c74afd 【功能优化】商城: 积分商城活动排序 2024-11-05 16:15:29 +08:00
puhui999
1285acc49e 【功能优化】商城: 虚拟成团创建团成员时设置团长 ID 2024-11-05 15:36:32 +08:00
puhui999
a2e9eccee7 【功能完善】商城: 客服消息 2024-11-05 15:21:02 +08:00
YunaiV
9bb1052366 【代码评审】商城：消息获取改为游标查询 2024-11-05 09:37:38 +08:00
puhui999
70bc486d36 【功能完善】商城客服: 消息获取改为游标查询 2024-11-04 18:05:15 +08:00
YunaiV
d97ba8d4d8 【缺陷修复】商城：活动的库存校验，从 > 改成 >= 2024-11-01 21:22:23 +08:00
YunaiV
8d4cc35cde 【缺陷修复】商城：优惠劵在不限制时，无法发送的问题 2024-10-27 20:33:49 +08:00
YunaiV
ac50b4b11c 148 fix：商城系统->营销中心->优惠活动->限时折扣，折扣百分比按正常折扣（比如说90%）填写时，后端报错“折扣百分比需要大于等于 1，小于等于 99” 2024-10-27 17:36:45 +08:00