装修调整

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

@@ -3,6 +3,8 @@ package com.cool.store.request;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author suzhuhong
  * @Date 2024/10/10 10:37
@@ -13,7 +15,8 @@ public class ConstructionRequest {
 
 
     private Long shopId;
-
+    @ApiModelProperty("施工派单id")
+    private String constructionOrderId;
     @ApiModelProperty("装修计划开始时间")
     private Long constructionPlanStartTime;
     @ApiModelProperty("装修计划结束时间")
@@ -22,4 +25,6 @@ public class ConstructionRequest {
     private String  constructionAnnex;
     @ApiModelProperty("装修备注")
     private String constructionRemark;
+    //进场时间
+    private Date actualEntryTime;
 }

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

@@ -32,6 +32,9 @@ public class DecorationDesignRequest {
     @ApiModelProperty("设计师ID")
     private String designUserId;
 
+    @ApiModelProperty(value = "报价单ID(报价单编号)")
+    private String quotationSheetId;
+
     @ApiModelProperty("报价员ID")
     private String quotationUserId;
 
@@ -58,6 +61,8 @@ public class DecorationDesignRequest {
         DecorationDesignInfoDO decorationDesignInfoDO = new DecorationDesignInfoDO();
         decorationDesignInfoDO.setDesignUrl(this.designUrl);
         decorationDesignInfoDO.setShopId(this.shopId);
+        decorationDesignInfoDO.setDesignSheetId(this.designSheetId);
+        decorationDesignInfoDO.setQuotationSheetId(this.quotationSheetId);
         if (this.designLeaderId != null) {
             decorationDesignInfoDO.setDesignLeaderId(this.designLeaderId);
         }

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

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.Column;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -50,6 +51,10 @@ public class ThreeAcceptanceRequest {
 
     @ApiModelProperty("后厨照片")
     private String backKitchenPhoto;
+    @ApiModelProperty("完工交付单ID ")
+    private String deliveryOrderId;
+    @ApiModelProperty("增减项金额")
+    private BigDecimal addReduceAmount;
 
     public Boolean miniCheck(){
         if (StringUtils.isAnyBlank(this.partnerAcceptance.toString())|| ObjectUtils.anyNull(this.satisfaction,this.isNetworkCable)){