diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
index 81e26ec33..8f1050d4a 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
@@ -24,7 +24,8 @@
         a.first_year_start_time as firstYearStartTime,
         a.first_year_end_time as firstYearEndTime,
         a.first_year_fee as firstYearFee,
-        a.performance_bond as performanceBond
+        a.performance_bond as performanceBond,
+        b.pay_user_name as payUserName
         from xfsg_franchise_fee a
         LEFT JOIN xfsg_line_pay b ON b.id = a.pay_id
         where a.shop_id in
diff --git a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml
index 7e9994470..75ecf3ced 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml
@@ -14,7 +14,7 @@
         limit 1
     </select>
     <select id="selectByShopIds" resultType="com.cool.store.entity.SignFranchiseDO">
-        select contract_code,shop_id,contract_start_time,contract_end_time,contract_amount,create_time
+        select contract_code,shop_id,contract_start_time,contract_end_time,contract_amount,create_time,partnership_signatory_first,partnership_signatory_second
         from xfsg_sign_franchise
         where 1=1
         <if test="list !=null and list.size >0">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java
index e2a984ddd..1f7fb3fdd 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java
@@ -83,6 +83,15 @@ public class ExportBranchShopDTO {
     @ExcelProperty(value = "签约时间",order =17)
     @ColumnWidth(30)
     private String signTime ;
+
+    @ExcelProperty(value = "合伙签约人1",order =17)
+    @ColumnWidth(30)
+    private String partnershipSignatoryFirst ;
+
+    @ExcelProperty(value = "合伙签约人2",order =17)
+    @ColumnWidth(30)
+    private String partnershipSignatorySecond ;
+
     @ExcelProperty(value = "合同金额",order =18)
     @ColumnWidth(30)
     private String contractAmount;
@@ -143,6 +152,10 @@ public class ExportBranchShopDTO {
     @ColumnWidth(30)
     private String designFee;
 
+    @ExcelProperty(value = "缴款人",order = 33)
+    @ColumnWidth(30)
+    private String payUserName;
+
     @ExcelProperty(value = "第1次缴纳时间",order = 33)
     @ColumnWidth(30)
     private String firstPayTime;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
index c6bce0e91..473f8c5f0 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
@@ -36,5 +36,6 @@ public class FranchiseFeeDTO {
     private String combinedField;
 
     private List<Date> payTimeList;
-
+    //付款人
+    private String payUserName;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java
index 1244d1d11..b831cebf1 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java
@@ -56,4 +56,8 @@ public class SignFranchiseDO {
     private String contractCode;
     @Column(name = "contract_amount")
     private String contractAmount;
+    @Column(name = "partnership_signatory_first")
+    private String partnershipSignatoryFirst;
+    @Column(name = "partnership_signatory_second")
+    private String partnershipSignatorySecond;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
index c4e411f32..654460031 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
@@ -67,6 +67,10 @@ public class AddSignFranchiseRequest {
     private String contractCode;
     @ApiModelProperty("合同金额")
     private String contractAmount;
+    @ApiModelProperty("合伙签约人1")
+    private String partnershipSignatoryFirst;
+    @ApiModelProperty("合伙签约人2")
+    private String partnershipSignatorySecond;
 
 
     public SignFranchiseDO toSignFranchiseDO() {
@@ -88,6 +92,8 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setMobile(this.mobile);
         signFranchiseDO.setContractCode(this.contractCode);
         signFranchiseDO.setContractAmount(this.contractAmount);
+        signFranchiseDO.setPartnershipSignatoryFirst(this.partnershipSignatoryFirst);
+        signFranchiseDO.setPartnershipSignatorySecond(this.partnershipSignatorySecond);
         return signFranchiseDO;
     }
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
index 9c7ac43e0..c2fde0640 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
@@ -165,5 +165,10 @@ public class AddSignFranchiseResponse {
     @ApiModelProperty("合同金额")
     private String contractAmount;
 
+    @ApiModelProperty("合伙签约人1")
+    private String partnershipSignatoryFirst;
+    @ApiModelProperty("合伙签约人2")
+    private String partnershipSignatorySecond;
+
 
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java
index 2f7468e96..1532dfbf7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java
@@ -7,6 +7,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
+import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.OpeningOperationPlanAuditRequest;
@@ -55,6 +56,10 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS
             log.error("auditPlan request  is null");
             throw new ServiceException("auditPlan request is null");
         }
+        ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_14);
+        if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_141.getShopSubStageStatus())){
+            throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
+        }
         try {
             ShopAuditInfoDO shopAuditInfoDO = request.toShopAuditInfoDO();
             shopAuditInfoDO.setSubmittedUserId(user.getUserId());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index 24f6ff1e7..b56d47ed9 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -20,6 +20,7 @@ import com.cool.store.service.DeskService;
 import com.cool.store.service.RegionService;
 import com.cool.store.service.SysRoleService;
 import com.cool.store.service.UserAuthMappingService;
+import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.utils.poi.DateUtils;
 import com.cool.store.vo.BaseInfoVO;
@@ -37,6 +38,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
+import static com.cool.store.utils.poi.DateUtils.SPECIAL_DATE_START;
 import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS;
 
 /**
@@ -122,7 +124,7 @@ public class DeskServiceImpl implements DeskService {
             PayStagePendingVO payStagePendingVO = new PayStagePendingVO(baseInfoVO);
             LinePayDO linePayDO = payMap.get(x.getId());
             if (linePayDO != null && linePayDO.getPayTime() != null) {
-                payStagePendingVO.setPayTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime()));
+                payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime()));
             }
 
             list.add(payStagePendingVO);
@@ -149,7 +151,7 @@ public class DeskServiceImpl implements DeskService {
             SigningPendingVO signingPendingVO = new SigningPendingVO(baseInfoVO);
             Date date = dateMap.get(x.getId());
             if (date != null) {
-                signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
+                signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
             }
             list.add(signingPendingVO);
         });
@@ -248,7 +250,7 @@ public class DeskServiceImpl implements DeskService {
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, LinePayDO> shopPayDoMap = linePayDAO.getLinePayByShopIds(shopIds, PayBusinessTypeEnum.FRANCHISE_FEE.getCode());
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime()));
+            vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime()));
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -303,10 +305,12 @@ public class DeskServiceImpl implements DeskService {
         }
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage());
         doThing(deskStageMap, subStageList);
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            if (deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            }
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -324,10 +328,12 @@ public class DeskServiceImpl implements DeskService {
         }
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage());
         doThing(deskStageMap, subStageList);
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            if (deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            }
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -345,10 +351,12 @@ public class DeskServiceImpl implements DeskService {
         }
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage());
         doThing(deskStageMap, subStageList);
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            if (deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            }
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -365,10 +373,12 @@ public class DeskServiceImpl implements DeskService {
         }
         List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage());
         doThing(deskStageMap, subStageList);
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            if (deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            }
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -387,7 +397,9 @@ public class DeskServiceImpl implements DeskService {
         List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
         doThing(deskStageMap, subStageList);
         for (PreparationCommonPendingVO vo : list) {
-            vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            if (deskStageMap.get(vo.getShopId()) != null) {
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
+            }
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -402,34 +414,26 @@ public class DeskServiceImpl implements DeskService {
         if (CollectionUtils.isEmpty(list)) {
             return pageInfo;
         }
-        List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
+        List<Long> shopIds = list.stream().filter(o-> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
         Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
-        List<DecorationDesignInfoDO> decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds);
+        List<Long> shopIds1 = list.stream().filter(o-> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
+
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds1, ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
         doThing(deskStageMap, subStageList);
-        for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) {
-            List<DeskStageDTO> deskStages = new ArrayList<>();
-            deskStages.addAll(deskStageMap.get(decorationDesignInfoDO.getShopId()));
-            if (CollectionUtils.isEmpty(deskStages)) {
-                DeskStageDTO dto = new DeskStageDTO();
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime()));
-                dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus());
-                deskStageMap.put(decorationDesignInfoDO.getShopId(), Collections.singletonList(dto));
-            } else {
-                DeskStageDTO dto = new DeskStageDTO();
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime()));
-                dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus());
-                deskStages.add(dto);
-                deskStageMap.put(decorationDesignInfoDO.getShopId(), deskStages);
-            }
+        //施工待提交阶段提交的表单用作施工中的提交时间
+        Map<Long, Date> constructionMap = new HashMap<>();
+        List<DecorationDesignInfoDO> byIds = decorationDesignInfoDAO.getByIds(shopIds);
+        if (byIds != null) {
+            constructionMap = byIds.stream().collect(Collectors.toMap(DecorationDesignInfoDO::getShopId, DecorationDesignInfoDO::getConstructionCreateTime));
         }
         for (PreparationCommonPendingVO vo : list) {
-            for (DeskStageDTO deskStageDTO : deskStageMap.get(vo.getShopId())) {
-                if (vo.getSubStageStatus().equals(deskStageDTO.getShopSubStageStatus())) {
-                    vo.setSubmitTime(deskStageDTO.getActualCompleteTime());
-                    break;
-                }
+            if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()) && deskStageMap.get(vo.getShopId()) != null) {
+                if (deskStageMap.get(vo.getShopId()) != null){
+                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());}
+            } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) {
+                    vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()),SPECIAL_DATE_START));
             }
+
         }
         pageInfo.setList(list);
         return pageInfo;
@@ -567,13 +571,13 @@ public class DeskServiceImpl implements DeskService {
             if (CollectionUtils.isEmpty(deskStageDTOS)) {
                 DeskStageDTO dto = new DeskStageDTO();
                 Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime());
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
+                dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
                 dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus());
-                deskStageMap.put(shopStageInfoDO.getShopId(), Collections.singletonList(dto));
+                deskStageMap.put(shopStageInfoDO.getShopId(), Arrays.asList(dto));
             } else {
                 DeskStageDTO dto = new DeskStageDTO();
                 Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime());
-                dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date));
+                dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
                 dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus());
                 deskStageDTOS.add(dto);
                 deskStageMap.put(shopStageInfoDO.getShopId(), deskStageDTOS);
@@ -623,7 +627,7 @@ public class DeskServiceImpl implements DeskService {
             preparationCommonPendingVO.setShopId(x.getShopId());
             preparationCommonPendingVO.setSubStage(x.getShopSubStage());
             preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus());
-            preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, x.getCreateTime()));
+            preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, x.getCreateTime()));
             preparationCommonPendingVO.setStoreName(shopInfoDO.getShopName());
             PlanLineDTO planLineDTO = lineMap.getOrDefault(shopInfoDO.getLineId(), new PlanLineDTO());
             preparationCommonPendingVO.setPartnerName(planLineDTO.getUsername());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
index cd823c54f..d41899148 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
@@ -153,6 +153,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                     dto.setPerformanceBondBill(franchiseFeeDTO.getPerformanceBond());
                     dto.setFirstYearManagementFeeBill(franchiseFeeDTO.getFirstYearManagementFee());
                     dto.setFirstYearBrandingFeeBill(franchiseFeeDTO.getFirstYearFee());
+                    dto.setPayUserName(franchiseFeeDTO.getPayUserName());
                 }
                 dto.setUserName(response.getUsername());
                 dto.setMobile(response.getMobile());
@@ -169,6 +170,8 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                     dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime()));
                     dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime()));
                     dto.setSignTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime()));
+                    dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
+                    dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
                 }
                 List<Date> payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>());
                 for (int i = 0; i < payTime.size() && i <= 3; i++) {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
index db7ef1e94..1030327f3 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
@@ -5,6 +5,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
+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.*;
@@ -54,6 +55,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean submitLicense(FranchiseFeeRequest request) {
         log.info("submitLicense request：{}", JSONObject.toJSONString(request));
+        ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7);
+        if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus())){
+            throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
+        }
         FranchiseFeeDO franchiseFeeDO = request.toFranchiseFeeDO();
         shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71);
         if (request.getId() != null) {
@@ -112,6 +117,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
 
     @Override
     public Boolean auditFranchiseFee(AuditFranchiseFeeRequest request, LoginUserInfo user) {
+        ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7);
+        if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus())){
+            throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
+        }
         ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO();
         shopAuditInfoDO.setShopId(request.getShopId());
         ShopSubStageStatusEnum shopSubStageStatusEnum = null;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
index 30022e612..99195f3cc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
@@ -143,6 +143,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
     @Override
     @Transactional(rollbackFor = Exception.class)
     protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) {
+        if (!lineInfo.getWorkflowStage().equals(WorkflowStageEnum.INTENT.getCode())){
+            throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
+        }
         lineInfo.setId(lineInfo.getId());
         lineInfo.setWorkflowStage(WorkflowStageEnum.STORE.getCode());
         lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
index 0aa725e99..e42fc5911 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
@@ -950,6 +950,10 @@ public class PointServiceImpl implements PointService {
         if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){
             throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
         }
+        ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2);
+        if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21.getShopSubStageStatus())){
+            throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
+        }
         LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
         //正新放开限制
 //        if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
index 7a1f38bc3..9077902c3 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
@@ -288,6 +288,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile());
             addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode());
             addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount());
+            addSignFranchiseResponse.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
+            addSignFranchiseResponse.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
 
         } else {
             BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
index 414e3aa0b..fea6ab98e 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
@@ -197,6 +197,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
     @Override
     public void registrationCompleted(Long shopId) {
         ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_5);
+        if (!shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus())){
+            throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
+        }
         if(shopStageInfoDO != null){
             shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51);
             //状态结束