Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

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

@@ -3,17 +3,22 @@ package com.cool.store.entity;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 建店资料表
+ *
  * @TableName xfsg_build_information
  */
-@Table(name ="xfsg_build_information")
+@Table(name = "xfsg_build_information")
 @Data
-public class BuildInformationDO  {
+public class BuildInformationDO {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -39,7 +44,7 @@ public class BuildInformationDO  {
      * 营业时间
      */
     @Column(name = "business_hours")
-    private Date businessHours;
+    private String businessHours;
 
     /**
      * 营业电话
@@ -62,85 +67,97 @@ public class BuildInformationDO  {
     /**
      * 法人身份证正面（图片）
      */
-     @Column(name = "juridical_id_card_front")
+    @Column(name = "juridical_id_card_front")
     private String juridicalIdCardFront;
 
     /**
      * 法人身份证反面（图片）
      */
-     @Column(name = "juridical_id_card_reverse")
+    @Column(name = "juridical_id_card_reverse")
     private String juridicalIdCardReverse;
 
+    /**
+     * 法人身份证号
+     */
+    @Column(name = "juridical_id_card_no")
+    private String juridicalIdCardNo;
+
     /**
      * 法人手持身份证正面（图片）
      */
-     @Column(name = "juridical_handheld_id_card_front")
+    @Column(name = "juridical_handheld_id_card_front")
     private String juridicalHandheldIdCardFront;
 
     /**
      * 法人手持身份证反面（图片）
      */
-     @Column(name = "juridical_handheld_id_card_reverse")
+    @Column(name = "juridical_handheld_id_card_reverse")
     private String juridicalHandheldIdCardReverse;
 
     /**
      * 结算人身份证正面（图片）
      */
-     @Column(name = "settler_id_card_front")
+    @Column(name = "settler_id_card_front")
     private String settlerIdCardFront;
 
     /**
      * 结算人身份证反面（图片）
      */
-     @Column(name = "settler_id_card_reverse")
+    @Column(name = "settler_id_card_reverse")
     private String settlerIdCardReverse;
 
     /**
      * 结算人身份证号
      */
-     @Column(name = "settler_id_card_no")
+    @Column(name = "settler_id_card_no")
     private String settlerIdCardNo;
 
+    /**
+     * 结算人银行卡照片
+     */
+    @Column(name = "settler_bank_photo_url")
+    private String settlerBankPhotoUrl;
+
     /**
      * 结算人银行卡号
      */
-     @Column(name = "settler_bank_number")
+    @Column(name = "settler_bank_number")
     private String settlerBankNumber;
 
     /**
      * 结算人银行卡预留手机号
      */
-     @Column(name = "settler_bank_mobile")
+    @Column(name = "settler_bank_mobile")
     private String settlerBankMobile;
 
     /**
      * 结算开户银行支行
      */
-     @Column(name = "settler_bank_name")
+    @Column(name = "settler_bank_name")
     private String settlerBankName;
 
     /**
      * 创建时间
      */
-     @Column(name = "create_time")
+    @Column(name = "create_time")
     private Date createTime;
 
     /**
      * 更新时间
      */
-     @Column(name = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * 创建人
      */
-     @Column(name = "create_user")
+    @Column(name = "create_user")
     private String createUser;
 
     /**
      * 更新人
      */
-     @Column(name = "update_user")
+    @Column(name = "update_user")
     private String updateUser;
 
 }

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

@@ -50,12 +50,24 @@ public class PlatformBuildDO  {
     @Column(name = "settler_id_card_reverse")
     private String settlerIdCardReverse;
 
+    /**
+     * 结算人姓名
+     */
+    @Column(name = "settler_name")
+    private String settlerName;
+
     /**
      * 结算人身份证号
      */
     @Column(name = "settler_id_card_no")
     private String settlerIdCardNo;
 
+    /**
+     * 结算人银行卡照片
+     */
+    @Column(name = "settler_bank_photo_url")
+    private String settlerBankPhotoUrl;
+
     /**
      * 结算人银行卡号
      */

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

@@ -20,81 +20,96 @@ public class BuildInformationRequest {
 
     @NotNull
     private Long shopId;
-    @NotBlank
+    @NotBlank(message = "门店联系人姓名  不能为空")
     @Length(max = 100 , message = "门店联系人姓名长度不能超过100")
     @ApiModelProperty("门店联系人姓名")
     private String shopContactName;
 
     @ApiModelProperty("门店联系人手机号")
-    @NotBlank
+    @NotBlank(message = "门店联系人手机号  不能为空")
     @Length(min = 11,max = 11 , message = "门店联系人手机号长度必须为11")
     private String shopContactMobile;
 
     @ApiModelProperty("营业时间")
-    @NotNull
-    private Date businessHours;
+    @NotBlank(message = "营业时间  不能为空")
+    private String businessHours;
 
     @ApiModelProperty("营业电话")
-    @NotBlank
+    @NotBlank(message = "营业电话  不能为空")
     @Length(max = 100 , message = "营业电话长度不能超过100")
     private String businessMobile;
 
-    @NotBlank
+    @NotBlank(message = "门头照  不能为空")
     @Length(max = 1000 , message = "门头照长度不能超过1000")
     @ApiModelProperty("门头照（图片）")
     private String doorPhoto;
 
-    @NotBlank
+    @NotBlank(message = "店内照  不能为空")
     @Length(max = 2040 , message = "店内照长度不能超过2040")
     @ApiModelProperty("店内照（图片）")
     private String inStorePhoto;
 
-    @NotBlank
+    @NotBlank(message = "法人身份证正面  不能为空")
     @Length(max = 250 , message = "法人身份证正面长度不能超过250")
     @ApiModelProperty("法人身份证正面（图片）")
     private String juridicalIdCardFront;
 
-    @NotBlank
+    @NotBlank(message = "法人身份证反面  不能为空")
     @Length(max = 250 , message = "法人身份证反面长度不能超过250")
     @ApiModelProperty("法人身份证反面（图片）")
     private String juridicalIdCardReverse;
 
-    @NotBlank
+    @NotBlank(message = "法人身份证号  不能为空")
+    @Length(min = 18 ,max = 18, message = "法人身份证号长度必须为18位")
+    @ApiModelProperty("法人身份证号")
+    private String juridicalIdCardNo;
+
+    @NotBlank(message = "法人手持身份证正面  不能为空")
     @Length(max = 250 , message = "法人手持身份证正面 长度不能超过250")
     @ApiModelProperty("法人手持身份证正面（图片）")
     private String juridicalHandheldIdCardFront;
 
-    @NotBlank
+    @NotBlank(message = "法人手持身份证正面  不能为空")
     @Length(max = 250 , message = "法人手持身份证正面 长度不能超过250")
     @ApiModelProperty("法人手持身份证反面（图片）")
     private String juridicalHandheldIdCardReverse;
 
-    @NotBlank
+    @NotBlank(message = "结算人身份证正面  不能为空")
     @Length(max = 250 , message = "结算人身份证正面 长度不能超过250")
     @ApiModelProperty("结算人身份证正面（图片）")
     private String settlerIdCardFront;
 
-    @NotBlank
+    @NotBlank(message = "结算人身份证反面  不能为空")
     @Length(max = 250 , message = "结算人身份证反面 长度不能超过250")
     @ApiModelProperty("结算人身份证反面（图片）")
     private String settlerIdCardReverse;
 
-    @NotBlank
+    @NotBlank(message = "结算人姓名  不能为空")
+    @Length(max = 120 , message = "结算人姓名 长度不能超过128")
+    @ApiModelProperty("结算人姓名")
+    private String settlerName;
+
+    @NotBlank(message = "结算人身份证号  不能为空")
     @Length(max = 64 , message = "结算人身份证号 长度不能超过64")
     @ApiModelProperty("结算人身份证号")
     private String settlerIdCardNo;
 
-    @NotBlank
+    @NotBlank(message = "结算人银行卡照片  不能为空")
+    @Length(max = 250, message = "结算人银行卡照片 长度不能超过250")
+    @ApiModelProperty("结算人银行卡照片")
+    private String settlerBankPhotoUrl;
+
+    @NotBlank(message = "结算人银行卡号  不能为空")
     @Length(max = 64 , message = "结算人银行卡号 长度不能超过64")
     @ApiModelProperty("结算人银行卡号")
     private String settlerBankNumber;
 
-    @NotBlank
+    @NotBlank(message = "结算人银行卡预留手机号  不能为空")
     @Length(min = 11,max = 11 , message = "结算人银行卡预留手机号 长度必须为11")
     @ApiModelProperty("结算人银行卡预留手机号")
     private String settlerBankMobile;
 
-    @NotBlank
+    @NotBlank(message = "结算开户银行支行  不能为空")
     @Length(max =100, message = "结算开户银行支行 长度不能超过100")
     @ApiModelProperty("结算开户银行支行")
     private String settlerBankName;
@@ -115,6 +130,8 @@ public class BuildInformationRequest {
         buildInformationDO.setSettlerIdCardFront(this.settlerIdCardFront);
         buildInformationDO.setSettlerIdCardReverse(this.settlerIdCardReverse);
         buildInformationDO.setSettlerIdCardNo(this.settlerIdCardNo);
+        buildInformationDO.setSettlerBankPhotoUrl(this.settlerBankPhotoUrl);
+        buildInformationDO.setSettlerName(this.settlerName);
         buildInformationDO.setSettlerBankNumber(this.settlerBankNumber);
         buildInformationDO.setSettlerBankMobile(this.settlerBankMobile);
         buildInformationDO.setSettlerBankName(this.settlerBankName);

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

@@ -0,0 +1,85 @@
+package com.cool.store.request;
+
+import com.cool.store.entity.PlatformBuildDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.persistence.Column;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2024/10/09/下午9:27
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class PlatformBuildRequest {
+
+    @NotNull
+    private Long shopId;
+
+    @ApiModelProperty(value = "'1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖，6-（营帐通）',",hidden = true)
+    private Integer type;
+
+    @NotBlank
+    @Length(max = 250 , message = "结算人身份证正面 长度不能超过250")
+    @ApiModelProperty("结算人身份证正面（图片）")
+    private String settlerIdCardFront;
+
+    @NotBlank
+    @Length(max = 250 , message = "结算人身份证反面 长度不能超过250")
+    @ApiModelProperty("结算人身份证反面（图片）")
+    private String settlerIdCardReverse;
+
+    @NotBlank
+    @Length(max = 120 , message = "结算人姓名 长度不能超过128")
+    @ApiModelProperty("结算人姓名")
+    private String settlerName;
+
+    @NotBlank
+    @Length(max = 64 , message = "结算人身份证号 长度不能超过64")
+    @ApiModelProperty("结算人身份证号")
+    private String settlerIdCardNo;
+
+    @NotBlank
+    @Length(max = 250, message = "结算人银行卡照片 长度不能超过250")
+    @ApiModelProperty("结算人银行卡照片")
+    private String settlerBankPhotoUrl;
+
+    @NotBlank
+    @Length(max = 64 , message = "结算人银行卡号 长度不能超过64")
+    @ApiModelProperty("结算人银行卡号")
+    private String settlerBankNumber;
+
+    @NotBlank
+    @Length(min = 11,max = 11 , message = "结算人银行卡预留手机号 长度必须为11")
+    @ApiModelProperty("结算人银行卡预留手机号")
+    private String settlerBankMobile;
+
+    @NotBlank
+    @Length(max =100, message = "结算开户银行支行 长度不能超过100")
+    @ApiModelProperty("结算开户银行支行")
+    private String settlerBankName;
+
+    @Length(max =1020, message = "门店定位截图（快手&抖音） 长度不能超过1020")
+    @ApiModelProperty("门店定位截图（快手&抖音）")
+    private String storePositioningUrl;
+
+    @Length(max =1020, message = "授权书(抖音非法人结算需要) 长度不能超过1020")
+    @ApiModelProperty("授权书(抖音非法人结算需要)")
+    private String authorizationUrl;
+
+    public PlatformBuildDO toDO(){
+        PlatformBuildDO platformBuildDO = new PlatformBuildDO();
+        platformBuildDO.setShopId(this.shopId);
+        platformBuildDO.setSettlerIdCardFront(this.settlerIdCardFront);
+        platformBuildDO.setSettlerIdCardReverse(this.settlerIdCardReverse);
+        platformBuildDO.setSettlerIdCardNo(this.settlerIdCardNo);
+        platformBuildDO.setSettlerName(this.settlerName);
+        return platformBuildDO;
+
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.cool.store.request;
+
+import com.cool.store.entity.PosAndOrderInfoDO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2024/10/09/下午5:19
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class PostAndOrderRequest {
+
+    @NotNull
+    private Long shopId;
+    @ApiModelProperty(value = "1-pos 2-订货系统",hidden = true)
+    private Integer type;
+    @NotBlank
+    @ApiModelProperty("账号")
+    private String account;
+    @NotBlank
+    @ApiModelProperty("密码")
+    private String password;
+    @ApiModelProperty("备注")
+    private String remark;
+
+    public PosAndOrderInfoDO toDO(){
+        PosAndOrderInfoDO posAndOrderInfoDO = new PosAndOrderInfoDO();
+        posAndOrderInfoDO.setShopId(this.shopId);
+        posAndOrderInfoDO.setType(this.type);
+        posAndOrderInfoDO.setAccount(this.account);
+        posAndOrderInfoDO.setPassword(this.password);
+        posAndOrderInfoDO.setRemark(this.remark);
+        return posAndOrderInfoDO;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.cool.store.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2024/08/29/下午2:33
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class AuditInfoResponse {
+
+    @ApiModelProperty("操作人集合")
+    private List<AuditUserInfoVO> list;
+    @ApiModelProperty("操作类型 0 提交审批 1-审批通过 2 审批不通过 3-待审批")
+    private Integer type;
+    @ApiModelProperty("生成时间")
+    private Date createTime;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("附件")
+    private String annex;
+    @ApiModelProperty("实际操作人id")
+    private String actualUserId;
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(value = "可操作人信息")
+    public static class AuditUserInfoVO {
+        private String userId;
+        private String name;
+        @ApiModelProperty("头像")
+        private String avatar;
+    }
+}

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

@@ -45,7 +45,7 @@ public class BuildInformationResponse {
     private String shopContactMobile;
 
     @ApiModelProperty("营业时间")
-    private Date businessHours;
+    private String businessHours;
 
     @ApiModelProperty("营业电话")
     private String businessMobile;
@@ -62,6 +62,9 @@ public class BuildInformationResponse {
     @ApiModelProperty("法人身份证反面（图片）")
     private String juridicalIdCardReverse;
 
+    @ApiModelProperty("法人身份证号")
+    private String juridicalIdCardNo;
+
     @ApiModelProperty("法人手持身份证正面（图片）")
     private String juridicalHandheldIdCardFront;
 
@@ -77,6 +80,9 @@ public class BuildInformationResponse {
     @ApiModelProperty("结算人身份证号")
     private String settlerIdCardNo;
 
+    @ApiModelProperty("结算人银行卡照片")
+    private String settlerBankPhotoUrl;
+
     @ApiModelProperty("结算人银行卡号")
     private String settlerBankNumber;
 

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

@@ -0,0 +1,41 @@
+package com.cool.store.response;
+
+import com.cool.store.entity.PosAndOrderInfoDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2024/10/09/下午5:36
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class PosAndOrderResponse {
+
+
+    private Long shopId;
+
+    @ApiModelProperty("1-pos 2-订货系统',")
+    private Integer type;
+
+    @ApiModelProperty("账号")
+    private String account;
+
+    @ApiModelProperty("密码")
+    private String password;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("创建人")
+    private String createUser;
+
+}