From 14035dee4b11d33a6602d953ceb38046793bb1be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Thu, 15 May 2025 14:01:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=87=AA=E6=9C=89=E5=BA=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/request/OrderSysInfoRequest.java  | 8 +++++++-
 .../cool/store/service/impl/OrderSysInfoServiceImpl.java  | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
index e29e6b137..03b7b1388 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
@@ -1,7 +1,9 @@
 package com.cool.store.request;
 
 import com.cool.store.entity.OrderSysInfoDO;
+import com.cool.store.enums.JoinModeEnum;
 import com.cool.store.enums.OrderSysTypeEnum;
+import com.cool.store.enums.SignTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -115,13 +117,17 @@ public class OrderSysInfoRequest {
       
         return orderSysInfoDO;
     }
-    public Boolean check(){
+    public Boolean check(Integer joinMode){
         if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
             if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.declareGoodsType)){
                 return false;
             }
         }
         if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())){
+            //自由店只需要门店编码
+            if (Objects.equals(joinMode, JoinModeEnum.OWN_STORE.getCode())&&this.shopCode!=null){
+                return true;
+            }
             if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
                 return false;
             }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
index c9d36bf2d..a4a99d5a2 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
@@ -9,10 +9,12 @@ import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.FranchiseFeeMapper;
+import com.cool.store.mapper.SignFranchiseMapper;
 import com.cool.store.request.AuditRequest;
 import com.cool.store.request.OrderSysInfoRequest;
 import com.cool.store.service.OperationLogService;
 import com.cool.store.service.OrderSysInfoService;
+import com.cool.store.service.SignFranchiseService;
 import com.cool.store.service.UserAuthMappingService;
 import com.cool.store.utils.poi.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -73,7 +75,8 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
         String curUserId = user.getUserId();
         String curName = user.getName();
         //参数校验
-        if (!request.check()) {
+        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
+        if (!request.check(shopInfo.getJoinMode())) {
             throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
         }
         OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());