diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
index 6baf2aafc..e92c046eb 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
@@ -32,6 +32,7 @@ public enum MessageEnum {
     MESSAGE_14("已为您分配一位加盟商，请查收", "##### 加盟商姓名：${partnerUsername}\n##### 手机号码：${partnerMobile}\n##### 意向加盟区域：${wantShopName}\n"),
     MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", "##### 加盟商姓名：${partnerUsername}\n##### 提交时间：${submitTime}\n"),
     MESSAGE_16("您有一家门店待提交系统建店申请，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_16_1("您有一家门店待提交系统建店申请，请查收", "##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
     MESSAGE_17("您收到一份证照信息审核申请，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
     MESSAGE_18("您有一个门店已缴纳加盟费/保证金，请审核", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
     MESSAGE_19("您有一个门店待提交加盟合同审核，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
@@ -39,10 +40,10 @@ public enum MessageEnum {
     MESSAGE_21("加盟商已登记一位员工，请及时安排培训", "##### 员工姓名：【${userName}】，员工手机号码：【${mobile}】，登记时间：【${registerTime}】"),
     MESSAGE_22("您收到一位员工由您带教，请查收", "##### 员工姓名：【${userName}】，员工手机号码：【${mobile}】，登记时间：【${registerTime}】"),
     MESSAGE_23("您有一个门店待发布加盟费/保证金账单，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
-    MESSAGE_24("您有一个门店待预约三方验收时间，请查收", "#####门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"),
-    MESSAGE_25("您有一个门店待进行三方验收，请查收","#####门店名称：${storeName}\n#####加盟商姓名：${partnerUsername}\n#####加盟商手机号码：${partnerMobile}\n"),
-    MESSAGE_26("您有一个门店需要上传开业运营方案，请查收","#####门店名称：${storeName}\n#####加盟商姓名：${partnerUsername}\n#####加盟商手机号码：${partnerMobile}\n"),
-    MESSAGE_27("您有一个门店需要上传首批订货清单，请查收","#####门店名称：${storeName}\n#####加盟商姓名：${partnerUsername}\n#####加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_24("您有一个门店待预约三方验收时间，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_25("您有一个门店待进行三方验收，请查收","##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_26("您有一个门店需要上传开业运营方案，请查收","##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"),
+    MESSAGE_27("您有一个门店需要上传首批订货清单，请查收","##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"),
     ;
 
     private String title;
@@ -130,11 +131,11 @@ public enum MessageEnum {
                     return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" +
                             URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=threeAcceptance&timestamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name());
                 case MESSAGE_26:
-                    return domainUrl + "/dd-noticemsg?appId=" + appId+"&corpId="+corpId+"&page=" +
-                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=openPlan&timestamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
+                    return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" +
+                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=openPlan&timestamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
                 case MESSAGE_27:
-                    return domainUrl + "/dd-noticemsg?appId=" + appId+"&corpId="+corpId+"&page=" +
-                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=orderList&timestamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name());
+                    return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" +
+                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=orderList&timestamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name());
 
                 default:
                     return "";
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
index ecd6e012a..66ecc0f80 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
@@ -75,7 +75,7 @@ public class EmployeeTrainingDAO {
         statusList.add(3);
         Example example = new Example(EmployeeTrainingDO.class);
         example.createCriteria().andCondition("assessment_num = assessment_total_num").andEqualTo("theoretical_exam_status", 0)
-                .andIn("assessment_status", statusList);
+                .andIn("assessmentStatus", statusList);
         return employeeTrainingMapper.selectByExample(example);
     }
 
@@ -84,7 +84,7 @@ public class EmployeeTrainingDAO {
         statusList.add(0);
         statusList.add(1);
         Example example = new Example(EmployeeTrainingDO.class);
-        example.createCriteria().andIn("assessment_status", statusList);
+        example.createCriteria().andIn("assessmentStatus", statusList);
         return employeeTrainingMapper.selectCountByExample(example);
     }
 }
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java
index 5934f1aa7..0248f6680 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java
@@ -13,7 +13,7 @@ public interface ApplyLicenseMapper extends Mapper<LicenseTransactDO> {
 
     List<LicenseListResponse> licenseList(@Param("request") LicenseListRequest request,
                                           @Param("userId") String userId,
-                                          @Param("fightRegions") List<RegionDO> fightRegions);
+                                          @Param("fightRegions") List<String> fightRegions);
 
     void updateByShopId(@Param("entity") LicenseTransactDO licenseTransactDO);
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
index 0b5d139c4..5dfbd83e7 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
@@ -36,9 +36,6 @@
         update xfsg_license_transact
         set submit_status = #{entity.submitStatus}
         where shop_id = #{entity.shopId}
-        <if test="entity.deleted != null">
-            and deleted = #{entity.deleted}
-        </if>
     </update>
 
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
index b64ff8c6b..89fe5b1a6 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
@@ -143,6 +143,12 @@
         <if test="shopId != null">
             and u.shop_id = #{shopId}
         </if>
+        <if test="status != null and status == 0">
+            and e.assessment_total_num > e.assessment_num
+        </if>
+        <if test="status != null and status == 1">
+            and e.assessment_total_num = e.assessment_num
+        </if>
     </select>
     <select id="assessmentUserList" resultType="com.cool.store.vo.EmployeeTrainingVO">
         select
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index 8912d96d5..586d50fa2 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -500,7 +500,7 @@
     select  xli.id as lineId, xli.mobile as mobile, xli.username as username,xli.investment_manager as investmentManagerId ,eu.name as name
     from xfsg_line_info xli
     join enterprise_user_${enterpriseId}  eu on xli.investment_manager = eu.user_id
-    where  deleted = 0 and join_status = 1 and line_status = 1
+    where  deleted = 0
     <if test=" lineIdList != null and lineIdList.size>0">
       and  xli.id in
       <foreach collection="lineIdList" item="lineId" open="(" separator="," close=")">
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 16403192f..30c281c8a 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
@@ -33,7 +33,7 @@ public class SignFranchiseDO {
     @Column(name = "contract_start_time")
     private Date contractStartTime;
     @Column(name = "contract_end_time")
-    private Date contractStartEndTime;
+    private Date contractEndTime;
     @Column(name = "impression_num")
     private String impressionNum;
     @Column(name = "business_start_hours")
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java
index 61f1a8296..f924cc746 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java
@@ -175,6 +175,11 @@ public class SystemBuildingShopDO {
         // regioGeneralId
         systemBuildingShopDO.setRegioGeneralId(sysStoreAppRequest.getSupervisorDetail().getRegioGeneralId());
         systemBuildingShopDO.setStoreName(sysStoreAppRequest.getStoreDetail().getStoreName());
+        systemBuildingShopDO.setBigName(sysStoreAppRequest.getStoreDetail().getBigName());
+        systemBuildingShopDO.setBigCode(sysStoreAppRequest.getStoreDetail().getBigCode());
+        systemBuildingShopDO.setFightName(sysStoreAppRequest.getStoreDetail().getFightName());
+        systemBuildingShopDO.setFightCode(sysStoreAppRequest.getStoreDetail().getFightCode());
+        systemBuildingShopDO.setSmallName(sysStoreAppRequest.getStoreDetail().getSmallName());
         return systemBuildingShopDO;
     }
 }
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 813647a1b..8a3447ea3 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
@@ -65,7 +65,7 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setIsBusinessLicense(this.isBusinessLicense);
         signFranchiseDO.setIsFoodLicense(this.isFoodLicense);
         signFranchiseDO.setContractStartTime(this.contractStartTime);
-        signFranchiseDO.setContractStartEndTime(this.contractStartEndTime);
+        signFranchiseDO.setContractEndTime(this.contractStartEndTime);
         signFranchiseDO.setImpressionNum(this.impressionNum);
         signFranchiseDO.setBusinessStartHours(this.businessStartHours);
         signFranchiseDO.setBusinessEndHours(this.businessEndHours);
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java
new file mode 100644
index 000000000..7f1b1c93d
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java
@@ -0,0 +1,15 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author byd
+ * @date 2024-04-24 16:40
+ */
+@Data
+public class ShopIdRequest {
+
+    @ApiModelProperty("shopId")
+    private Long shopId;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java
index 0332bd213..ea72ec4c4 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java
@@ -106,6 +106,18 @@ public class AssessmentUserTrainingVO {
 
     @ApiModelProperty("所属区域")
     private String regionNodeName;
+    /**
+     * 考核项数
+     */
+    @ApiModelProperty("考核项数")
+    private Integer assessmentNum;
+
+    /**
+     * 考核总项数
+     */
+    @ApiModelProperty("考核总项数")
+    private Integer assessmentTotalNum;
+
 
 
     @ApiModelProperty("考核数据")
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
index d86ea67e5..c8773d1ef 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -148,7 +148,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         }
         //2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据)
         ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
-        if (Objects.nonNull(shopInfoDO.getStoreNum())) {
+        if (Objects.nonNull(shopInfoDO.getStoreNum()) && StringUtil.isNotBlank(shopInfoDO.getStoreNum())) {
             GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum());
             if (Objects.nonNull(storeInfoCode.getData().getStoreDocument()) && storeInfoCode.getCode() == 0) {
                 //替换落库的值
@@ -174,11 +174,13 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
                 return new PageInfo<>();
             }
             List<RegionDO> fightRegion = regionDao.getFightRegionByRegionIds(regionIds);
+            List<String> fightRegionIds = fightRegion.stream().map(RegionDO::getRegionId).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(fightRegion)) {
                 return new PageInfo<>();
             }
+
             PageHelper.startPage(request.getPageNum(), request.getPageSize());
-            licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegion);
+            licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegionIds);
         } else {
             PageHelper.startPage(request.getPageNum(), request.getPageSize());
             licenseListResponses = applyLicenseMapper.licenseList(request, user.getUserId(), null);
@@ -231,7 +233,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
             licenseTransactDO.setSubmitStatus(2);
             shopAuditInfoDO.setRejectReason(result);
             shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_42;
-            licenseTransactDO.setDeleted(Constants.ONE_INTEGER);
             ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
             LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
             commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.LICENSE_NOT_PASS);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
index b04605fde..d243ff305 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
@@ -500,7 +500,8 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
                 employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
             }
         }
-
+        assessmentUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum());
+        assessmentUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum());
         assessmentUserTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore());
         assessmentUserTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus());
         assessmentUserTrainingVO.setId(tempUserDetailDO.getId());
