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

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

@@ -0,0 +1,146 @@
+package com.cool.store.entity;
+
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 建店资料表
+ * @TableName xfsg_build_information
+ */
+@Table(name ="xfsg_build_information")
+@Data
+public class BuildInformationDO  {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+
+    @Column(name = "shop_id")
+    private Long shopId;
+
+    /**
+     * 门店联系人姓名
+     */
+    @Column(name = "shop_contact_name")
+    private String shopContactName;
+
+    /**
+     * 门店联系人手机号
+     */
+    @Column(name = "shop_contact_mobile")
+    private String shopContactMobile;
+
+    /**
+     * 营业时间
+     */
+    @Column(name = "business_hours")
+    private Date businessHours;
+
+    /**
+     * 营业电话
+     */
+    @Column(name = "business_mobile")
+    private String businessMobile;
+
+    /**
+     * 门头照（图片）
+     */
+    @Column(name = "door_photo")
+    private String doorPhoto;
+
+    /**
+     * 店内照（图片）
+     */
+    @Column(name = "in_store_photo")
+    private String inStorePhoto;
+
+    /**
+     * 法人身份证正面（图片）
+     */
+     @Column(name = "juridical_id_card_front")
+    private String juridicalIdCardFront;
+
+    /**
+     * 法人身份证反面（图片）
+     */
+     @Column(name = "juridical_id_card_reverse")
+    private String juridicalIdCardReverse;
+
+    /**
+     * 法人手持身份证正面（图片）
+     */
+     @Column(name = "juridical_handheld_id_card_front")
+    private String juridicalHandheldIdCardFront;
+
+    /**
+     * 法人手持身份证反面（图片）
+     */
+     @Column(name = "juridical_handheld_id_card_reverse")
+    private String juridicalHandheldIdCardReverse;
+
+    /**
+     * 结算人身份证正面（图片）
+     */
+     @Column(name = "settler_id_card_front")
+    private String settlerIdCardFront;
+
+    /**
+     * 结算人身份证反面（图片）
+     */
+     @Column(name = "settler_id_card_reverse")
+    private String settlerIdCardReverse;
+
+    /**
+     * 结算人身份证号
+     */
+     @Column(name = "settler_id_card_no")
+    private String settlerIdCardNo;
+
+    /**
+     * 结算人银行卡号
+     */
+     @Column(name = "settler_bank_number")
+    private String settlerBankNumber;
+
+    /**
+     * 结算人银行卡预留手机号
+     */
+     @Column(name = "settler_bank_mobile")
+    private String settlerBankMobile;
+
+    /**
+     * 结算开户银行支行
+     */
+     @Column(name = "settler_bank_name")
+    private String settlerBankName;
+
+    /**
+     * 创建时间
+     */
+     @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+     @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+     @Column(name = "create_user")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+     @Column(name = "update_user")
+    private String updateUser;
+
+}

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

@@ -55,6 +55,42 @@ public class DecorationDesignInfoDO {
      */
     private Boolean deleted;
 
+
+    /**
+     * 预计开工时间
+     */
+    @Column(name = "construction_plan_start_time")
+    private Date constructionPlanStartTime;
+
+    /**
+     * 预计完工时间
+     */
+    @Column(name = "construction_plan_end_time")
+    private Date constructionPlanEndTime;
+
+    /**
+     * 附件
+     */
+    @Column(name = "construction_annex")
+    private String constructionAnnex;
+
+    /**
+     * 备注
+     */
+    @Column(name = "construction_remark")
+    private String constructionRemark;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "construction_create_time")
+    private Date constructionCreateTime;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "construction_create_user")
+    private String constructionCreateUser;
     /**
      * @return id
      */
@@ -204,6 +240,54 @@ public class DecorationDesignInfoDO {
         return deleted;
     }
 
