Merge branch 'cc_20250701_decoration' into 'master'

Cc 20250701 decoration

See merge request hangzhou/java/custom_zxjp!126

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

@@ -25,4 +25,8 @@ public class ThreeAcceptanceDTO {
     @ApiModelProperty
     private Integer status;
 
+    @Override
+    public String toString() {
+        return  pic + remark + result + acceptanceTime + status;
+    }
 }

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

@@ -127,6 +127,54 @@ public class AcceptanceInfoDO {
     @Column(name = "shop_interior_photo")
     private String shopInteriorPhoto;
 
+    /**满意度0-低，1-中，2-高', */
+    @Column(name = "satisfaction")
+    private Integer satisfaction;
+    /**
+     * 网线安装 0-否 1-是
+     */
+    @Column(name = "is_network_cable")
+    private Boolean isNetworkCable;
+
+    //'验收单附件',
+    @Column(name = "acceptance_attachment")
+    private String acceptanceAttachment;
+
+    //'后厨照片',
+    @Column(name = "back_kitchen_photo")
+    private String backKitchenPhoto;
+
+    public Boolean getIsNetworkCable() {
+        return isNetworkCable;
+    }
+
+    public void setIsNetworkCable(Boolean networkCable) {
+        isNetworkCable = networkCable;
+    }
+
+    public Integer getSatisfaction() {
+        return satisfaction;
+    }
+
+    public void setSatisfaction(Integer satisfaction) {
+        this.satisfaction = satisfaction;
+    }
+
+    public String getAcceptanceAttachment() {
+        return acceptanceAttachment;
+    }
+
+    public void setAcceptanceAttachment(String acceptanceAttachment) {
+        this.acceptanceAttachment = acceptanceAttachment;
+    }
+
+    public String getBackKitchenPhoto() {
+        return backKitchenPhoto;
+    }
+
+    public void setBackKitchenPhoto(String backKitchenPhoto) {
+        this.backKitchenPhoto = backKitchenPhoto;
+    }
 
     public String getKsAccount() {
         return ksAccount;

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

@@ -5,8 +5,10 @@ import com.cool.store.entity.AssessmentDataDO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.persistence.Column;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -37,8 +39,20 @@ public class ThreeAcceptanceRequest {
     @ApiModelProperty("门店内景照片")
     private String shopInteriorPhoto;
 
+    @ApiModelProperty("满意度0-低，1-中，2-高',")
+    private Integer satisfaction;
+
+    @ApiModelProperty("网线安装 false-否 true-是")
+    private Boolean isNetworkCable;
+
+    @ApiModelProperty("验收单附件")
+    private String acceptanceAttachment;
+
+    @ApiModelProperty("后厨照片")
+    private String backKitchenPhoto;
+
     public Boolean miniCheck(){
-        if (StringUtils.isAnyBlank(this.shopLocationScreenshots)){
+        if (StringUtils.isAnyBlank(this.partnerAcceptance.toString())|| ObjectUtils.anyNull(this.satisfaction,this.isNetworkCable)){
             return false;
         }
         return true;

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

@@ -28,4 +28,16 @@ public class ThreeSignResponse {
     private String shopDoorwayPhoto;
     @ApiModelProperty("门店内景照片")
     private String shopInteriorPhoto;
+
+    @ApiModelProperty("满意度0-低，1-中，2-高',")
+    private Integer satisfaction;
+
+    @ApiModelProperty("网线安装 false-否 true-是")
+    private Boolean isNetworkCable;
+
+    @ApiModelProperty("验收单附件")
+    private String acceptanceAttachment;
+
+    @ApiModelProperty("后厨照片")
+    private String backKitchenPhoto;
 }