@@ -567,6 +568,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request) {
         if (CollectionUtils.isEmpty(request.getList())) {
@@ -594,7 +596,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
             if (item.getId() != null) {
                 assessmentDataDO = assessmentDataDAO.selectByPrimaryKey(item.getId());
             } else {
-                assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), employeeTrainingDO.getXfsgUserDetailId().toString(), item.getShopId());
+                assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), userId, item.getShopId());
             }
             if (assessmentDataDO != null) {
                 assessmentDataDO.setScore(item.getScore());
@@ -607,7 +609,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
                 assessmentDataDO.setShopId(item.getShopId());
                 assessmentDataDO.setComments(item.getComments());
                 assessmentDataDO.setScore(item.getScore());
-                assessmentDataDO.setAssessmentUserId(employeeTrainingDO.getXfsgUserDetailId().toString());
+                assessmentDataDO.setAssessmentUserId(userId);
                 assessmentDataDO.setPicture(item.getPicture());
                 assessmentDataDO.setVideo(item.getVideo());
                 assessmentDataDAO.insertSelective(assessmentDataDO);
@@ -622,7 +624,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         if (totalScore.get().intValue() > CommonConstants.NINETY) {
             employeeTrainingDO.setPracticalExamStatus(1);
         } else {
-            employeeTrainingDO.setPracticalExamStatus(0);
+            employeeTrainingDO.setPracticalExamStatus(2);
         }
         employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
         employeeTrainingDO.setActualAssessmentTime(new Date());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
index ce2d94a4a..ece8505c8 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
@@ -121,7 +121,7 @@ public class LinePayServiceImpl implements LinePayService {
         } else {
             fillLinePay(Boolean.FALSE, linePayDO, request, partnerUser);
             linePayDAO.updateLinePay(linePayDO);
-            return null;
+            return linePayDO.getId();
         }
     }
 
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 da2fe30a6..f2e304002 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
@@ -959,11 +959,15 @@ public class PointServiceImpl implements PointService {
             commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.LICENSE_SUBMITTED);
             //发送工作通知
             Map<String, String> requestMap = new HashMap<>();