+    public Date getConstructionPlanStartTime() {
+        return constructionPlanStartTime;
+    }
+
+    public void setConstructionPlanStartTime(Date constructionPlanStartTime) {
+        this.constructionPlanStartTime = constructionPlanStartTime;
+    }
+
+    public Date getConstructionPlanEndTime() {
+        return constructionPlanEndTime;
+    }
+
+    public void setConstructionPlanEndTime(Date constructionPlanEndTime) {
+        this.constructionPlanEndTime = constructionPlanEndTime;
+    }
+
+    public String getConstructionAnnex() {
+        return constructionAnnex;
+    }
+
+    public void setConstructionAnnex(String constructionAnnex) {
+        this.constructionAnnex = constructionAnnex;
+    }
+
+    public String getConstructionRemark() {
+        return constructionRemark;
+    }
+
+    public void setConstructionRemark(String constructionRemark) {
+        this.constructionRemark = constructionRemark;
+    }
+
+    public Date getConstructionCreateTime() {
+        return constructionCreateTime;
+    }
+
+    public void setConstructionCreateTime(Date constructionCreateTime) {
+        this.constructionCreateTime = constructionCreateTime;
+    }
+
+    public String getConstructionCreateUser() {
+        return constructionCreateUser;
+    }
+
+    public void setConstructionCreateUser(String constructionCreateUser) {
+        this.constructionCreateUser = constructionCreateUser;
+    }
+
     /**
      * 设置是否删除：0.否 1.是
      *

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

@@ -0,0 +1,132 @@
+package com.cool.store.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 平台建店表
+ * @TableName xfsg_platform_build
+ */
+@Table(name ="xfsg_platform_build")
+@Data
+public class PlatformBuildDO  {
+    /**
+     * 
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 
+     */
+    @Column(name = "shop_id")
+    private Long shopId;
+
+    /**
+     * 审核id
+     */
+    @Column(name = "audit_id")
+    private Long auditId;
+
+    /**
+     * 1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖，6-（营帐通）
+     */
+    @Column(name = "type")
+    private Integer type;
+
+    /**
+     * 结算人身份证正面（图片）
+     */
+    @Column(name = "settler_id_card_front")
+    private String settlerIdCardFront;
+
+    /**
+     * 结算人身份证反面（图片）
+     */
+    @Column(name = "settler_id_card_reverse")
+    private String settlerIdCardReverse;
+
+    /**
+     * 结算人身份证号
+     */
+    @Column(name = "settler_id_card_no")
+    private String settlerIdCardNo;
+
+    /**
+     * 结算人银行卡号
+     */
+    @Column(name = "settler_bank_number")
+    private String settlerBankNumber;
+
+    /**
+     * 结算人银行卡预留手机号
+     */
+    @Column(name = "settler_bank_mobile")
+    private String settlerBankMobile;
+
+    /**
+     * 结算开户银行支行
+     */
+    @Column(name = "settler_bank_name")
+    private String settlerBankName;
+
+    /**
+     * 商户关系证明图片（营帐通非法人结算需要）
+     */
+    @Column(name = "relationship_proof_url")
+    private String relationshipProofUrl;
+
+    /**
+     * 开户许可证（图片）（营帐通公司结算需要）
+     */
+    @Column(name = "account_opening_permit_url")
+    private String accountOpeningPermitUrl;
+
+    /**
+     * 平台账号（快手）
+     */
+    @Column(name = "account")
+    private String account;
+
+    /**
+     * 门店定位截图（快手&抖音）
+     */
+    @Column(name = "store_positioning_url")
+    private String storePositioningUrl;
+
+    /**
+     * 授权书(抖音非法人结算需要)
+     */
+    @Column(name = "authorization_url")
+    private String authorizationUrl;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "update_user")
+    private String updateUser;
+
+
+}

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

@@ -0,0 +1,67 @@
+package com.cool.store.entity;
+
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * pos/订货系统表
+ * @TableName xfsg_pos_and_order_info
+ */
+@Table(name ="xfsg_pos_and_order_info")
+@Data
+public class PosAndOrderInfoDO  {
+    /**
+     * 
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 
+     */
+    @Column(name = "shop_id")
+    private Long shopId;
+
+    /**
+     * 1-pos 2-订货系统
+     */
+    @Column(name = "type")
+    private Integer type;
+
+    /**
+     * 账号
+     */
+    @Column(name = "account")
+    private String account;
+
+    /**
+     * 密码
+     */
+    @Column(name = "password")
+    private String password;
+
+    /**
+     * 备注
+     */
+    @Column(name = "remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    private String createUser;
+
+
+}