From f7c28d93ed9e02bfff4cf89826466b69c0678f33 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 18 Dec 2025 19:53:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/account/service/ShopConfigService.java | 1 - .../com/czg/account/service/ShopInfoService.java | 6 +++--- .../main/java/com/czg/utils/MyQueryWrapper.java | 7 ------- .../service/impl/ShopConfigServiceImpl.java | 5 ----- .../account/service/impl/ShopInfoServiceImpl.java | 15 ++++++++------- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java index f180699d4..62c659a4a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java @@ -2,7 +2,6 @@ package com.czg.account.service; import com.czg.account.entity.ShopConfig; import com.mybatisflex.core.service.IService; -import com.mybatisflex.core.util.LambdaGetter; import java.util.List; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index 52559880e..ea1ea171b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -8,7 +8,7 @@ import com.czg.exception.CzgException; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.mybatisflex.core.util.LambdaGetter; - +import java.util.function.Function; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -24,10 +24,10 @@ public interface ShopInfoService extends IService { /** * 检测开关 * @param shopId 店铺id - * @param column ShopInfo的某列 开关 + * @param switchGetter ShopInfo的某列 开关 * @return true:开启 false:关闭 */ - boolean checkSwitch(Long shopId, LambdaGetter column) throws ValidateException; + boolean checkSwitch(Long shopId, Function switchGetter) throws ValidateException; Page get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop); diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java b/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java index 181a20cf0..401279ac1 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java @@ -1,23 +1,16 @@ package com.czg.utils; import cn.hutool.core.text.NamingCase; -import com.mybatisflex.annotation.Column; import com.mybatisflex.core.constant.SqlConnector; import com.mybatisflex.core.query.*; import com.mybatisflex.core.table.TableInfo; import com.mybatisflex.core.table.TableInfoFactory; import com.mybatisflex.core.util.LambdaGetter; -import com.mybatisflex.core.util.LambdaUtil; -import com.mybatisflex.core.util.MapUtil; import com.mybatisflex.core.util.StringUtil; import lombok.extern.slf4j.Slf4j; import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.lang.invoke.SerializedLambda; -import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java index a0d4a674b..31df60b02 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java @@ -11,14 +11,9 @@ import com.czg.service.account.mapper.ShopConfigMapper; import com.czg.service.account.mapper.ShopInfoMapper; import com.czg.utils.PageUtil; import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.util.LambdaGetter; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index c41d343b3..383db7de8 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -54,6 +54,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -100,17 +101,17 @@ public class ShopInfoServiceImpl extends ServiceImpl i } @Override - public boolean checkSwitch(Long shopId, LambdaGetter column) throws ValidateException { + public boolean checkSwitch(Long shopId, Function switchGetter) throws ValidateException { AssertUtil.isNull(shopId, "店铺ID不能为空"); ShopInfo shopInfo = getById(shopId); AssertUtil.isNull(shopInfo, "店铺不存在"); + T switchValue = switchGetter.apply(shopInfo); - String fieldName = LambdaUtil.getFieldName(column); - Object fieldValue = ReflectUtil.getFieldValue(shopInfo, fieldName); - if (fieldValue == null) { + if (switchValue == null) { return false; } - return convertToBoolean(fieldValue, fieldName); + + return convertToBoolean(switchValue); } private ShopInfo getShopInfo(Long shopId) { @@ -496,7 +497,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i } - private boolean convertToBoolean(Object fieldValue, String fieldName) throws ValidateException { + private boolean convertToBoolean(Object fieldValue) throws ValidateException { if (fieldValue instanceof Boolean) { // Boolean 类型直接返回 return (Boolean) fieldValue; @@ -511,7 +512,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i } } else { // 不支持的类型抛异常 - throw new ValidateException("字段[" + fieldName + "]类型不支持，仅支持Boolean/Integer，当前类型：" + fieldValue.getClass().getSimpleName()); + throw new ValidateException("字段类型不支持，仅支持Boolean/Integer，当前类型：" + fieldValue.getClass().getSimpleName()); } } }