-            requestMap.put("storeName",shopInfo.getShopName());
             requestMap.put("partnerName",lineInfo.getUsername());
             requestMap.put("partnerMobile",lineInfo.getMobile());
             requestMap.put("lineId",String.valueOf(lineInfo.getId()));
-            commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
+            if (Objects.nonNull(shopInfo.getShopName())) {
+                requestMap.put("storeName",shopInfo.getShopName());
+                commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
+            }else {
+                commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
+            }
         }
         return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
index bc8176e61..aa1653c3a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
@@ -194,17 +194,20 @@ public class PreparationServiceImpl implements PreparationService {
                 data2.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus());
                 list.add(data2);
                 //初始化xfsg_acceptance_info表
+                AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(shopId);
                 AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
                 acceptanceInfoDO.setShopId(shopId);
                 acceptanceInfoDO.setCreateTime(new Date());
-                acceptanceInfoDAO.insertSelectiveAcceptanceInfo(acceptanceInfoDO);
+                if(Objects.isNull(acceptanceInfoDO1)) {
+                    acceptanceInfoDAO.insertSelectiveAcceptanceInfo(acceptanceInfoDO);
+                }
                 ShopStageInfoDO data3 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage());
                 data3.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus());
                 list.add(data3);
                 //发送督导钉钉
                 Map<String, String> messageMap = new HashMap<>();
                 messageMap.put("storeName",shopInfo.getShopName());
