合同签约增加字段+优化导出列表

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
+        select contract_code,shop_id,contract_start_time,contract_end_time,contract_amount
         from xfsg_sign_franchise
         where 1=1
         <if test="list !=null and list.size >0">

coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java

@@ -161,6 +161,16 @@ public class ExportBranchShopDTO {
     @ExcelProperty(value = "开店时长(天)",order =37)
     @ColumnWidth(30)
     private String openDuration;
+    @ExcelProperty(value = "缴纳加盟费/保证金",order =38)
+    @ColumnWidth(30)
+    private String franchiseFeeStageStatus;
+    @ExcelProperty(value = "加盟合同签约",order =39)
+    @ColumnWidth(30)
+    private String signFranchiseStageStatus ;
+    @ExcelProperty(value = "合同金额",order =40)
+    @ColumnWidth(30)
+    private String contractAmount;
+
 
 
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java

@@ -54,4 +54,6 @@ public class SignFranchiseDO {
     private Date updateTime;
     @Column(name = "contract_code")
     private String contractCode;
+    @Column(name = "contract_amount")
+    private String contractAmount;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java

@@ -65,6 +65,8 @@ public class AddSignFranchiseRequest {
 
     @ApiModelProperty("合同编码")
     private String contractCode;
+    @ApiModelProperty("合同金额")
+    private String contractAmount;
 
 
     public SignFranchiseDO toSignFranchiseDO() {
@@ -85,6 +87,7 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setResign(this.resign);
         signFranchiseDO.setMobile(this.mobile);
         signFranchiseDO.setContractCode(this.contractCode);
+        signFranchiseDO.setContractAmount(this.contractAmount);
         return signFranchiseDO;
     }
 

coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java

@@ -162,5 +162,7 @@ public class AddSignFranchiseResponse {
     private Date resultTime;
     @ApiModelProperty("合同编码")
     private String contractCode;
+    @ApiModelProperty("合同金额")
+    private String contractAmount;
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java

@@ -112,6 +112,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
             List<Long> shopIds = list.stream().map(BranchShopResponse::getShopId).collect(Collectors.toList());
             List<SignFranchiseDO> signFranchises = signFranchiseMapper.selectByShopIds(shopIds);
             List<FranchiseFeeDTO> franchiseFees = franchiseFeeMapper.getPayTimeByShopIds(shopIds);
+            List<ShopStageInfoDO> franchiseFeeStages = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage());
+            Map<Long, Integer> franchiseFeeStageMap = franchiseFeeStages.stream().filter(o -> o.getShopId() != null).collect(Collectors.toMap(ShopStageInfoDO::getShopId, ShopStageInfoDO::getShopSubStageStatus));
+            List<ShopStageInfoDO> signFranchisesStages = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+            Map<Long, Integer> signFranchisesStageMap = franchiseFeeStages.stream().filter(o -> o.getShopId() != null).collect(Collectors.toMap(ShopStageInfoDO::getShopId, ShopStageInfoDO::getShopSubStageStatus));
             Map<Long, List<Date>> payTimeMap = new HashMap<>();
             for (FranchiseFeeDTO dto : franchiseFees) {
                 List<Date> payTimeList = JsonToDate(dto.getCombinedField());
@@ -160,6 +164,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                 dto.setInvestmentManager(response.getInvestmentManagerName());
                 SignFranchiseDO signFranchiseDO = signFranchiseMap.get(response.getShopId());
                 if (signFranchiseDO != null) {
+                    dto.setContractAmount(signFranchiseDO.getContractAmount());
                     dto.setContractCode(signFranchiseDO.getContractCode());
                     dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime()));
                     dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime()));
@@ -193,6 +198,35 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                     dto.setDesignFeeTax(toString(invoicingDO.getDesignServiceFeeTax()));
                     dto.setDesignFee(toString(invoicingDO.getDesignServiceFee()));
                 }
+                Integer franchiseFeeStageStatus = franchiseFeeStageMap.getOrDefault(response.getShopId(), 0);
+                switch (franchiseFeeStageStatus) {
+                    case 700:
+                        dto.setFranchiseFeeStageStatus("待提交账单");
+                        break;
+                    case 710:
+                        dto.setFranchiseFeeStageStatus("待缴费");
+                        break;
+                    case 720:
+                        dto.setFranchiseFeeStageStatus("待审核");
+                        break;
+                    case 730:
+                        dto.setFranchiseFeeStageStatus("已缴费");
+                        break;
+                    case 740:
+                        dto.setFranchiseFeeStageStatus("审核未通过");
+                        break;
+                    default: dto.setFranchiseFeeStageStatus("");
+                }
+                Integer signFranchisesStageStatus = signFranchisesStageMap.getOrDefault(response.getShopId(), 0);
+                switch (signFranchisesStageStatus) {
+                    case 800:
+                        dto.setSignFranchiseStageStatus("待提交");
+                        break;
+                    case 840:
+                        dto.setSignFranchiseStageStatus("已签约");
+                        break;
+                    default: dto.setSignFranchiseStageStatus("");
+                }
                 dto.setCurrentProgress(response.getCompletionColumn() + "/" + response.getTotalColumn());
                 dto.setShopStatus(response.getShopStatus());
                 dto.setPlanOpenTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, response.getPlanOpenTime()));

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -286,6 +286,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setResign(signFranchiseDO.getResign());
             addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile());
             addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode());
+            addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount());
         } else {
             addSignFranchiseResponse.setMobile(lineInfoDO.getMobile());
         }