add:合同变更

jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java

@@ -131,5 +131,13 @@ public class PayIncomeContractCommon {
      * 合同类型（1为支出合同，否侧为收入合同）
      */
     public final static Integer CONTRACT_TYPE = 2;
+    /**
+     * 合同类型（1为支出合同，否侧为收入合同）
+     */
+    public final static Integer CONTRACT_TYPE1 = 1;
+    /**
+     * 合同类型（1为支出合同，否侧为收入合同）
+     */
+    public final static Integer CONTRACT_TYPE2 = 2;
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
+import com.jero.common.util.superSearch.ConstantUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -77,6 +78,15 @@ public class PaySpendingContract implements Serializable {
     @Size(max = 50, message = "签订联系人长度不能大于50个字符")
     @NotEmpty(message = "签订联系人不能为空")
     private String signedContactsTemporaryName;
+
+    @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "联系人手机号码格式错误")
+    @NotEmpty(message = "联系人电话不能为空")
+    private String phone;
+    @NotEmpty(message = "联系人地址不能为空")
+    private String address;
+    @NotEmpty(message = "联系人邮编不能为空")
+    private String postCode;
+
 	/**是否开口（1：是，0：否）*/
 	@Excel(name = "是否开口（1：是，0：否）", width = 15)
     @ApiModelProperty(value = "是否开口（1：是，0：否）")

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -184,10 +184,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!Objects.isNull(payContactsManagementTemporary)){
             payMailContract.setMobile(payContactsManagementTemporary.getPhone());
             payMailContract.setEmail(payContactsManagementTemporary.getEmail());
+            payMailContract.setLiaisonMan(payContactsManagementTemporary.getName());
         }
         payMailContract.setContractId(payIncomeContract.getId());
         payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
-        payMailContract.setLiaisonMan(payIncomeContract.getContractName());
+        payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE2);
         payMailContractService.save(payMailContract);
 
         // 校验金额

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java

@@ -133,6 +133,16 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         paySpendingContract.setPrincipalId(principalName.getId());
         paySpendingContract.setPrincipalName(principalName.getRealname());
         paySpendingContractService.save(paySpendingContract);
+        // 更新到合同邮寄表
+        PayMailContract payMailContract = new PayMailContract();
+        payMailContract.setContractId(paySpendingContract.getId());
+        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
+        payMailContract.setMobile(paySpendingContract.getPhone());
+        payMailContract.setEmail("");
+        payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName());
+        payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1);
+        payMailContractService.save(payMailContract);
+
         StringBuilder msgPaySpendingContractInstallment = new StringBuilder();
         if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
             List<PaySpendingContractInstallment> finalListPaySpendingContractInstallment = listPaySpendingContractInstallment;
@@ -262,6 +272,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
             List<String> list = listPaySpendingContractInstallmentOld.stream().map(PaySpendingContractInstallment::getId).collect(Collectors.toList());
             paySpendingContractInstallmentService.removeByIds(list);
         }
+
         // 新增
         if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
             List<PaySpendingContractInstallment> finalListPaySpendingContractInstallment = listPaySpendingContractInstallment;