feat:合同

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

@@ -3,6 +3,8 @@ package com.cool.store.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 
 /**
  * @Author suzhuhong
@@ -40,6 +42,9 @@ public class ContractInformationDTO {
     @ApiModelProperty("合同编号")
     private String contractNo;
 
+    @ApiModelProperty("币种")
+    private String currency;
+
     @ApiModelProperty(name = "合同加盟费")
     private String contractFranchiseFee;
 
@@ -79,4 +84,19 @@ public class ContractInformationDTO {
     @ApiModelProperty(name = "提交人")
     private String summitUserName;
 
+    @ApiModelProperty(name = "签约人地址")
+    private String signerAddress;
+
+    @ApiModelProperty(name = "签约人手机号")
+    private String signerPhone;
+
+    @ApiModelProperty(name = "合同使用年限")
+    private Integer contractServiceLife;
+
+    @ApiModelProperty(name = "合同开始时间")
+    private Date contractStartTime;
+
+    @ApiModelProperty(name = "合同结束时间")
+    private Date contractEndTime;
+
 }

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

@@ -177,4 +177,11 @@ public class SignFranchiseDO {
 
     @Column(name = "update_user_id")
     private String updateUserId;
+
+    @Column(name = "currency")
+    private String currency;
+
+    @Column(name = "contract_service_life")
+    private Integer contractServiceLife;
+
 }

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

@@ -227,6 +227,12 @@ public class AddSignFranchiseRequest {
     @ApiModelProperty("加盟费折扣金额")
     private String discountAmount;
 
+    @ApiModelProperty("币种")
+    private String currency;
+
+    @ApiModelProperty("合同使用年限")
+    private Integer contractServiceLife;
+
 
 
 
@@ -273,6 +279,8 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setBrandUseFeeFrequency(this.brandUseFeeFrequency);
         signFranchiseDO.setManageFeeFrequency(this.manageFeeFrequency);
         signFranchiseDO.setDiscountAmount(this.discountAmount);
+        signFranchiseDO.setCurrency(this.currency);
+        signFranchiseDO.setContractServiceLife(this.contractServiceLife);
         return signFranchiseDO;
     }
 

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

@@ -538,12 +538,19 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
              userName = enterpriseUserDAO.getUserName(signFranchiseDO.getCreateUserId());
         }
 
+        LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
+
 
         log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
 
+        ContractInformationDTO contractInformationDTO = new ContractInformationDTO();
+        if (Objects.nonNull(lineInfo)){
+            contractInformationDTO.setSignerAddress(lineInfo.getLiveAddress());
+            contractInformationDTO.setSignerPhone(lineInfo.getMobile());
+        }
+
         //自营店 无缴费信息 不需要校验
         if (franchiseFeeDO != null){
-            ContractInformationDTO contractInformationDTO = new ContractInformationDTO();
             contractInformationDTO.setShopId(shopId);
             contractInformationDTO.setJoinModel(shopInfoDO.getJoinMode());
             contractInformationDTO.setShopName(shopInfoDO.getShopName());
@@ -569,6 +576,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             contractInformationDTO.setManageFeeFrequency(signFranchiseDO.getManageFeeFrequency());
             contractInformationDTO.setDiscountAmount(signFranchiseDO.getDiscountAmount());
             contractInformationDTO.setSummitUserName(userName);
+            contractInformationDTO.setCurrency(signFranchiseDO.getCurrency());
+            contractInformationDTO.setContractStartTime(signFranchiseDO.getContractStartTime());
+            contractInformationDTO.setContractEndTime(signFranchiseDO.getContractEndTime());
+            contractInformationDTO.setContractServiceLife(signFranchiseDO.getContractServiceLife());
 
             //老店转加盟(也叫直营转加盟)
             if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){