diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java index 231a4f72..c96e95ef 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java @@ -1,6 +1,7 @@ package com.czg.market.vo; import com.czg.market.dto.MemberConfigDTO; +import com.czg.market.entity.MemberLevelConfig; import jakarta.validation.Valid; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; @@ -24,4 +25,5 @@ public class UMemberConfigVO implements Serializable { * kv形式,BIND_PHONE绑定手机号 ORDER订单数 COST_AMOUNT消费金额 RECHARGE_AMOUNT充值金额, true满足 false不满足 */ private Map conditionMap; + private MemberLevelVO memberLevel; } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index d0b1dfa3..515e491c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -132,7 +132,13 @@ public class TbMemberConfigServiceImpl extends ServiceImpl