-                messageMap.put("shopId",shopId.toString());
+                messageMap.put("shopId",String.valueOf(shopId));
                 messageMap.put("lineId", shopInfo.getLineId().toString());
                 messageMap.put("partnerUsername",lineInfo.getUsername());
                 messageMap.put("shopName",shopInfo.getShopName());
@@ -216,9 +219,9 @@ public class PreparationServiceImpl implements PreparationService {
                 //发送督导钉钉
                 Map<String, String> messageMap1 = new HashMap<>();
                 messageMap1.put("storeName",shopInfo.getShopName());
-                messageMap1.put("shopId",shopId.toString());
+                messageMap1.put("shopId",String.valueOf(shopId));
                 messageMap1.put("shopName",shopInfo.getShopName());
-                messageMap1.put("lineId", shopInfo.getLineId().toString());
+                messageMap1.put("lineId", String.valueOf(shopInfo.getLineId()));
                 messageMap1.put("partnerUsername",lineInfo.getUsername());
                 messageMap1.put("partnerMobile",lineInfo.getMobile());
                 commonService.sendMessage(Arrays.asList(shopInfo.getSupervisorUserId()), MessageEnum.MESSAGE_27, messageMap1);
@@ -236,8 +239,8 @@ public class PreparationServiceImpl implements PreparationService {
             openAcceptanceInfoDO.setShopId(shopId);
             openAcceptanceInfoDO.setAcceptanceStatus(CommonConstants.ZERO);
             openAcceptanceInfoDAO.insertSelective(openAcceptanceInfoDO);
+            shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
         }
-        shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
     }
 
     @Override
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 059bd609a..f03583058 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
@@ -97,6 +97,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         if (Constants.ZERO_INTEGER.equals(request.getAuditResult())) {
             shopAuditInfoDO.setResultType(Constants.ONE_INTEGER);
             shopAuditInfoDO.setRejectReason(request.getCause());
+        } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) {
+            shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER);
+            shopAuditInfoDO.setPassReason(request.getCause());
+            //校验建店与加盟签约合同是否完成 并初始化后续流程数据
+            preparationService.contractAndBuildStoreCompletion(shopId);
             Map<String, String> requestMap = new HashMap<>();
             ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
             LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
@@ -105,11 +110,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             requestMap.put("partnerMobile", lineInfo.getMobile());
             requestMap.put("lineId", String.valueOf(lineInfo.getId()));
             commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_19, requestMap);
