fix:打标接口针对网商改动；字段名修改；网商开通回调；大额充值回调

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java

@@ -57,7 +57,7 @@ public class AccountInfoDTO {
     @ApiModelProperty(value = "支行编号", required = true)
     private String bankNo;
 
-    @ApiModelProperty(value = "账户状态 1:待提交 2:待鉴权 3:鉴权中 4:开通", required = true)
+    @ApiModelProperty(value = "账户状态 1:待提交 2:待鉴权 3:鉴权中 4:开通 5:开通失败", required = true)
     private Integer accountStatus;
 
     @ApiModelProperty(value = "账户余额", required = true)

coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class BillPageDTO {
-    private List<BillDTO> data;
+    private List<BillDTO> pageData;
 
     private WalletBasicPageInfo page;
 }

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

@@ -23,5 +23,6 @@ public class AccountBatchQueryRequest {
     @ApiModelProperty(value = "分页信息",required = true)
     private WalletBasicPageInfo page;
 
-
+    @ApiModelProperty(value = "钱包类型 1.平安 2.网商", required = true)
+    private Integer walletType;
 }

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

@@ -4,6 +4,7 @@ import com.cool.store.common.PageBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -17,6 +18,7 @@ import java.util.Date;
 @Data
 public class AccountBillQueryRequest extends PageBasicInfo {
     @ApiModelProperty("门店id")
+    @NotNull(message = "门店id不能为空")
     private Long shopId;
 
     @ApiModelProperty("交易开始时间，不传查当月")
@@ -25,12 +27,16 @@ public class AccountBillQueryRequest extends PageBasicInfo {
     @ApiModelProperty("交易结束时间")
     private Date endDate;
 
-    @ApiModelProperty(value = "是否签约人账户 0 否 1 是")
+    @ApiModelProperty(value = "钱包类型 1.平安 2.网商", required = true)
+    @NotNull(message = "钱包类型不能为空")
+    private Integer walletType;
+
+    @ApiModelProperty("是否签约人账户 0 否 1 是")
     private Integer isLegal;
 
-    @ApiModelProperty(value = "交易类型:  0.全部,1.支出 2.收入")
+    @ApiModelProperty("交易类型:  0.全部,1.支出 2.收入")
     private Integer recordType;
 
-    @ApiModelProperty(value = "费用类型ID", required = true)
+    @ApiModelProperty("费用类型ID")
     private Long feeItemId;
 }

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

@@ -23,8 +23,10 @@ public class BillPageRequest {
     private String beginDate;
     @ApiModelProperty(value = "交易结束时间YYYY-MM-DD HH:MM:SS", required = true)
     private String endDate;
-    @ApiModelProperty(value = "钱包类型 1.门店钱包(平安) 2.签约人钱包(平安) 3.返利钱包(网商)", required = true)
+    @ApiModelProperty(value = "钱包类型 1.平安 2.网商", required = true)
     private Integer walletType;
+    @ApiModelProperty(value = "是否签约人钱包", required = false)
+    private Integer isLegal;
     @ApiModelProperty(value = "交易类型:  0.全部,1.支出 2.收入", required = false)
     private Integer recordType;
     @ApiModelProperty(value = "费用类型ID", required = true)

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

@@ -2,7 +2,10 @@ package com.cool.store.request.wallet;
 
 import com.sun.istack.NotNull;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 
@@ -12,6 +15,9 @@ import javax.validation.constraints.NotBlank;
  * @Version 1.0
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class CreateStoreRequest {
 
     @ApiModelProperty(value = "CRM门店编号", required = true)

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

@@ -27,4 +27,7 @@ public class WalletWithDrawerRequest extends StoreShopRequest {
     @NotBlank(message = "支付密码不能为空")
     private String payPwd;
 
+    @ApiModelProperty("钱包类型 1.平安 2.网商")
+    @NotNull(message = "钱包类型不能为空")
+    private Integer walletType;
 }

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

@@ -25,5 +25,7 @@ public class WithDrawerRequest {
     private String amount;
     @ApiModelProperty(value = "提现备注")
     private String remark;
+    @ApiModelProperty(value = "钱包类型 1.平安 2.网商", required = true)
+    private Integer walletType;
 
 }

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

@@ -37,6 +37,6 @@ public class AccountInfoVO {
     @ApiModelProperty(value = "打标状态 0 未打标 1 已打标")
     private Integer labelingStatus;
     
-    @ApiModelProperty("账户升级失败原因")
+    @ApiModelProperty("平安账户升级/网商开通失败原因")
     private String failReason;
 }