From 5776984a42471c64a71b024398bc9e3d6f038f2d 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 17:27:57 +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

---
 .../java/com/czg/market/dto/MemberConfigDTO.java     |  2 ++
 .../java/com/czg/market/entity/TbMemberConfig.java   |  3 ++-
 .../main/java/com/czg/market/vo/MemberConfigVO.java  |  2 ++
 .../service/impl/TbMemberConfigServiceImpl.java      |  2 --
 .../order/service/impl/OrderInfoServiceImpl.java     | 12 ++++++++----
 5 files changed, 14 insertions(+), 7 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 637cb7400..53d982351 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
@@ -93,5 +93,7 @@ public class MemberConfigDTO {
     @NotBlank(message = "规则说明不能为空")
     private String remark;
 
+    private String openType;
+
 
 }
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 ad35f3b93..931a7938d 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
@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import java.io.Serial;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -94,4 +93,6 @@ public class TbMemberConfig implements Serializable {
     @Column(onInsertValue = "now()", onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
+    private String openType;
+
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java
index 89597bca6..7e6d6ec4e 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java
@@ -80,4 +80,6 @@ public class MemberConfigVO {
      * 修改时间
      */
     private LocalDateTime updateTime;
+
+    private String openType;
 }
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 7d17016b4..b0efa0674 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
@@ -104,7 +104,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                 }
             });
             memberConfig.setConfigList(JSONObject.toJSONString(memberDTO.getConfigList()));
-            memberConfig.setConditionList(null);
         }
 
         if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() &&
@@ -124,7 +123,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 //            });
 
             memberConfig.setConditionList(JSONObject.toJSONString(memberDTO.getConditionList()));
-            memberConfig.setConfigList(null);
         }
 
         if (memberDTO.getMemberPriceShopIdList() != null && !memberDTO.getMemberPriceShopIdList().isEmpty()) {
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index db9414fae..f145a37f3 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -21,16 +21,14 @@ import com.czg.enums.ShopUserFlowBizEnum;
 import com.czg.exception.ApiNotPrintException;
 import com.czg.exception.CzgException;
 import com.czg.exception.OrderCancelException;
+import com.czg.market.service.TbMemberConfigService;
 import com.czg.order.dto.*;
 import com.czg.order.entity.CashierCart;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.entity.OrderPayment;
 import com.czg.order.enums.PayEnums;
-import com.czg.order.service.CashierCartService;
-import com.czg.order.service.OrderDetailService;
-import com.czg.order.service.OrderInfoService;
-import com.czg.order.service.OrderPaymentService;
+import com.czg.order.service.*;
 import com.czg.order.vo.*;
 import com.czg.product.entity.Product;
 import com.czg.product.service.ProductRpcService;
@@ -115,6 +113,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 //    private ShopCouponService couponService;
     @DubboReference
     private ShopActivateCouponRecordService couponRecordService;
+    @DubboReference
+    private TbMemberConfigService memberConfigService;
+    @Resource
+    private MemberOrderService memberOrderService;
     // 延迟 5 秒
     private static final long DELAY = 5;
     //重试次数
@@ -698,6 +700,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     }
 
                 }
+            }else if ("memberPay".equals(payment.getPayType())) {
+//                memberConfigService.joinMember()
             }
         }
     }