-        } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) {
-            shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER);
-            shopAuditInfoDO.setPassReason(request.getCause());
-            //校验建店与加盟签约合同是否完成 并初始化后续流程数据
-            preparationService.contractAndBuildStoreCompletion(shopId);
         }
         shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
         Long auditId = shopAuditInfoDO.getId();
@@ -292,11 +292,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
     @Override
     public AddSignFranchiseResponse getSignFranchise(Long shopId) {
         SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
-        if (Objects.isNull(signFranchiseDO)) {
-            throw new ServiceException(ErrorCodeEnum.SIGN_FRANCHISE_NOT_FOUND);
-        }
         AddSignFranchiseResponse response = from(signFranchiseDO, shopId);
-        ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId());
+        ShopAuditInfoDO shopAuditInfoDO = null;
+        if (Objects.nonNull(signFranchiseDO)) {
+            shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId());
+        }
         if (Objects.nonNull(shopAuditInfoDO)) {
             response.setStatus(shopAuditInfoDO.getResultType());
             if (shopAuditInfoDO.getResultType() == 0) {
@@ -340,7 +340,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setIsBusinessLicense(signFranchiseDO.getIsBusinessLicense());
             addSignFranchiseResponse.setIsFoodLicense(signFranchiseDO.getIsFoodLicense());
             addSignFranchiseResponse.setContractStartTime(signFranchiseDO.getContractStartTime());
-            addSignFranchiseResponse.setContractStartEndTime(signFranchiseDO.getContractStartEndTime());
+            addSignFranchiseResponse.setContractStartEndTime(signFranchiseDO.getContractEndTime());
             addSignFranchiseResponse.setImpressionNum(signFranchiseDO.getImpressionNum());
             addSignFranchiseResponse.setBusinessStartHours(signFranchiseDO.getBusinessStartHours());
             addSignFranchiseResponse.setBusinessEndHours(signFranchiseDO.getBusinessEndHours());
@@ -372,6 +372,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense());
             addSignFranchiseResponse.setOpeAddress(licenseTransactDO.getLicenseAddress());
             addSignFranchiseResponse.setOperator(licenseTransactDO.getOperator());
+            addSignFranchiseResponse.setLicenseCode(licenseTransactDO.getCreditCode());
+            addSignFranchiseResponse.setType(LicenseTypeEnum.match(licenseTransactDO.getLicenseType()).getMessage());
         }
         if (Objects.nonNull(lineInfoDO)) {
             addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
index 7a2e2684a..16d795e74 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
@@ -404,6 +404,11 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
         ShopSubStageStatusEnum shopSubStageStatusEnum = null;
         //1.成功/失败原因
         try {
+            //删除上次提交数据
+            ShopAuditInfoDO deleteShopAuditDo = shopAuditInfoMapper.selectBykeyAndType(shopId);
+            deleteShopAuditDo.setDeleted(false);
+            shopAuditInfoMapper.updateByPrimaryKeySelective(deleteShopAuditDo);
+            //新增本次数据
             shopAuditInfoDO.setShopId(shopId);
             shopAuditInfoDO.setAuditType(AuditTypeEnum.SYS_BUILD.getCode());
             shopAuditInfoDO.setSubmittedUserId("");
@@ -425,7 +430,6 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
                 preparationService.contractAndBuildStoreCompletion(shopId);
                 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId());
                 commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SYS_BUILD_STORE_DONE);
-
                 // 异步处理
                 simpleMessageService.send(JSONObject.toJSONString(shopInfoDO), RocketMqTagEnum.SYNC_TRAINING_SHOP_PERSON);
             }
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 11b7a82da..c741107c0 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
@@ -190,11 +190,11 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
     public void registrationCompleted(Long shopId) {
         ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_5);
         if(shopStageInfoDO != null){
-            shopStageInfoDO.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51.getShopSubStageStatus());
-            shopStageInfoDAO.batchUpdate(Collections.singletonList(shopStageInfoDO));
+            shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51);
             //状态结束
             preparationService.whetherToOpenForAcceptance(shopId);
         }
     }
 
