From 403c872ee354a0d125c6ded607bfe98c6ce3231d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 28 Nov 2025 18:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MerchantRegisterServiceImpl.java | 10 +++------- .../account/service/impl/ShopExtendServiceImpl.java | 4 ++-- .../account/service/impl/ShopTableServiceImpl.java | 2 +- .../account/service/impl/SysRoleServiceImpl.java | 9 ++++----- .../market/service/impl/MkCouponGiftServiceImpl.java | 4 ++-- .../service/impl/MkShopCouponRecordServiceImpl.java | 2 +- .../service/impl/ShopProdStatisticServiceImpl.java | 2 +- .../impl/ShopTableOrderStatisticServiceImpl.java | 2 +- .../product/service/impl/ConsStockFlowServiceImpl.java | 4 ++-- .../service/impl/ProdConsRelationServiceImpl.java | 6 +++--- .../product/service/impl/ShopSyncServiceImpl.java | 2 +- .../product/service/impl/ShopVendorServiceImpl.java | 2 +- 12 files changed, 22 insertions(+), 27 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java index d26850de9..13273aab3 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java @@ -1,24 +1,19 @@ package com.czg.service.account.service.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import com.czg.account.dto.PageDTO; import com.czg.account.dto.register.MerchantRegisterDTO; import com.czg.account.entity.MerchantRegister; import com.czg.account.service.MerchantRegisterService; -import com.czg.account.vo.MerchantRegisterVO; import com.czg.service.account.mapper.MerchantRegisterMapper; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.List; /** * 激活码 服务层实现。 @@ -27,7 +22,7 @@ import java.util.List; * @since 2025-02-11 */ @Service -public class MerchantRegisterServiceImpl extends ServiceImpl implements MerchantRegisterService { +public class MerchantRegisterServiceImpl extends ServiceImpl implements MerchantRegisterService { @Override public Page get(PageDTO pageDTO, Integer state, String startTime, String endTime) { @@ -46,6 +41,7 @@ public class MerchantRegisterServiceImpl extends ServiceImpl 0; } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java index 56f68c092..ff67e2939 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java @@ -61,7 +61,7 @@ public class ShopExtendServiceImpl extends ServiceImpl implements SysRoleService { +public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { @Resource private SysMenuService sysMenuService; @Resource @@ -87,7 +87,7 @@ public class SysRoleServiceImpl extends ServiceImpl imp } return apiInfoItemDTOS.stream() - .map(pattern -> StrUtil.format("({} LIKE '{}' ESCAPE '\\\\' and method = '{}')" , columnName, toSqlLikePattern(pattern.getUrl()), pattern.getMethod())) + .map(pattern -> StrUtil.format("({} LIKE '{}' ESCAPE '\\\\' and method = '{}')", columnName, toSqlLikePattern(pattern.getUrl()), pattern.getMethod())) .collect(Collectors.joining(" OR ")); } @@ -95,7 +95,7 @@ public class SysRoleServiceImpl extends ServiceImpl imp public Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); // if (!StpKit.USER.isAdmin()) { - queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); + queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); // } if (StrUtil.isNotBlank(key)) { @@ -180,11 +180,10 @@ public class SysRoleServiceImpl extends ServiceImpl imp // Step 4: 批量保存（如有数据） - return rolesMenus.isEmpty() || sysRolesMenusService.saveBatch(rolesMenus); + return rolesMenus.isEmpty() || sysRolesMenusService.getMapper().insertBatchSelective(rolesMenus, 50) > 0; } - @Override @Transactional(rollbackFor = Exception.class) public Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO) { diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java index ca091b361..b193a9cdb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java @@ -49,7 +49,7 @@ public class MkCouponGiftServiceImpl extends ServiceImpl couponGiftList) { remove(new QueryWrapper().eq(MkCouponGift::getSourceId, sourceId).eq(MkCouponGift::getType, type)); if (CollUtil.isNotEmpty(couponGiftList)) { - List newCoupons = new ArrayList<>(); + List newCoupons = new ArrayList<>(); for (MkCouponGiftDTO giftDTO : couponGiftList) { ShopCoupon coupon = couponMapper.selectOneByQuery(new QueryWrapper().eq(ShopCoupon::getId, giftDTO.getCouponId())); if (coupon == null) { @@ -64,7 +64,7 @@ public class MkCouponGiftServiceImpl extends ServiceImpl entityList = BeanUtil.copyToList(consList, ProdConsRelation.class); - super.saveBatch(entityList); + mapper.insertBatchSelective(entityList, 50); } } \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java index 414681786..da2f7a6c6 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java @@ -733,7 +733,7 @@ public class ShopSyncServiceImpl implements ShopSyncService { } } if (CollUtil.isNotEmpty(addList)) { - prodGroupRelationService.saveBatch(addList, 100); + prodGroupRelationService.getMapper().insertBatchSelective(addList, 100); } if (CollUtil.isNotEmpty(upList)) { prodGroupRelationService.updateBatch(addList, 100); diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java index f1300b38b..26adb0078 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java @@ -157,7 +157,7 @@ public class ShopVendorServiceImpl extends ServiceImpl