新店装修阶段2.0+修改查询运营列表PSOT

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

@@ -26,8 +26,8 @@ public class OpenPlanShopInfoDTO {
     @ApiModelProperty("门店名字")
     private String shopName;
 
-    @ApiModelProperty("门店代码")
-    private String shopCode;
+    @ApiModelProperty("门店编码")
+    private String storeNum;
 
     @ApiModelProperty("开店负责人id")
     private String shopManagerUserId;

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

@@ -1,8 +1,10 @@
 package com.cool.store.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -13,20 +15,30 @@ import java.util.Date;
  */
 @Data
 public class DecorationPayRequest {
+    @ApiModelProperty("xfsg_user_info.partner_id")
+    private String partnerId;
     @ApiModelProperty("line_info.id")
+    @NotNull(message = "线索id不能为空")
     private Long lineId;
-    @ApiModelProperty("店铺编码")
-    private String shopCode;
+    @ApiModelProperty("店铺shopId")
+    private String shopId;
     @ApiModelProperty("加盟商姓名")
     private String name;
     @ApiModelProperty("支付账户")
     private String payAccount;
     @ApiModelProperty("开户行code")
     private String bankCode;
+    @ApiModelProperty("开户行名称")
+    private String bankName;
     @ApiModelProperty("支行code")
     private String branchBankCode;
+    @ApiModelProperty("支行名称")
+    private String branchBankName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("缴纳时间")
     private Date payTime;
     @ApiModelProperty("付款截图")
     private String payPic;
+    @ApiModelProperty("支付类型 2-装修款")
+    private Integer payBusinessType;
 }

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

@@ -22,7 +22,7 @@ public class OpeningOperationPlanListVO {
     private String shopName;
 
     @ApiModelProperty("门店代码")
-    private String shopCode;
+    private String storeNum;
 
     @ApiModelProperty("开店负责人")
     private String shopManagerName;