三方验收

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

@@ -1,5 +1,6 @@
 package com.cool.store.dto.openPreparation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,6 +20,7 @@ public class FirstOrderDTO {
     private Long shopId;
     @ApiModelProperty("首批订货金总额")
     private String totalOrderDeposit;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("最晚打款时间")
     private Date latestPaymentDate;
 
@@ -34,7 +36,7 @@ public class FirstOrderDTO {
     @ApiModelProperty("更新人")
     private String updateUserId;
 
-    @ApiModelProperty("结果")
-    private Integer resultType;
+    @ApiModelProperty("订货金阶段状态，1500 待上传, 1505 带缴纳,1510 已完成")
+    private Integer firstOrderSubStage;
 
 }

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

@@ -25,7 +25,7 @@ public class LinePaySubmitRequest {
     @ApiModelProperty("支付方式 1微信 2银行转账")
     private Integer payType;
 
-    @ApiModelProperty("付款人姓名")
+    @ApiModelProperty("付款人姓名/加盟商姓名")
     private String payUserName;
 
     @ApiModelProperty("付款账号")

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

@@ -0,0 +1,21 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/29/下午11:35
+ * @Version 1.0
+ * @注释:三方验收
+ */
+@Data
+public class ThreeAcceptanceRequest {
+    private Long shopId;
+    @ApiModelProperty("工程部验收签名 {pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
+    private String engineeringAcceptanceSignatures;
+    @ApiModelProperty("营运部验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
+    private String operationsAcceptanceSignatures;
+    @ApiModelProperty("加密商验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
+    private String partnerAcceptanceSignatures;
+}

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

@@ -0,0 +1,31 @@
+package com.cool.store.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/29/下午11:51
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ThreeAcceptanceResponse {
+
+    @ApiModelProperty("工程部验收签名 {pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
+    private String engineeringAcceptanceSignatures;
+    @ApiModelProperty("营运部验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
+    private String operationsAcceptanceSignatures;
+    @ApiModelProperty("加密商验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
+    private String partnerAcceptanceSignatures;
+    @ApiModelProperty("验收日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date acceptanceTime;
+    @ApiModelProperty("验收结果")
+    private Byte resultType;
+    @ApiModelProperty("验收评语")
+    private String acceptanceComments;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/DecorationModelVO.java

@@ -0,0 +1,38 @@
+package com.cool.store.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/29/下午4:24
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class DecorationModelVO {
+    @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
+    private Integer payStatus;
+    @ApiModelProperty("付款人姓名/加盟商姓名")
+    private String payUserName;
+    @ApiModelProperty("付款账号")
+    private String payAccount;
+    @ApiModelProperty("付款截图")
+    private String payPic;
+    @ApiModelProperty("支行名称")
+    private String branchBankName;
+    @ApiModelProperty("开户行名称")
+    private String bankName;
+    @ApiModelProperty("缴纳金额")
+    private String amount;
+    @ApiModelProperty("缴纳时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date payTime;
+    @ApiModelProperty("上传时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java

@@ -4,7 +4,7 @@ import com.cool.store.dto.decoration.AttachmentsDTO;
 import com.cool.store.dto.decoration.BudgetDTO;
 import com.cool.store.dto.decoration.ConstructionScheduleDTO;
 import com.cool.store.dto.decoration.DesignSchemeDTO;
-import com.cool.store.vo.log.DesignLogVo;
+
 import lombok.Data;
 
 import java.util.List;

coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanVO.java

@@ -42,6 +42,8 @@ public class OpeningOperationPlanVO {
 
     @ApiModelProperty("提交人")
     private String submittedUserId;
+    @ApiModelProperty("提交人名字")
+    private String submittedUserName;
 
     @ApiModelProperty("通过原因")
     private String passReason;

coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java

@@ -1,20 +0,0 @@
-package com.cool.store.vo.log;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Auther: WangShuo
- * @Date: 2024/04/28/下午4:02
- * @Version 1.0
- * @注释:设计阶段跟踪日志
- */
-@Data
-public class DesignLogVo {
-
-    private String logTime;
-    private String name;
-    private String description;
-    private List<String> attachmentUrl;
-}