Merge branch 'developer' into 'master'

Developer

See merge request !2

gic-store-api/pom.xml

@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <libraryVersion>4.0-SNAPSHOT</libraryVersion>
     </properties>
 
@@ -30,6 +30,23 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <!--参数验证-->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.16.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>3.0.1-b09</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.12</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,6 +87,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

gic-store-api/src/main/java/com/gic/store/constant/ClerkGenderEnum.java

+package com.gic.store.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 11:01
+ */
+public enum ClerkGenderEnum {
+    MALE(1, "男"),
+    FEMALE(2, "女")
+    ;
+    private int code;
+    private String message;
+
+    ClerkGenderEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public static String parseCode(int code){
+        for(ClerkGenderEnum transactType : values()){
+            if (transactType.getCode() == code) {
+                return transactType.message;
+            }
+        }
+        return null;
+    }
+
+}

gic-store-api/src/main/java/com/gic/store/constant/ClerkLogReasonEnum.java

+package com.gic.store.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 10:28
+ */
+public enum ClerkLogReasonEnum {
+    WEB(1, "WEB后台操作"),
+    EXTERNAL(2, "外部触发"),
+    ORDER(3, "订单同步"),
+    MEMBER  (4, "会员同步"),
+    BULKORDER(7, "批量同步订单"),
+    BULKMEMBER(8, "批量同步会员")
+    ;
+    private int code;
+    private String message;
+
+    ClerkLogReasonEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/ClerkLogTypeEnum.java

+package com.gic.store.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 10:31
+ */
+public enum ClerkLogTypeEnum {
+    SAVE(1, "导购新增"),
+    UPDATE(2, "信息变更"),
+    HAOBAN(3, "好办用户绑定")
+    ;
+    private int code;
+    private String message;
+
+    ClerkLogTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/Constants.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/4
+ */
+public interface Constants {
+    String STORE_BATCH_IMPORT_MQ_KEY = "storeBulkImport";
+    String CLERK_BATCH_IMPORT_MQ_KEY = "clerkBulkImport";
+//    String STORE_BATCH_IMPORT_MQ_KEY = "tmpStoreBatchImportTaskMq4.0";
+    Integer STORE_BATCH_IMPORT_TASK_TYPE = 6;
+    Integer CLERK_BATCH_IMPORT_TASK_TYPE = 8;
+
+    String dateformat = "YYYY-MM-dd HH:mm:ss";
+    // enterprise:store:${enterpriseId}:#{storeId}
+    String STORE_KEY = "enterprise:store:";
+    // 小程序默认图片
+    String DEFAULT_PHOTO = "https://pic01-10001430.image.myqcloud.com/a5a82c47-5892-4c1c-afaf-0f8d4d41e032";
+
+    String NATIONCODE = "+86";
+
+    String NATION_CODE_DICT = "NATION_CODE";
+
+}

gic-store-api/src/main/java/com/gic/store/constant/CreateTypeEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/1
+ */
+public enum CreateTypeEnum {
+    BACKGROUND_ADD(1, "后台新增"),
+    BATCH_IMPORT(2, "批量导入"),
+    ORDER(3, "订单生成"),
+    ERP(4, "erp同步"),
+    API(5, "API接口"),
+    MEMBER(6, "会员生成"),
+    ;
+
+
+
+    private int code;
+    private String message;
+
+    CreateTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/GenderEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/17
+ */
+public enum GenderEnum {
+    MALE(1, "男"),
+    FEMALE(2, "女");
+    private int code;
+    private String message;
+
+    GenderEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public static GenderEnum parseMessage(String message) {
+        for (GenderEnum genderEnum: GenderEnum.values()) {
+            if (genderEnum.getMessage().equals(message)) {
+                return genderEnum;
+            }
+        }
+        return null;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/ImportClerkBatchResultEnum.java

+package com.gic.store.constant;
+
+/**
+ * 批处理导购返回信息
+ * @ClassName: ImportClerkBatchResultEnum

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/1/15 10:47 AM

+ */
+public enum ImportClerkBatchResultEnum {
+    A1("A1", "门店信息", "标记不导入", "门店域", "门店域为空"),
+    A2("A2", "门店信息", "标记不导入", "门店域", "该门店域不存在"),
+    A3("A3", "门店信息", "标记不导入", "所属门店", "导购所属门店code为空"),
+    A4("A4", "门店信息", "标记不导入", "所属门店", "导购所属门店code在GIC不存在"),
+    C1("C1", "导购", "标记不导入", "导购code", "导购code为空"),
+    C2("C2", "导购", "标记不导入", "导购code", "导购code重复"),
+    C3("C3", "导购", "标记不导入", "导购名称", "导购名称为空"),
+    D1("D1", "导购属性", "标记导入", "性别", "导购性别为空"),
+    D2("D2", "导购属性", "标记不导入", "性别", "导购性别错误"),
+    D3("D3", "导购属性", "标记不导入", "手机号", "导购手机号重复"),
+    D4("D4", "导购属性", "标记不导入", "手机号", "导购手机号为空"),
+    E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法");
+
+    /**
+     * 错误码
+     */
+    private String code;
+    /**
+     * 规则分类
+     */
+    private String ruleClassfy;
+    /**
+     * 处理规则
+     */
+    private String processRule;
+    /**
+     * 字段信息
+     */
+    private String fieldInfo;
+    /**
+     * 返回信息
+     */
+    private String resultInfo;
+
+    private ImportClerkBatchResultEnum(String code, String ruleClassfy, String processRule, String fieldInfo, String resultInfo) {
+        this.code = code;
+        this.ruleClassfy = ruleClassfy;
+        this.processRule = processRule;
+        this.fieldInfo = fieldInfo;
+        this.resultInfo = resultInfo;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getRuleClassfy() {
+        return ruleClassfy;
+    }
+
+    public void setRuleClassfy(String ruleClassfy) {
+        this.ruleClassfy = ruleClassfy;
+    }
+
+    public String getProcessRule() {
+        return processRule;
+    }
+
+    public void setProcessRule(String processRule) {
+        this.processRule = processRule;
+    }
+
+    public String getFieldInfo() {
+        return fieldInfo;
+    }
+
+    public void setFieldInfo(String fieldInfo) {
+        this.fieldInfo = fieldInfo;
+    }
+
+    public String getResultInfo() {
+        return resultInfo;
+    }
+
+    public void setResultInfo(String resultInfo) {
+        this.resultInfo = resultInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "规则分类:" + ruleClassfy + ";处理规则:" + processRule + ";字段信息:" + fieldInfo + ";错误信息:" + resultInfo;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/ImportStoreBatchResultEnum.java

+package com.gic.store.constant;
+
+/**
+ * 批处理导购返回信息
+ * @ClassName: ImportClerkBatchResultEnum

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/1/15 10:47 AM

+ */
+public enum ImportStoreBatchResultEnum {
+    A1("A1", "门店信息", "标记不导入", "门店域", "门店域为空"),
+    A2("A2", "门店信息", "标记不导入", "门店域", "该门店域不存在"),
+    A3("A3", "门店信息", "标记不导入", "门店code", "门店code重复"),
+    A4("A4", "门店信息", "标记不导入", "门店code", "门店code为空"),
+    A5("A5", "门店信息", "标记不导入", "门店名称", "门店名称为空"),
+    B1("B1", "门店属性", "标记不导入", "店招品牌", "店招品牌不存在"),
+    B2("B2", "门店属性", "标记不导入", "门店类型", "门店类型不存在"),
+    B3("B3", "门店属性", "标记导入", "省市区", "省市区为空"),
+    B4("B4", "门店属性", "标记不导入", "省市区", "省市区不存在"),
+    B5("B5", "门店属性", "标记不导入", "自定义属性", "必填属性XXX未填"),
+    E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法"),
+    ;
+    /**
+     * 错误码
+     */
+    private String code;
+    /**
+     * 规则分类
+     */
+    private String ruleClassfy;
+    /**
+     * 处理规则
+     */
+    private String processRule;
+    /**
+     * 字段信息
+     */
+    private String fieldInfo;
+    /**
+     * 返回信息
+     */
+    private String resultInfo;
+
+    private ImportStoreBatchResultEnum(String code, String ruleClassfy, String processRule, String fieldInfo, String resultInfo) {
+        this.code = code;
+        this.ruleClassfy = ruleClassfy;
+        this.processRule = processRule;
+        this.fieldInfo = fieldInfo;
+        this.resultInfo = resultInfo;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getRuleClassfy() {
+        return ruleClassfy;
+    }
+
+    public void setRuleClassfy(String ruleClassfy) {
+        this.ruleClassfy = ruleClassfy;
+    }
+
+    public String getProcessRule() {
+        return processRule;
+    }
+
+    public void setProcessRule(String processRule) {
+        this.processRule = processRule;
+    }
+
+    public String getFieldInfo() {
+        return fieldInfo;
+    }
+
+    public void setFieldInfo(String fieldInfo) {
+        this.fieldInfo = fieldInfo;
+    }
+
+    public String getResultInfo() {
+        return resultInfo;
+    }
+
+    public void setResultInfo(String resultInfo) {
+        this.resultInfo = resultInfo;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreCompleteEnum.java

+package com.gic.store.constant;
+
+public enum StoreCompleteEnum {
+    COMPLETE(1, "已完善"),
+    UNCOMPLETE(0, "未完善");
+    private int code;
+    private String message;
+
+    StoreCompleteEnum(int code, String message){
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreESFieldsEnum.java

+package com.gic.store.constant;
+
+public enum StoreESFieldsEnum {
+    STOREID("storeId", "门店ID"),
+    STOREINFOID("storeInfoId", "门店资料"),
+    STORENAME("storeName", "门店名称"),
+    STORECODE("storeCode", "门店代码"),
+    ENTERPRISEID("enterpriseId", "企业id"),
+    REGIONID("regionId", "门店域"),
+    REGIONNAME("regionName", "门店域名称"),
+    STOREGROUPID("storeGroupId", "门店分组"),
+    STOREGROUPIDLIST("storeGroupIdList", "门店分组"),
+    STOREGROUPNAME("storeGroupName", "门店分组名称"),
+    PROVINCEID("provinceId", "省份"),
+    CITYID("cityId", "城市"),
+    COUNTYID("countyId", "地区"),
+    PROVINCES("provinces", "门店地区"),
+    STOREBRANDIDLIST("storeBrandIdList", "店招品牌"),
+    STOREBRANDS("storeBrands", "店招品牌"),
+    STATUS("status", "门店启用状态"),
+    COMPLETESTATUS("completeStatus", "资料完善状态"),
+    CREATETYPE("createType", "创建方式"),
+    STORETYPE("storeType", "门店类型"),
+    ERPSTATUS("erpStatus", "门店状态"),
+    AREAIDS("areaIds", "门店地区"),
+    ID("id", "文档id"),
+    CUSTOM("custom", "自定义字段"),
+    SELECT("select", "选项字段"),
+    STORETAG("storeTag", "门店标签"),
+    OWNTYPE("ownType", "门店是否共享"),
+    PHOTOLIST("photoList", "门店图片"),
+    BUSSINESSTIME("businessTimeList", "门店营业时间"),
+    ADDRESS("address", "门店详细地址"),
+    LOCATION("location", "经纬度"),
+    SCORE("score", "分数"),
+    EVALUATECOUNT("evaluateCount", "评价分数"),
+    C1("c1", "自定义字段1"),
+    C2("c2", "自定义字段2"),
+    C3("c3", "自定义字段3"),
+    C4("c4", "自定义字段4"),
+    C5("c5", "自定义字段5"),
+    C6("c6", "自定义字段6"),
+    C7("c7", "自定义字段7"),
+    C8("c8", "自定义字段8"),
+    C9("c9", "自定义字段9"),
+    C10("c10", "自定义字段10");
+
+    private String field;
+    private String desc;
+
+    StoreESFieldsEnum(String field, String desc){
+        this.field = field;
+        this.desc = desc;
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public void setField(String field) {
+        this.field = field;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreEnableOrDisAbleEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/8
+ */
+public enum StoreEnableOrDisAbleEnum {
+    ENABLE(1, "启用"),
+    DISABLE(2, "不启用"),
+    ;
+    private int code;
+    private String message;
+
+    StoreEnableOrDisAbleEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreFieldDateEnum.java

+package com.gic.store.constant;
+
+/**
+  * @ClassName: StoreFieldDateEnum

+  * @Description: 
自定义字段 日期类型下拉数据
+  * @author guojuxing

+  * @date 2019/7/2 4:34 PM
+  */
+public enum StoreFieldDateEnum {
+    YMD(1, "年月日", "YYYY-MM-dd"),
+    YM(2, "年月", "YYYY-MM"),
+    MD(3, "月日", "MM-dd"),
+    YMDHMS(4, "年月日时分秒", "YYYY-MM-dd HH:mm:ss"),
+    Hms(5, "时分秒", "HH:mm:ss");
+
+    private int code;
+    private String message;
+    private String format;
+
+    private StoreFieldDateEnum(int code, String message, String format) {
+        this.code = code;
+        this.message = message;
+        this.format = format;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreFieldTextEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author guojx
+ * @date 2019/7/1 9:20 AM
+ */
+public enum StoreFieldTextEnum {
+    CHINESE(1, "中文", ".*?[\\u4e00-\\u9fa5]+.*?"),
+    NUMBER(2, "数字", ".*?[0-9]+.*?"),
+    ABC(3, "字母", ".*?[A-Za-z]+.*?"),
+    MARK(4, "符号", ".*?[^0-9A-Za-z\\u4e00-\\u9fa5]+.*?");
+
+    private int code;
+    private String message;
+    private String pattern;
+
+    private StoreFieldTextEnum(int code, String message, String pattern) {
+        this.code = code;
+        this.message = message;
+        this.pattern = pattern;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreFieldTypeEnum.java

+package com.gic.store.constant;
+
+/**
+  * @ClassName: StoreFieldTypeEnum

+  * @Description: 
  自定义字段类型
+  * @author guojuxing

+  * @date 2019/6/28 11:10 AM
+  */
+public enum  StoreFieldTypeEnum {
+    TEXT(1, "文本"),
+    RADIO(2, "单选"),
+    CHECK(3, "多选"),
+    REAL_NUMBER(4, "实数"),
+    DATE(5, "时间");
+
+    private int code;
+    private String message;
+
+    private StoreFieldTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public static StoreFieldTypeEnum getByCode(int code){
+        for(StoreFieldTypeEnum transactType : values()){
+            if (transactType.getCode() == code) {
+                return transactType;
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByCode(int code) {
+        for(StoreFieldTypeEnum transactType : values()){
+            if (transactType.getCode() == code) {
+                return transactType.getMessage();
+            }
+        }
+        return "未知";
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreGroupConstant.java

+package com.gic.store.constant;
+
+/**
+  * @ClassName: StoreGroupConstant

+  * @Description: 
 全局常量定义
+  * @author guojuxing

+  * @date 2019/6/26 6:22 PM
+  */
+public class StoreGroupConstant {
+    /**
+     * 分组第一级
+     */
+    public final static int FIRST_STORE_GROUP_LEVEL = 1;
+
+    /**
+     * 所有门店层级
+     */
+    public final static int ALL_STORE_LEVEL = 0;
+
+    /**
+     * 分组最后一级
+     */
+    public final static int LAST_STORE_GROUP_LEVEL = 6;
+
+
+    /**
+     * 排序，上移
+     */
+    public final static int SORT_UP = 1;
+
+    /**
+     * 排序，下移
+     */
+    public final static int SORT_DOWN = 2;
+
+    /**
+     * 置底
+     */
+    public final static int SORT_BOTTOM = 3;
+
+    /**
+     * 置顶
+     */
+    public final static int SORT_TOPPING = 4;
+
+    /**
+     * 是否是默认门店，初始化品牌的时候会建立一条默认门店：未分组门店，不可编辑，1:是 0:否
+     */
+    public final static int IS_DEFAULT = 1;
+
+
+    /**
+     * 分组策略类型是2
+     */
+    public final static int STORE_GROUP_STRATEGY_TYPE = 2;
+
+
+    /**
+     * 门店策略
+     */
+    public final static int STORE_STRATEGY_TYPE = 1;
+
+
+
+
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreGroupErrorEnum.java

+package com.gic.store.constant;
+
+/**
+  * @ClassName: StoreGroupErrorEnum

+  * @Description: 
  门店分组异常定义
+  * @author guojuxing

+  * @date 2019/6/26 1:46 PM
+  */
+public enum StoreGroupErrorEnum {
+    ERROR("9999", "门店分组服务异常"),
+    DELETE_ERROR("1000", "该分组下存在门店，不能删除"),
+    GROUP_LEVEL_ERROR("2000", "分组层级参数数据错误"),
+    ALL_STORE_GROUP_ERROR("3000", "所有门店已存在"),
+    PARENT_STORE_GROUP_PARAM_ERROR("4000", "父级ID参数错误"),
+    STORE_GROUP_NOT_EXIST("6000", "门店分组主键错误，数据未查到"),
+    EDIT_DEFAULT_STORE_GROUP_ERROR("5000", "默认分组：未分组门店，不可编辑"),
+    SORT_ERROR("7000", "排序错误！"),
+    PARAM_ERROR("8000", "参数错误");
+
+    private String code;
+    private String message;
+
+    private StoreGroupErrorEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreImportEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/3
+ */
+public enum StoreImportEnum {
+
+    WAIT("wait", "等待"),
+    SUCCESS("success", "成功"),
+
+    ;
+    private String code;
+    private String message;
+
+    StoreImportEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreLogReasonEnum.java

+package com.gic.store.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 10:28
+ */
+public enum StoreLogReasonEnum {
+    WEB(1, "WEB后台操作"),
+    EXTERNAL(2, "外部触发"),
+    ORDER(3, "订单同步"),
+    MEMBER(4, "会员同步"),
+    SYSTEM(5, "系统配置触发"),
+    ETL(6, "ETL同步"),
+    BULKORDER(7, "批量同步订单"),
+    BULKMEMBER(8, "批量同步会员")
+    ;
+    private int code;
+    private String message;
+
+    StoreLogReasonEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreLogTypeEnum.java

+package com.gic.store.constant;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 10:31
+ */
+public enum StoreLogTypeEnum {
+    SAVE(1, "门店新增"),
+    ADD_CLERK(2, "关联导购"),
+    INFO_UPDATE(3, "信息变更"),
+    GROUP_UPDATE(4, "分组变更"),
+    STATUS_UPDATE(5, "状态变更")
+    ;
+    private int code;
+    private String message;
+
+    StoreLogTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreOwnTypeEnum.java

+package com.gic.store.constant;
+/**
+ * 授权者、被授权
+ * @ClassName: StoreOwnTypeEnum

+ * @Description: 
  
+ * @author guojuxing
  
+ * @date 2019/9/23 9:39 AM
 
+ */
+public enum StoreOwnTypeEnum {
+    OWNER(0, "owner"),
+    OTHER(1, "other");
+
+    private int code;
+    private String message;
+
+    private StoreOwnTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    /**
+     * 是否是正确的code，即在枚举值内
+     * @Title: isRightCode

+     * @Description:
+    
 * @author guojuxing
+     * @param code

+     * @return  boolean

+    
 */
+    public static boolean isRightCode(Integer code) {
+        if (code == null) {
+            return false;
+        }
+        for (StoreOwnTypeEnum ownTypeEnum : values()) {
+            if (code.intValue() == ownTypeEnum.getCode()) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StoreStatusEnum.java

+package com.gic.store.constant;
+
+public enum StoreStatusEnum {
+    ONLINE(1, "启用"),
+    INONLINE(2, "不启用");
+    private int code;
+    private String message;
+
+    StoreStatusEnum(int code, String message){
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public static String parseCode(int code){
+        for(StoreStatusEnum transactType : values()){
+            if (transactType.getCode() == code) {
+                return transactType.message;
+            }
+        }
+        return null;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/StrategyStoreFieldEnum.java

+package com.gic.store.constant;
+
+/** 分组策略中国的门店属性下拉数据
+  * @ClassName: StrategyStoreFieldEnum

+  * @Description: 
  分组策略中国的门店属性下拉数据
+  * @author guojuxing

+  * @date 2019/7/4 4:03 PM
+  */
+public enum StrategyStoreFieldEnum {
+    STORE_PROVINCE("province", "门店省"),
+    STORE_CITY("city", "门店市"),
+    STORE_COUNTRY("country", "门店区县"),
+    RELATED_BRAND("relatedBrand", "店招品牌");
+
+    private String code;
+    private String message;
+
+
+    private StrategyStoreFieldEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-store-api/src/main/java/com/gic/store/constant/WeekdayEnum.java

+package com.gic.store.constant;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/2
+ */
+public enum WeekdayEnum {
+    MONDAY(1, "周一"),
+    TUESDAY(2, "周二"),
+    WEDNESDAY(3, "周三"),
+    THURSDAY(4, "周四"),
+    FRIDAY(5, "周五"),
+    SATURDAY(6, "周六"),
+    SUNDAY(7, "周日");
+
+    private int code;
+    private String message;
+
+    WeekdayEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public static String parse(int code) {
+        for (WeekdayEnum weekday : values()) {
+            if (weekday.getCode() == code) {
+                return weekday.message;
+            }
+        }
+        return null;
+    }
+
+}

gic-store-api/src/main/java/com/gic/store/dto/CityDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_city
+ */
+public class CityDTO implements Serializable {
+    /**
+     * 城市id
+     */
+    private String cityId;
+
+    /**
+     * 城市名称
+     */
+    private String cityName;
+
+    /**
+     * 省份id
+     */
+    private String provinceId;
+
+    /**
+     * 城市拼音
+     */
+    private String cityPy;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getCityPy() {
+        return cityPy;
+    }
+
+    public void setCityPy(String cityPy) {
+        this.cityPy = cityPy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/dto/ClerkDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/16
+ */
+public class ClerkDTO implements Serializable {
+    private static final long serialVersionUID = 2550981889147036196L;
+
+    /**
+     * 店员id
+     */
+    private Integer clerkId;
+
+    /**
+     * 店员名称
+     */
+    private String clerkName;
+
+    /**
+     * 店员编码
+     */
+    private String clerkCode;
+
+    /**
+     * 企业ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 门店id
+     */
+    private Integer storeInfoId;
+
+    /**
+     * 职位名称（仅作展现）
+     */
+    private String positionName;
+
+    /**
+     * 性别  1：男  2：女
+     */
+    private Integer clerkGender;
+
+    /**
+     * 国际码
+     */
+    private String nationcode;
+
+    /**
+     * 电话号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 好办绑定状态  1：绑定   0：未绑定
+     */
+    private Integer haobanStatus;
+
+    /**
+     * 状态（1:启用， 2:不启用）
+     */
+    private Integer status;
+
+    /**
+     * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步  5:系统配置触发
+     */
+    private Integer reason;
+    private String remark;
+    private Integer operatorId;
+    private String operatorName;
+    private String storeName;
+
+
+    public Integer getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(Integer clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public Integer getClerkGender() {
+        return clerkGender;
+    }
+
+    public void setClerkGender(Integer clerkGender) {
+        this.clerkGender = clerkGender;
+    }
+
+    public String getNationcode() {
+        return nationcode;
+    }
+
+    public void setNationcode(String nationcode) {
+        this.nationcode = nationcode;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getReason() {
+        return reason;
+    }
+
+    public void setReason(Integer reason) {
+        this.reason = reason;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getHaobanStatus() {
+        return haobanStatus;
+    }
+
+    public void setHaobanStatus(Integer haobanStatus) {
+        this.haobanStatus = haobanStatus;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/ClerkLogDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 11:12
+ */
+public class ClerkLogDTO implements Serializable {
+
+    private static final long serialVersionUID = 1461561087810835423L;
+    /**
+     *
+     */
+    private Integer clerkLogId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private Integer clerkId;
+
+    /**
+     * 日志内容
+     */
+    private String content;
+
+    /**
+     * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步
+     */
+    private Integer reason;
+
+    /**
+     * 日志类型  1:导购新增    2:信息变更    3:好办用户绑定
+     */
+    private Integer logType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Integer operatorId;
+
+    /**
+     *
+     */
+    private String operatorName;
+
+    public Integer getClerkLogId() {
+        return clerkLogId;
+    }
+
+    public void setClerkLogId(Integer clerkLogId) {
+        this.clerkLogId = clerkLogId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(Integer clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getReason() {
+        return reason;
+    }
+
+    public void setReason(Integer reason) {
+        this.reason = reason;
+    }
+
+    public Integer getLogType() {
+        return logType;
+    }
+
+    public void setLogType(Integer logType) {
+        this.logType = logType;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/ClerkSearchDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019/8/27 16:10
+ */
+public class ClerkSearchDTO implements Serializable {
+    private static final long serialVersionUID = 7888454039825986790L;
+    private String search;
+    private Integer storeGroupId;
+    private String selectJson;
+    private Integer enterpriseId;
+    private String storeIds;
+    private Integer currentPage=1;
+    private Integer pageSize=20;
+
+    private String fileName;
+    private Integer excelExtension;
+    private List<String> fieldCodeList;
+    private Integer dataType;
+
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public Integer getStoreGroupId() {
+        return storeGroupId;
+    }
+
+    public void setStoreGroupId(Integer storeGroupId) {
+        this.storeGroupId = storeGroupId;
+    }
+
+    public String getSelectJson() {
+        return selectJson;
+    }
+
+    public void setSelectJson(String selectJson) {
+        this.selectJson = selectJson;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public String getStoreIds() {
+        return storeIds;
+    }
+
+    public void setStoreIds(String storeIds) {
+        this.storeIds = storeIds;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public List<String> getFieldCodeList() {
+        return fieldCodeList;
+    }
+
+    public void setFieldCodeList(List<String> fieldCodeList) {
+        this.fieldCodeList = fieldCodeList;
+    }
+
+    public Integer getExcelExtension() {
+        return excelExtension;
+    }
+
+    public void setExcelExtension(Integer excelExtension) {
+        this.excelExtension = excelExtension;
+    }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/ClerkStoreListDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+* @ClassName: ClerkStoreDTO
+* @Description: 店员列表
+* @author xugh
+* @date 2018年7月27日 下午2:47:48
+*
+ */
+public class ClerkStoreListDTO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 747401866482339480L;
+
+    private Integer storeId;
+    private Integer storeInfoId;
+    private String storeName;
+    private String storeCode;
+    private List<ClerkDTO> clerkList;
+    private Integer ownType;
+
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public List<ClerkDTO> getClerkList() {
+        return clerkList;
+    }
+
+    public void setClerkList(List<ClerkDTO> clerkList) {
+        this.clerkList = clerkList;
+    }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/ClerkTmpDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/17
+ */
+public class ClerkTmpDTO implements Serializable {
+    private static final long serialVersionUID = 2000733283385267752L;
+
+    /**
+     *
+     */
+    private Integer clerkTmpId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 导购id
+     */
+    private String clerkName;
+
+    /**
+     * 导购code
+     */
+    private String clerkCode;
+
+    /**
+     * 门店名
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 岗位
+     */
+    private String positionName;
+
+    /**
+     * 男 、女
+     */
+    private String clerkGender;
+
+    /**
+     * 区号
+     */
+    private String nationcode;
+
+    /**
+     * 手机号
+     */
+    private String phoneNumber;
+
+    /**
+     *
+     */
+    private String errorMessage;
+
+    /**
+     *
+     */
+    private String signKey;
+
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer operatorId;
+
+    /**
+     *
+     */
+    private String operatorName;
+
+    public Integer getClerkTmpId() {
+        return clerkTmpId;
+    }
+
+    public void setClerkTmpId(Integer clerkTmpId) {
+        this.clerkTmpId = clerkTmpId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public String getClerkGender() {
+        return clerkGender;
+    }
+
+    public void setClerkGender(String clerkGender) {
+        this.clerkGender = clerkGender;
+    }
+
+    public String getNationcode() {
+        return nationcode;
+    }
+
+    public void setNationcode(String nationcode) {
+        this.nationcode = nationcode;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getSignKey() {
+        return signKey;
+    }
+
+    public void setSignKey(String signKey) {
+        this.signKey = signKey;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/CountyDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_county
+ */
+public class CountyDTO implements Serializable {
+    /**
+     * 
+     */
+    private String countyId;
+
+    /**
+     * 
+     */
+    private String countyName;
+
+    /**
+     * 
+     */
+    private String cityId;
+
+    /**
+     * 
+     */
+    private String provinceId;
+
+    /**
+     * 
+     */
+    private String fullName;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    /**
+     * 拼音
+     */
+    private String countyPy;
+
+    public String getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(String countyId) {
+        this.countyId = countyId;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCountyPy() {
+        return countyPy;
+    }
+
+    public void setCountyPy(String countyPy) {
+        this.countyPy = countyPy;
+    }
+}
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/dto/GicDictDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-03-26 15:08
+ */
+public class GicDictDTO implements Serializable {
+    private static final long serialVersionUID = -573633208657720956L;
+
+    /**
+     *
+     */
+    private String dictId;
+
+    /**
+     * 01：推送方式（IM，SMS，WEB，MOBILE，EMAIL）
+     02：消息编码
+     03：接口编码
+     */
+    private String dictType;
+
+    /**
+     * 字典code
+     */
+    private String dictCode;
+
+    /**
+     *
+     */
+    private String dictValue;
+
+    /**
+     *
+     */
+    private String dictName;
+
+    /**
+     * 1：开启，0：关闭
+     */
+    private Integer dictStatus;
+
+    /**
+     *
+     */
+    private Date createDate;
+
+    /**
+     *
+     */
+    private Integer dictSort;
+
+    public String getDictId() {
+        return dictId;
+    }
+
+    public void setDictId(String dictId) {
+        this.dictId = dictId;
+    }
+
+    public String getDictType() {
+        return dictType;
+    }
+
+    public void setDictType(String dictType) {
+        this.dictType = dictType;
+    }
+
+    public String getDictCode() {
+        return dictCode;
+    }
+
+    public void setDictCode(String dictCode) {
+        this.dictCode = dictCode;
+    }
+
+    public String getDictValue() {
+        return dictValue;
+    }
+
+    public void setDictValue(String dictValue) {
+        this.dictValue = dictValue;
+    }
+
+    public String getDictName() {
+        return dictName;
+    }
+
+    public void setDictName(String dictName) {
+        this.dictName = dictName;
+    }
+
+    public Integer getDictStatus() {
+        return dictStatus;
+    }
+
+    public void setDictStatus(Integer dictStatus) {
+        this.dictStatus = dictStatus;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getDictSort() {
+        return dictSort;
+    }
+
+    public void setDictSort(Integer dictSort) {
+        this.dictSort = dictSort;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/ProcessBatchStoreDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-01-15 15:04
+ */
+public class ProcessBatchStoreDTO implements Serializable {
+    private static final long serialVersionUID = -3098313619184408793L;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 域id
+     */
+    private Integer regionId;
+
+    /**
+     * 门店名
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 门店电话
+     */
+    private String conactsPhone;
+
+    /**
+     * 店招品牌id
+     */
+    private Integer brandId;
+    /**
+     * 店招品牌
+     */
+    private String brandName;
+
+    /**
+     *
+     */
+    private String province;
+
+    /**
+     *
+     */
+    private String city;
+
+    /**
+     *
+     */
+    private String county;
+
+    /**
+     * 门店地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * [
+     *   {
+     *     "fieldName":"",   //自定义字段名
+     *     "fieldValue:""    // 自定义字段值  如果是多选 用 ',' 隔开
+     *   }
+     * ]
+     */
+    private String customField;
+
+    /**
+     *
+     */
+    private String storeType;
+
+    /**
+     *
+     */
+    private String storeGroupName;
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getConactsPhone() {
+        return conactsPhone;
+    }
+
+    public void setConactsPhone(String conactsPhone) {
+        this.conactsPhone = conactsPhone;
+    }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getCustomField() {
+        return customField;
+    }
+
+    public void setCustomField(String customField) {
+        this.customField = customField;
+    }
+
+    public String getStoreType() {
+        return storeType;
+    }
+
+    public void setStoreType(String storeType) {
+        this.storeType = storeType;
+    }
+
+    public String getStoreGroupName() {
+        return storeGroupName;
+    }
+
+    public void setStoreGroupName(String storeGroupName) {
+        this.storeGroupName = storeGroupName;
+    }
+
+    public Integer getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Integer brandId) {
+        this.brandId = brandId;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/ProvinceDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_province
+ */
+public class ProvinceDTO implements Serializable {
+    /**
+     * 省份id
+     */
+    private String provinceId;
+
+    /**
+     * 省份名称
+     */
+    private String provinceName;
+
+    /**
+     * 省份拼音
+     */
+    private String provincePy;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getProvincePy() {
+        return provincePy;
+    }
+
+    public void setProvincePy(String provincePy) {
+        this.provincePy = provincePy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java

 package com.gic.store.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author zhiwj
@@ -8,4 +9,150 @@ import java.io.Serializable;
  */
 public class StoreBrandDTO implements Serializable {
     private static final long serialVersionUID = -1958432666455074669L;
+
+    /**
+     *
+     */
+    private Integer storeBrandId;
+
+    /**
+     * 品牌code
+     */
+    private String storeBrandCode;
+
+    /**
+     * 品牌名称
+     */
+    private String storeBrandName;
+
+    private String storeBrandCategoryCode;
+    /**
+     * 经营类目
+     */
+    private String storeBrandCategory;
+
+    /**
+     * 排序字段
+     */
+    private Double sort;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    private Integer seq;
+
+    private Integer hasRel;
+
+    public Integer getStoreBrandId() {
+        return storeBrandId;
+    }
+
+    public void setStoreBrandId(Integer storeBrandId) {
+        this.storeBrandId = storeBrandId;
+    }
+
+    public String getStoreBrandCode() {
+        return storeBrandCode;
+    }
+
+    public void setStoreBrandCode(String storeBrandCode) {
+        this.storeBrandCode = storeBrandCode;
+    }
+
+    public String getStoreBrandName() {
+        return storeBrandName;
+    }
+
+    public void setStoreBrandName(String storeBrandName) {
+        this.storeBrandName = storeBrandName;
+    }
+
+    public String getStoreBrandCategory() {
+        return storeBrandCategory;
+    }
+
+    public void setStoreBrandCategory(String storeBrandCategory) {
+        this.storeBrandCategory = storeBrandCategory;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
+
+    public String getStoreBrandCategoryCode() {
+        return storeBrandCategoryCode;
+    }
+
+    public void setStoreBrandCategoryCode(String storeBrandCategoryCode) {
+        this.storeBrandCategoryCode = storeBrandCategoryCode;
+    }
+
+    public Integer getHasRel() {
+        return hasRel;
+    }
+
+    public void setHasRel(Integer hasRel) {
+        this.hasRel = hasRel;
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreBulkOrderDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class StoreBulkOrderDTO implements Serializable {
+    private Integer type = 1; //1门店  2导购
+    private List<StoreOrderDTO> data;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public List<StoreOrderDTO> getData() {
+        return data;
+    }
+
+    public void setData(List<StoreOrderDTO> data) {
+        this.data = data;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreBusinessTimeDTO.java

 package com.gic.store.dto;
 
 import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
 
 /**
  * @author zhiwj
@@ -8,4 +10,99 @@ import java.io.Serializable;
  */
 public class StoreBusinessTimeDTO implements Serializable {
     private static final long serialVersionUID = -1536451717040174983L;
+
+    /**
+     *
+     */
+    private Integer storeBusinessTimeId;
+
+    /**
+     * 1,2
+     */
+    private String weekday;
+
+    /**
+     *
+     */
+    private Date openTime;
+
+    /**
+     *
+     */
+    private Date closeTime;
+
+    /**
+     *
+     */
+    private Integer storeInfoId;
+
+    /**
+     * 周一，周二
+     */
+    private String weekdayShow;
+
+    public Integer getStoreBusinessTimeId() {
+        return storeBusinessTimeId;
+    }
+
+    public void setStoreBusinessTimeId(Integer storeBusinessTimeId) {
+        this.storeBusinessTimeId = storeBusinessTimeId;
+    }
+
+    public String getWeekday() {
+        return weekday;
+    }
+
+    public void setWeekday(String weekday) {
+        this.weekday = weekday;
+    }
+
+    public Date getOpenTime() {
+        return openTime;
+    }
+
+    public void setOpenTime(Date openTime) {
+        this.openTime = openTime;
+    }
+
+    public Date getCloseTime() {
+        return closeTime;
+    }
+
+    public void setCloseTime(Date closeTime) {
+        this.closeTime = closeTime;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public String getWeekdayShow() {
+        return weekdayShow;
+    }
+
+    public void setWeekdayShow(String weekdayShow) {
+        this.weekdayShow = weekdayShow;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        StoreBusinessTimeDTO that = (StoreBusinessTimeDTO) o;
+        return Objects.equals(weekday, that.weekday) &&
+                Objects.equals(openTime, that.openTime) &&
+                Objects.equals(closeTime, that.closeTime);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(weekday, openTime, closeTime);
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java

 package com.gic.store.dto;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
- * @author zhiwj
- * @date 2019/6/24
+ * tab_store
  */
-public class StoreDTO implements Serializable {
-    private static final long serialVersionUID = -6360038263126373120L;
-}
+public class StoreDTO extends StoreInfoDTO implements Serializable {
+    /**
+     * 
+     */
+    private Integer storeId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+    /**
+     * 是否共享  1是0否
+     */
+    private Integer ownType;
+
+    /**
+     * 
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Integer storeGroupId;
+
+    private List<Integer> storeGroupIdList;
+
+    private String storeGroupName;
+    private Integer isEditStoreGroup = 0;
+
+    private Integer fromEnterpriseId;
+    private String fromEnterpriseName;
+    private Double score;
+    private Integer evaluateCount;
+
+    /**
+     * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步  5:系统配置触发
+     */
+    private Integer reason;
+    private String remark;
+    private Integer operatorId;
+    private String operatorName;
+    /**
+     * 小程序默认图片
+     */
+    private StorePhotoDTO defaultPhoto;
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreGroupId() {
+        return storeGroupId;
+    }
+
+    public void setStoreGroupId(Integer storeGroupId) {
+        this.storeGroupId = storeGroupId;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public List<Integer> getStoreGroupIdList() {
+        return storeGroupIdList;
+    }
+
+    public void setStoreGroupIdList(List<Integer> storeGroupIdList) {
+        this.storeGroupIdList = storeGroupIdList;
+    }
+
+    public String getStoreGroupName() {
+        return storeGroupName;
+    }
+
+    public void setStoreGroupName(String storeGroupName) {
+        this.storeGroupName = storeGroupName;
+    }
+
+    public Integer getIsEditStoreGroup() {
+        return isEditStoreGroup;
+    }
+
+    public void setIsEditStoreGroup(Integer isEditStoreGroup) {
+        this.isEditStoreGroup = isEditStoreGroup;
+    }
+
+    public Integer getFromEnterpriseId() {
+        return fromEnterpriseId;
+    }
+
+    public void setFromEnterpriseId(Integer fromEnterpriseId) {
+        this.fromEnterpriseId = fromEnterpriseId;
+    }
+
+    public void setFromEnterpriseName(String fromEnterpriseName) {
+        this.fromEnterpriseName = fromEnterpriseName;
+    }
+
+    public String getFromEnterpriseName() {
+        return fromEnterpriseName;
+    }
+
+    public Integer getReason() {
+        return reason;
+    }
+
+    public void setReason(Integer reason) {
+        this.reason = reason;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Integer getEvaluateCount() {
+        return evaluateCount;
+    }
+
+    public void setEvaluateCount(Integer evaluateCount) {
+        this.evaluateCount = evaluateCount;
+    }
+
+    public void setDefaultPhoto(StorePhotoDTO defaultPhoto) {
+        this.defaultPhoto = defaultPhoto;
+    }
+
+    public StorePhotoDTO getDefaultPhoto() {
+        return defaultPhoto;
+    }
+}
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/dto/StoreDictDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * tab_store_dict
+ */
+public class StoreDictDTO implements Serializable {
+    /**
+     *
+     */
+    private Integer storeDictId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * storeType门店类型；storeStatus门店状态
+     */
+    private String type;
+
+    /**
+     *
+     */
+    private String value;
+
+    private String key;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    private Integer checked=0;
+    /**
+     * 0：owner 1：other
+     */
+    private Integer ownType = 0;
+    private List<StoreDictDTO> storeDictList;
+
+    public Integer getStoreDictId() {
+        return storeDictId;
+    }
+
+    public void setStoreDictId(Integer storeDictId) {
+        this.storeDictId = storeDictId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Integer checked) {
+        this.checked = checked;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
+
+    public void setStoreDictList(List<StoreDictDTO> storeDictList) {
+        this.storeDictList = storeDictList;
+    }
+
+    public List<StoreDictDTO> getStoreDictList() {
+        return storeDictList;
+    }
+}
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/dto/StoreEsDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class StoreEsDTO implements Serializable {
+    private Integer storeId;
+    private Integer storeInfoId;
+    private String storeName;
+    private String storeCode;
+    private Integer enterpriseId;
+    private Integer regionId;
+    private String regionName;
+    private Integer storeGroupId;
+    private List<Integer> storeGroupIdList;
+    private String storeGroupName;
+    private String provinceId;
+    private String cityId;
+    private String countyId;
+    private String provinces;//省市区全称
+    private List<Integer> storeBrandIdList;
+    private String storeBrands;
+    private Integer status;
+    private Integer completeStatus;
+    private Integer createType;
+    private Integer storeType;
+    private Integer erpStatus;
+    private List<String> areaIds;
+    private String id;
+    private Integer ownType;
+    private List<StorePhotoDTO> photoList;
+    private List<StoreBusinessTimeDTO> businessTimeList;
+    private String location;
+    private String address;
+    private Double score;
+    private Integer evaluateCount;
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public Integer getStoreGroupId() {
+        return storeGroupId;
+    }
+
+    public void setStoreGroupId(Integer storeGroupId) {
+        this.storeGroupId = storeGroupId;
+    }
+
+    public List<Integer> getStoreGroupIdList() {
+        return storeGroupIdList;
+    }
+
+    public void setStoreGroupIdList(List<Integer> storeGroupIdList) {
+        this.storeGroupIdList = storeGroupIdList;
+    }
+
+    public String getStoreGroupName() {
+        return storeGroupName;
+    }
+
+    public void setStoreGroupName(String storeGroupName) {
+        this.storeGroupName = storeGroupName;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(String countyId) {
+        this.countyId = countyId;
+    }
+
+    public String getProvinces() {
+        return provinces;
+    }
+
+    public void setProvinces(String provinces) {
+        this.provinces = provinces;
+    }
+
+    public List<Integer> getStoreBrandIdList() {
+        return storeBrandIdList;
+    }
+
+    public void setStoreBrandIdList(List<Integer> storeBrandIdList) {
+        this.storeBrandIdList = storeBrandIdList;
+    }
+
+    public String getStoreBrands() {
+        return storeBrands;
+    }
+
+    public void setStoreBrands(String storeBrands) {
+        this.storeBrands = storeBrands;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(Integer completeStatus) {
+        this.completeStatus = completeStatus;
+    }
+
+    public Integer getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(Integer createType) {
+        this.createType = createType;
+    }
+
+    public Integer getStoreType() {
+        return storeType;
+    }
+
+    public void setStoreType(Integer storeType) {
+        this.storeType = storeType;
+    }
+
+    public Integer getErpStatus() {
+        return erpStatus;
+    }
+
+    public void setErpStatus(Integer erpStatus) {
+        this.erpStatus = erpStatus;
+    }
+
+    public List<String> getAreaIds() {
+        return areaIds;
+    }
+
+    public void setAreaIds(List<String> areaIds) {
+        this.areaIds = areaIds;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
+
+    public List<StorePhotoDTO> getPhotoList() {
+        return photoList;
+    }
+
+    public void setPhotoList(List<StorePhotoDTO> photoList) {
+        this.photoList = photoList;
+    }
+
+    public List<StoreBusinessTimeDTO> getBusinessTimeList() {
+        return businessTimeList;
+    }
+
+    public void setBusinessTimeList(List<StoreBusinessTimeDTO> businessTimeList) {
+        this.businessTimeList = businessTimeList;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public void setEvaluateCount(Integer evaluateCount) {
+        this.evaluateCount = evaluateCount;
+    }
+
+    public Integer getEvaluateCount() {
+        return evaluateCount;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreExtendDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/3
+ */
+public class StoreExtendDTO implements Serializable {
+    private static final long serialVersionUID = 6262138651367237464L;
+    /**
+     *
+     */
+    private Integer storeExtendId;
+
+    /**
+     *
+     */
+    private Integer storeInfoId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 字段属性id
+     */
+    private Integer storeFieldId;
+
+    /**
+     * 字段属性值
+     */
+    private String value;
+
+    /**
+     *
+     */
+    private Double sort;
+
+    /**
+     * 属性名称
+     */
+    private String storeFieldName;
+
+    /**
+     * 属性code
+     */
+    private String storeFieldCode;
+
+    /**
+     * 字段类型；1文本   2单选  3多选  4实数  5时间
+     */
+    private Integer storeFieldType;
+
+    /**
+     * 字段详细配置
+     */
+    private String storeFieldDetail;
+
+    /**
+     * 与ERP映射的门店字段
+     */
+    private String erpRelCode;
+
+
+    public Integer getStoreExtendId() {
+        return storeExtendId;
+    }
+
+    public void setStoreExtendId(Integer storeExtendId) {
+        this.storeExtendId = storeExtendId;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    public String getStoreFieldName() {
+        return storeFieldName;
+    }
+
+    public void setStoreFieldName(String storeFieldName) {
+        this.storeFieldName = storeFieldName;
+    }
+
+    public String getStoreFieldCode() {
+        return storeFieldCode;
+    }
+
+    public void setStoreFieldCode(String storeFieldCode) {
+        this.storeFieldCode = storeFieldCode;
+    }
+
+    public Integer getStoreFieldType() {
+        return storeFieldType;
+    }
+
+    public void setStoreFieldType(Integer storeFieldType) {
+        this.storeFieldType = storeFieldType;
+    }
+
+    public String getStoreFieldDetail() {
+        return storeFieldDetail;
+    }
+
+    public void setStoreFieldDetail(String storeFieldDetail) {
+        this.storeFieldDetail = storeFieldDetail;
+    }
+
+    public String getErpRelCode() {
+        return erpRelCode;
+    }
+
+    public void setErpRelCode(String erpRelCode) {
+        this.erpRelCode = erpRelCode;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        StoreExtendDTO that = (StoreExtendDTO) o;
+        return Objects.equals(storeFieldId, that.storeFieldId) &&
+                Objects.equals(value, that.value) &&
+                Objects.equals(storeFieldName, that.storeFieldName) &&
+                Objects.equals(storeFieldCode, that.storeFieldCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(storeFieldId, value, storeFieldName, storeFieldCode);
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldDTO.java

 package com.gic.store.dto;
 
+import javax.validation.constraints.*;
 import java.io.Serializable;
+import java.util.Date;
 
-/**
- * @author zhiwj
- * @date 2019/6/24
- */
+/** 自定义字段属性DTO
+  * @ClassName: StoreFieldDTO

+  * @Description: 
  自定义字段属性DTO
+  * @author guojuxing

+  * @date  2019/6/24 10:29 AM

+  */
 public class StoreFieldDTO implements Serializable {
     private static final long serialVersionUID = -3194005371537750579L;
 
+
+    public interface SaveFieldValidView {
+    }
+
+    public interface EditFieldValidView {
+    }
+
+    /**
+     *
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditFieldValidView.class})
+    private Integer storeFieldId;
+
+    /**
+     * 属性名称
+     */
+    @NotBlank(message = "属性名称不能为空", groups = {SaveFieldValidView.class, EditFieldValidView.class})
+    private String storeFieldName;
+
+    /**
+     * 属性code
+     */
+    private String storeFieldCode;
+
+    /**
+     * 字段类型；1文本   2单选  3多选  4实数  5时间
+     */
+    @NotNull(message = "字段类型不能为空", groups = {SaveFieldValidView.class})
+    @Min(value = 1, groups = {SaveFieldValidView.class})
+    @Max(value = 5, groups = {SaveFieldValidView.class})
+    private Integer storeFieldType;
+
+    /**
+     *
+     */
+    @NotNull(message = "企业ID不能为空", groups = {SaveFieldValidView.class})
+    private Integer enterpriseId;
+
+    /**
+     * 门店域id
+     */
+    @NotBlank(message = "门店域不能为空", groups = {SaveFieldValidView.class, EditFieldValidView.class})
+    private String storeRegionId;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     * 字段详细配置
+     */
+    @NotBlank(message = "字段详细配置不能为空", groups = {SaveFieldValidView.class})
+    private String storeFieldDetail;
+
+    /**
+     * 与ERP映射的门店字段
+     */
+    private String erpRelCode;
+
+    /**
+     * 排序字段
+     */
+    private Double sort;
+    /**
+     * 排序值
+     */
+    private Integer seq;
+
+    /**
+     * 0:owner 1:other 授权者和被授权
+     */
+    private Integer ownType;
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public String getStoreFieldName() {
+        return storeFieldName;
+    }
+
+    public void setStoreFieldName(String storeFieldName) {
+        this.storeFieldName = storeFieldName;
+    }
+
+    public String getStoreFieldCode() {
+        return storeFieldCode;
+    }
+
+    public void setStoreFieldCode(String storeFieldCode) {
+        this.storeFieldCode = storeFieldCode;
+    }
+
+    public Integer getStoreFieldType() {
+        return storeFieldType;
+    }
+
+    public void setStoreFieldType(Integer storeFieldType) {
+        this.storeFieldType = storeFieldType;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getStoreRegionId() {
+        return storeRegionId;
+    }
+
+    public void setStoreRegionId(String storeRegionId) {
+        this.storeRegionId = storeRegionId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getStoreFieldDetail() {
+        return storeFieldDetail;
+    }
+
+    public void setStoreFieldDetail(String storeFieldDetail) {
+        this.storeFieldDetail = storeFieldDetail;
+    }
+
+    public String getErpRelCode() {
+        return erpRelCode;
+    }
+
+    public void setErpRelCode(String erpRelCode) {
+        this.erpRelCode = erpRelCode;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionMapDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+/**
+ * 字段ID map regions
+ * @ClassName: StoreFieldRegionMapDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/23 5:55 PM

+ */
+public class StoreFieldRegionMapDTO implements Serializable{
+    private static final long serialVersionUID = 5213807592609385621L;
+
+    private Integer storeFieldId;
+
+    private String regionIds;
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public String getRegionIds() {
+        return regionIds;
+    }
+
+    public void setRegionIds(String regionIds) {
+        this.regionIds = regionIds;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionRelDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 门店域门店字段关联
+ * @ClassName: StoreFieldRegionRelDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/23 1:55 PM

+ */
+public class StoreFieldRegionRelDTO implements Serializable{
+    private static final long serialVersionUID = -3972442175790967351L;
+
+    /**
+     *
+     */
+    private Integer fieldRegionId;
+
+    /**
+     * 商户id
+     */
+    private Integer regionId;
+
+    /**
+     * 属性字段ID
+     */
+    private Integer storeFieldId;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getFieldRegionId() {
+        return fieldRegionId;
+    }
+
+    public void setFieldRegionId(Integer fieldRegionId) {
+        this.fieldRegionId = fieldRegionId;
+    }
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRelDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 自定义属性字段企业关联表
+ * @ClassName: StoreFieldRelDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/9/23 9:30 AM

+ */
+public class StoreFieldRelDTO implements Serializable{
+    private static final long serialVersionUID = 8351849317343562760L;
+    /**
+     *
+     */
+    private Integer fieldRelationId;
+
+    /**
+     * 商户id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 属性字段ID
+     */
+    private Integer storeFieldId;
+
+    /**
+     * 0:owner 1:other 授权者和被授权
+     */
+    private Integer ownType;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getFieldRelationId() {
+        return fieldRelationId;
+    }
+
+    public void setFieldRelationId(Integer fieldRelationId) {
+        this.fieldRelationId = fieldRelationId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public void setOwnType(Integer ownType) {
+        this.ownType = ownType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldSelectDTO.java

 package com.gic.store.dto;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
- * @author zhiwj
- * @date 2019/6/24
- */
+ *  自定义属性属性值
+  * @ClassName: StoreFieldSelectDTO

+  * @Description: 
  自定义属性属性值
+  * @author guojuxing

+  * @date 2019/6/24 10:31 AM

+  */
 public class StoreFieldSelectDTO implements Serializable {
     private static final long serialVersionUID = -7235035626761339994L;
+
+    public interface SaveStoreFieldSelectValid {
+    }
+
+    public interface EditStoreFieldSelectValid {
+    }
+
+
+    /**
+     *
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditStoreFieldSelectValid.class})
+    private Integer storeFieldSelectId;
+
+    /**
+     * 属性名称
+     */
+    @NotBlank(message = "属性值名称不能为空", groups = {SaveStoreFieldSelectValid.class, EditStoreFieldSelectValid.class})
+    private String storeFieldSelectName;
+
+    /**
+     * 属性code
+     */
+    private String storeFieldSelectCode;
+
+    /**
+     *
+     */
+    private Double sort;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     * 自定义属性字段ID
+     */
+    @NotNull(message = "自定义字段值不能为空", groups = {SaveStoreFieldSelectValid.class})
+    private Integer storeFieldId;
+
+    /**
+     * 顺序
+     */
+    private Integer seq;
+
+    public Integer getStoreFieldSelectId() {
+        return storeFieldSelectId;
+    }
+
+    public void setStoreFieldSelectId(Integer storeFieldSelectId) {
+        this.storeFieldSelectId = storeFieldSelectId;
+    }
+
+    public String getStoreFieldSelectName() {
+        return storeFieldSelectName;
+    }
+
+    public void setStoreFieldSelectName(String storeFieldSelectName) {
+        this.storeFieldSelectName = storeFieldSelectName;
+    }
+
+    public String getStoreFieldSelectCode() {
+        return storeFieldSelectCode;
+    }
+
+    public void setStoreFieldSelectCode(String storeFieldSelectCode) {
+        this.storeFieldSelectCode = storeFieldSelectCode;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreGroupDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
门店分组
+  * @ClassName: StoreGroupDTO

+  * @Description: 
门店分组
+  * @author guojuxing

+  * @date 2019/6/26 1:57 PM
+  */
+public class StoreGroupDTO implements Serializable{
+    private static final long serialVersionUID = 5358954654155895008L;
+
+    /**
+     *
+     */
+    private Integer storeGroupId;
+
+    /**
+     * 分组名称
+     */
+    private String storeGroupName;
+
+    /**
+     * 父级分组id
+     */
+    private Integer parentStoreGroupId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 分组层级
+     */
+    private Integer groupLevel;
+
+    /**
+     * 分组链id
+     */
+    private String storeGroupChain;
+
+    /**
+     * 分组排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态值
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+    /**
+     * 是否是默认门店，初始化品牌的时候会建立一条默认门店：未分组门店，1:是 0:否
+     */
+    private Integer isDefault;
+
+    public Integer getStoreGroupId() {
+        return storeGroupId;
+    }
+
+    public void setStoreGroupId(Integer storeGroupId) {
+        this.storeGroupId = storeGroupId;
+    }
+
+    public String getStoreGroupName() {
+        return storeGroupName;
+    }
+
+    public void setStoreGroupName(String storeGroupName) {
+        this.storeGroupName = storeGroupName;
+    }
+
+    public Integer getParentStoreGroupId() {
+        return parentStoreGroupId;
+    }
+
+    public void setParentStoreGroupId(Integer parentStoreGroupId) {
+        this.parentStoreGroupId = parentStoreGroupId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getGroupLevel() {
+        return groupLevel;
+    }
+
+    public void setGroupLevel(Integer groupLevel) {
+        this.groupLevel = groupLevel;
+    }
+
+    public String getStoreGroupChain() {
+        return storeGroupChain;
+    }
+
+    public void setStoreGroupChain(String storeGroupChain) {
+        this.storeGroupChain = storeGroupChain;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(Integer isDefault) {
+        this.isDefault = isDefault;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreInfoDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @date 2019/6/24
+ */
+public class StoreInfoDTO implements Serializable {
+    private static final long serialVersionUID = -6360038263126373120L;
+    /**
+     *
+     */
+    private Integer storeInfoId;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 域id
+     */
+    private Integer regionId;
+
+    private String regionName;
+
+    /**
+     * 门店电话
+     */
+    private String conactsPhone;
+
+    /**
+     * 门店详细地址
+     */
+    private String address;
+
+    /**
+     * 关联门店品牌iid，多个用逗号分隔
+     */
+    private String brandIds;
+
+    private List<Integer> storeBrandIdList;
+
+    private String storeBrandNames;
+
+    private String storeBrands;
+
+    /**
+     * 地区id
+     */
+    private String areaId;
+
+    private String countyId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    private  List<Double> location;
+
+    /**
+     * 距离
+     */
+    private Double distance;
+
+    /**
+     * 溢出状态；默认为0，1标识溢出
+     */
+    private Integer overflowStatus;
+
+    /**
+     * 门店启用状态；1启用  2不启用
+     */
+    private Integer status;
+
+    private Integer completeStatus;
+
+    /**
+     * erp门店状态
+     */
+    private Integer erpStatus;
+
+    /**
+     * 门店类型
+     */
+    private Integer storeType;
+    private Date createTime;
+    private Date updateTime;
+    private List<StoreBrandDTO> brandList;
+    private List<StorePhotoDTO> photoList;
+    private String delPhotos;
+    private String delBusinessTimes;
+    private List<StoreBusinessTimeDTO> businessTimeList;
+    private String provinceId;
+    private String cityId;
+    private String provinces;
+    private Integer createType;
+    private List<StoreExtendDTO> storeExtendList;
+    private Long indexId;
+    private String c1;
+    private String c2;
+    private String c3;
+    private String c4;
+    private String c5;
+    private String c6;
+    private String c7;
+    private String c8;
+    private String c9;
+    private String c10;
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getConactsPhone() {
+        return conactsPhone;
+    }
+
+    public void setConactsPhone(String conactsPhone) {
+        this.conactsPhone = conactsPhone;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBrandIds() {
+        return brandIds;
+    }
+
+    public void setBrandIds(String brandIds) {
+        this.brandIds = brandIds;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public Integer getOverflowStatus() {
+        return overflowStatus;
+    }
+
+    public void setOverflowStatus(Integer overflowStatus) {
+        this.overflowStatus = overflowStatus;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getErpStatus() {
+        return erpStatus;
+    }
+
+    public void setErpStatus(Integer erpStatus) {
+        this.erpStatus = erpStatus;
+    }
+
+    public Integer getStoreType() {
+        return storeType;
+    }
+
+    public void setStoreType(Integer storeType) {
+        this.storeType = storeType;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public List<StoreBrandDTO> getBrandList() {
+        return brandList;
+    }
+
+    public void setBrandList(List<StoreBrandDTO> brandList) {
+        this.brandList = brandList;
+    }
+
+    public List<StorePhotoDTO> getPhotoList() {
+        return photoList;
+    }
+
+    public void setPhotoList(List<StorePhotoDTO> photoList) {
+        this.photoList = photoList;
+    }
+
+    public String getDelPhotos() {
+        return delPhotos;
+    }
+
+    public void setDelPhotos(String delPhotos) {
+        this.delPhotos = delPhotos;
+    }
+
+    public String getDelBusinessTimes() {
+        return delBusinessTimes;
+    }
+
+    public void setDelBusinessTimes(String delBusinessTimes) {
+        this.delBusinessTimes = delBusinessTimes;
+    }
+
+    public List<StoreBusinessTimeDTO> getBusinessTimeList() {
+        return businessTimeList;
+    }
+
+    public void setBusinessTimeList(List<StoreBusinessTimeDTO> businessTimeList) {
+        this.businessTimeList = businessTimeList;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getProvinces() {
+        return provinces;
+    }
+
+    public void setProvinces(String provinces) {
+        this.provinces = provinces;
+    }
+
+    public Integer getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(Integer createType) {
+        this.createType = createType;
+    }
+
+    public Integer getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(Integer completeStatus) {
+        this.completeStatus = completeStatus;
+    }
+
+    public void setStoreExtendList(List<StoreExtendDTO> storeExtendList) {
+        this.storeExtendList = storeExtendList;
+    }
+
+    public List<StoreExtendDTO> getStoreExtendList() {
+        return storeExtendList;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public List<Integer> getStoreBrandIdList() {
+        return storeBrandIdList;
+    }
+
+    public void setStoreBrandIdList(List<Integer> storeBrandIdList) {
+        this.storeBrandIdList = storeBrandIdList;
+    }
+
+    public String getStoreBrandNames() {
+        return storeBrandNames;
+    }
+
+    public void setStoreBrandNames(String storeBrandNames) {
+        this.storeBrandNames = storeBrandNames;
+    }
+
+    public Long getIndexId() {
+        return indexId;
+    }
+
+    public void setIndexId(Long indexId) {
+        this.indexId = indexId;
+    }
+
+    public Double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Double distance) {
+        this.distance = distance;
+    }
+
+    public String getStoreBrands() {
+        return storeBrands;
+    }
+
+    public void setStoreBrands(String storeBrands) {
+        this.storeBrands = storeBrands;
+        this.storeBrandNames = storeBrands;
+    }
+
+    public String getC1() {
+        return c1;
+    }
+
+    public void setC1(String c1) {
+        this.c1 = c1;
+    }
+
+    public String getC2() {
+        return c2;
+    }
+
+    public void setC2(String c2) {
+        this.c2 = c2;
+    }
+
+    public String getC3() {
+        return c3;
+    }
+
+    public void setC3(String c3) {
+        this.c3 = c3;
+    }
+
+    public String getC4() {
+        return c4;
+    }
+
+    public void setC4(String c4) {
+        this.c4 = c4;
+    }
+
+    public String getC5() {
+        return c5;
+    }
+
+    public void setC5(String c5) {
+        this.c5 = c5;
+    }
+
+    public String getC6() {
+        return c6;
+    }
+
+    public void setC6(String c6) {
+        this.c6 = c6;
+    }
+
+    public String getC7() {
+        return c7;
+    }
+
+    public void setC7(String c7) {
+        this.c7 = c7;
+    }
+
+    public String getC8() {
+        return c8;
+    }
+
+    public void setC8(String c8) {
+        this.c8 = c8;
+    }
+
+    public String getC9() {
+        return c9;
+    }
+
+    public void setC9(String c9) {
+        this.c9 = c9;
+    }
+
+    public String getC10() {
+        return c10;
+    }
+
+    public void setC10(String c10) {
+        this.c10 = c10;
+    }
+
+    public List<Double> getLocation() {
+        return location;
+    }
+
+    public void setLocation(List<Double> location) {
+        this.location = location;
+    }
+
+    public String getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(String countyId) {
+        this.countyId = countyId;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/StoreLogDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-11 15:42
+ */
+public class StoreLogDTO implements Serializable {
+
+    /**
+     *
+     */
+    private Integer storeLogId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private Integer storeId;
+
+    /**
+     *
+     */
+    private String content;
+
+    /**
+     * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步  5:系统配置触发
+     */
+    private Integer reason;
+
+    /**
+     * 日志类型  1:门店新增  2:关联导购  3:信息变更  4:门店分组变更  5:状态变更
+     */
+    private Integer logType;
+
+    /**
+     *
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Integer operatorId;
+
+    /**
+     *
+     */
+    private String operatorName;
+
+    public Integer getStoreLogId() {
+        return storeLogId;
+    }
+
+    public void setStoreLogId(Integer storeLogId) {
+        this.storeLogId = storeLogId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getReason() {
+        return reason;
+    }
+
+    public void setReason(Integer reason) {
+        this.reason = reason;
+    }
+
+    public Integer getLogType() {
+        return logType;
+    }
+
+    public void setLogType(Integer logType) {
+        this.logType = logType;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+}