+
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java
index 9402830a5..2556736cc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java
@@ -41,7 +41,7 @@ public class YlfServiceImpl implements YlfService {
             if (status != 200) {
                 String msg = (String) JSONObject.parseObject(forObject, JSONObject.class).get("msg");
                 log.info("获取云立方装修公司信息失败,id:{}", id);
-                throw new ServiceException(ErrorCodeEnum.YLF_ERROR,msg);
+                throw new ServiceException(msg);
             }
             Object data = JSONObject.parseObject(forObject, JSONObject.class).get("data");
             if (data == null) {
@@ -53,7 +53,7 @@ public class YlfServiceImpl implements YlfService {
                 return list.get(0);
             }
         } catch (Exception e) {
-            throw new ServiceException(((ServiceException)e).getErrorMessage());
+            throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage());
         }
         return null;
     }
@@ -73,7 +73,7 @@ public class YlfServiceImpl implements YlfService {
             if (status != 200) {
                 log.info("获取云立方装修公司信息失败,storeNum:{}", storeNum);
                 String msg = (String) jsonObject.get("msg");
-                throw new ServiceException(ErrorCodeEnum.YLF_ERROR,msg);
+                throw new ServiceException(msg);
             }
             JSONObject data = jsonObject.getJSONObject("data");
             log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject);
@@ -95,7 +95,7 @@ public class YlfServiceImpl implements YlfService {
             }
         } catch (Exception e) {
             log.info("调用云立方获取项目列表异常,getProjectList error:{}", e);
-            throw new ServiceException(((ServiceException)e).getErrorMessage());
+            throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage());
         }
 
         return null;
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java
index b2b33dbe9..3fda462f6 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java
@@ -56,6 +56,7 @@ public class PCOpenPreparationController {
     @ApiOperation("获取鲜丰订货金状态")
     @GetMapping("/getStatus")
     public ResponseResult<Boolean> getStatus(@RequestParam("shopId") Long shopId) {
+
         return ResponseResult.success(openingOperationPlanService.getStatus(shopId));
     }
     @PostMapping("/openingOperationPlan/submit")
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java
index 25a64f048..d546ea9f8 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java
@@ -2,6 +2,7 @@ package com.cool.store.controller.webb;
 
 import com.cool.store.dto.ehr.StaffBaseInfoDTO;
 import com.cool.store.request.IdRequest;
+import com.cool.store.request.ShopIdRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.TempUserDetailService;
 import com.cool.store.vo.TempUserDetailInfoVO;
@@ -60,8 +61,8 @@ public class PCTempUserDetailController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "店铺id shopId")
     })
-    public ResponseResult<Boolean> registrationCompleted(@RequestBody IdRequest idRequest) {
-        tempUserDetailService.registrationCompleted((idRequest.getId()));
+    public ResponseResult<Boolean> registrationCompleted(@RequestBody ShopIdRequest shopIdRequest) {
+        tempUserDetailService.registrationCompleted(shopIdRequest.getShopId());
         return ResponseResult.success(Boolean.TRUE);
     }
 
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
index 39ebc3553..1e2cd47e2 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
@@ -38,12 +38,18 @@ public class PCTestController {
     private HttpRestTemplateService httpRestTemplateService;
 
     @GetMapping("/sendMessage")
-    public ResponseResult<Boolean> sendMessage(@RequestParam("lineId")Long lineId, @RequestParam("pointId")Long pointId, @RequestParam MessageEnum messageEnum){
+    public ResponseResult<Boolean> sendMessage(@RequestParam("lineId")Long lineId,
+                                               @RequestParam("pointId")Long pointId,
+                                               @RequestParam("shopId")Long shopId,
+                                               @RequestParam MessageEnum messageEnum){
         LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
         PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
+        ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
         Map<String, String> messageMap = new HashMap<>();
         messageMap.put("lineId", String.valueOf(lineId));
         messageMap.put("pointId", String.valueOf(pointId));
+        messageMap.put("shopId", String.valueOf(shopId));
+        messageMap.put("storeName", shopInfo.getShopName());
         messageMap.put("partnerUsername", lineInfo.getUsername());
         messageMap.put("partnerMobile", lineInfo.getMobile());
         messageMap.put("wantShopName", "杭州市余杭区");