From de5229051c0a078b045874ef12a918299b0dca89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 16:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E4=BC=9A=E5=91=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/market/dto/MemberConfigDTO.java | 5 -----
 .../main/java/com/czg/market/entity/TbMemberConfig.java   | 5 -----
 .../market/service/impl/TbMemberConfigServiceImpl.java    | 8 +++++---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
index 6b0ca65c..a69ecc4d 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
@@ -62,11 +62,6 @@ public class MemberConfigDTO {
     @Valid
     private List<condition> conditionList;
 
-    /**
-     * 购买开通金额
-     */
-    @DecimalMin(value = "0.01", message = "金额不能小于0.01")
-    private BigDecimal openAmount;
 
     /**
      * 参与会员价门店
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java
index 8b6309a9..ad35f3b9 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java
@@ -28,7 +28,6 @@ import lombok.NoArgsConstructor;
 @Table("tb_member_config")
 public class TbMemberConfig implements Serializable {
 
-    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
@@ -52,10 +51,6 @@ public class TbMemberConfig implements Serializable {
      */
     private String conditionList;
 
-    /**
-     * 购买开通金额
-     */
-    private BigDecimal openAmount;
 
     /**
      * 参与会员价门店
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 f3a973d6..7d17016b 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
@@ -91,7 +91,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     public Boolean edit(Long shopId, MemberConfigDTO memberDTO) {
         TbMemberConfig memberConfig = getOne(new QueryWrapper().eq(TbMemberConfig::getShopId, shopId));
         BeanUtil.copyProperties(memberDTO, memberConfig);
-        if ((memberDTO.getConfigList() == null || memberDTO.getConfigList().isEmpty()) && memberDTO.getOpenAmount() == null) {
+        if ((memberDTO.getConfigList() == null || memberDTO.getConfigList().isEmpty()) &&
+                (memberDTO.getConditionList() == null || memberDTO.getConditionList().isEmpty())) {
             throw new CzgException("会员开通方式必须选择一个");
         }
 
@@ -106,7 +107,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
             memberConfig.setConditionList(null);
         }
 
-        if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() && memberConfig.getOpenAmount() != null) {
+        if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() &&
+                (memberConfig.getConditionList() != null || !memberConfig.getConditionList().isEmpty())) {
             throw new CzgException("会员开通方式为单选条件");
         }
 
@@ -122,7 +124,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 //            });
 
             memberConfig.setConditionList(JSONObject.toJSONString(memberDTO.getConditionList()));
-            memberConfig.setOpenAmount(null);
+            memberConfig.setConfigList(null);
         }
 
         if (memberDTO.getMemberPriceShopIdList() != null && !memberDTO.getMemberPriceShopIdList().isEmpty()) {