Skip to content

G
gic-store
Commit 625c911e by zhiwj
Options

代码规范

parent 7de183c1
Showing with 2422 additions and 239 deletions
gic-store-api/src/main/java/com/gic/store/constant/ClerkGenderEnum.java
......@@ -7,7 +7,15 @@ package com.gic.store.constant;
* @date 2019-11-11 11:01
*/
public enum ClerkGenderEnum {
/**
* 男
*/
MALE(1, "男"),
/**
* 女
*/
FEMALE(2, "女")
;
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/ClerkLogReasonEnum.java
......@@ -7,11 +7,29 @@ package com.gic.store.constant;
* @date 2019-11-11 10:28
*/
public enum ClerkLogReasonEnum {
/**
* WEB后台操作
*/
WEB(1, "WEB后台操作"),
/**
* 外部触发
*/
EXTERNAL(2, "外部触发"),
/**
* 订单同步
*/
ORDER(3, "订单同步"),
/**
* 会员同步
*/
MEMBER (4, "会员同步"),
/**
* 批量同步订单
*/
BULKORDER(7, "批量同步订单"),
/**
* 批量同步会员
*/
BULKMEMBER(8, "批量同步会员")
;
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/ClerkLogTypeEnum.java
......@@ -7,8 +7,17 @@ package com.gic.store.constant;
* @date 2019-11-11 10:31
*/
public enum ClerkLogTypeEnum {
/**
* 导购新增
*/
SAVE(1, "导购新增"),
/**
* 信息变更
*/
UPDATE(2, "信息变更"),
/**
* 好办用户绑定
*/
HAOBAN(3, "好办用户绑定")
;
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/Constants.java
......@@ -7,14 +7,14 @@ package com.gic.store.constant;
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 DATE_FORMAT = "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";
......@@ -25,4 +25,66 @@ public interface Constants {
Integer CLERK_POSITION_ID = 2;
String NULL = "null";
String CLERK_CODE_REGEX = "^[\\w\\d]{1,30}$";
String PLUS = "+";
Character PLUS_CHAR = '+';
String ALL = "all";
/**
* 导购角色排序最大的值
*/
Integer CLERK_POSITION_TOP = 3;
/**
* 门店批量更新
*/
Integer UPDATE_STATUS = 1;
Integer UPDATE_PHONE = 2;
Integer UPDATE_BUSINESS_TIME = 3;
Integer UPDATE_PHOTO = 4;
Integer UPDATE_BRAND = 5;
Integer UPLOAD_PHOTO = 6;
Integer UPDATE_GROUP = 7;
String EMPTY_JSON = "{}";
Integer STORE_AUTH = 1;
Integer STORE_NONE_AUTH = 2;
String XLSX = "xlsx";
String XLS = "xls";
Integer CLERK_IMPORT_EXCEL_SIZE = 10;
Integer CLERK_IMPORT_PHONE_LENGTH= 11;
Integer CLERK_IMPORT_NAME_LENGTH = 20;
Integer CLERK_IMPORT_CODE_LENGTH = 20;
Integer CLERK_IMPORT_REGION_LENGTH = 20;
Integer CLERK_IMPORT_STORE_NAME_LENGTH = 20;
Integer CLERK_IMPORT_STORE_CODE_LENGTH = 20;
Integer CLERK_IMPORT_POSITION_NAME_LENGTH = 20;
Integer CLERK_IMPORT_NATION_CODE_LENGTH = 20;
Integer STORE_IMPORT_NAME_LENGTH = 20;
Integer STORE_IMPORT_CODE_LENGTH = 20;
Integer STORE_IMPORT_LONGITUDE_LENGTH = 180;
Integer STORE_IMPORT_LATITUDE_LENGTH = 90;
String STORE_BRAND_SPLIT = "、";
Integer STORE_LOG_MAX = 3;
String HEADQUARTERS = "总部";
String NO_ATTRIBUTION = "无归属";
Integer STORE_EXPORT_SIZE = 10;
Integer STORE_EXPORT_MAX_SIZE = 20;
String STORE_TYPE = "storeType";
Integer STORE_ATTR_SIZE = 5;
Integer STORE_TAG_IMPORT = 2;
}
gic-store-api/src/main/java/com/gic/store/constant/CreateTypeEnum.java
......@@ -5,13 +5,37 @@ package com.gic.store.constant;
* @date 2019/7/1
*/
public enum CreateTypeEnum {
/**
* 后台新增
*/
BACKGROUND_ADD(1, "后台新增"),
/**
* 批量导入
*/
BATCH_IMPORT(2, "批量导入"),
/**
* 增量订单同步
*/
ORDER(3, "增量订单同步"),
/**
* ERP同步
*/
ERP(4, "ERP同步"),
/**
* API接口
*/
API(5, "API接口"),
/**
* 增量会员同步
*/
MEMBER(6, "增量会员同步"),
/**
* 批量订单同步
*/
BULKORDER(7, "批量订单同步"),
/**
* 批量会员同步
*/
BULKMEMBER(8, "批量会员同步")
;
......
gic-store-api/src/main/java/com/gic/store/constant/GenderEnum.java
......@@ -5,7 +5,15 @@ package com.gic.store.constant;
* @date 2019/7/17
*/
public enum GenderEnum {
/**
* 男
*/
MALE(1, "男"),
/**
* 女
*/
FEMALE(2, "女");
private int code;
private String message;
......
gic-store-api/src/main/java/com/gic/store/constant/ImportClerkBatchResultEnum.java
......@@ -8,18 +8,57 @@ package com.gic.store.constant;
* @date 2020/1/15 10:47 AM

*/
public enum ImportClerkBatchResultEnum {
/**
* A1
*/
A1("A1", "门店信息", "标记不导入", "门店域", "门店域为空"),
/**
* A2
*/
A2("A2", "门店信息", "标记不导入", "门店域", "该门店域不存在"),
/**
* A3
*/
A3("A3", "门店信息", "标记不导入", "所属门店", "导购所属门店code为空"),
/**
* A4
*/
A4("A4", "门店信息", "标记不导入", "所属门店", "导购所属门店code在GIC不存在"),
/**
* C1
*/
C1("C1", "导购", "标记不导入", "导购code", "导购code为空"),
/**
* C2
*/
C2("C2", "导购", "标记不导入", "导购code", "导购code重复"),
/**
* C3
*/
C3("C3", "导购", "标记不导入", "导购名称", "导购名称为空"),
/**
* D1
*/
D1("D1", "导购属性", "标记导入", "性别", "导购性别为空"),
/**
* D2
*/
D2("D2", "导购属性", "标记不导入", "性别", "导购性别错误"),
/**
* D3
*/
D3("D3", "导购属性", "标记不导入", "手机号", "导购手机号重复"),
/**
* D4
*/
D4("D4", "导购属性", "标记不导入", "手机号", "导购手机号为空"),
/**
* D5
*/
D5("D5", "导购属性", "标记不导入", "店长", "是否店长字段为空"),
/**
* E1
*/
E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法");
/**
......
gic-store-api/src/main/java/com/gic/store/constant/ImportStoreBatchResultEnum.java
......@@ -8,16 +8,49 @@ package com.gic.store.constant;
* @date 2020/1/15 10:47 AM

*/
public enum ImportStoreBatchResultEnum {
/**
* A1
*/
A1("A1", "门店信息", "标记不导入", "门店域", "门店域为空"),
/**
* A2
*/
A2("A2", "门店信息", "标记不导入", "门店域", "该门店域不存在"),
/**
* A3
*/
A3("A3", "门店信息", "标记不导入", "门店code", "门店code重复"),
/**
* A4
*/
A4("A4", "门店信息", "标记不导入", "门店code", "门店code为空"),
/**
* A5
*/
A5("A5", "门店信息", "标记不导入", "门店名称", "门店名称为空"),
/**
* B1
*/
B1("B1", "门店属性", "标记不导入", "店招品牌", "店招品牌不存在"),
/**
* B2
*/
B2("B2", "门店属性", "标记不导入", "门店类型", "门店类型不存在"),
/**
* B3
*/
B3("B3", "门店属性", "标记导入", "省市区", "省市区为空"),
/**
* B4
*/
B4("B4", "门店属性", "标记不导入", "省市区", "省市区不存在"),
/**
* B5
*/
B5("B5", "门店属性", "标记不导入", "自定义属性", "必填属性XXX未填"),
/**
* E1
*/
E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法"),
;
/**
......
gic-store-api/src/main/java/com/gic/store/constant/StoreCompleteEnum.java
package com.gic.store.constant;
/**
*
* @ClassName: StoreCompleteEnum
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public enum StoreCompleteEnum {
/**
* 已完善
*/
COMPLETE(1, "已完善"),
/**
* 未完善
*/
UNCOMPLETE(0, "未完善");
private int code;
private String message;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreESFieldsEnum.java
package com.gic.store.constant;
/**
*
* @ClassName: StoreESFieldsEnum
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public enum StoreESFieldsEnum {
/**
* 门店ID
*/
STOREID("storeId", "门店ID"),
/**
* 门店资料
*/
STOREINFOID("storeInfoId", "门店资料"),
/**
* 门店名称
*/
STORENAME("storeName", "门店名称"),
/**
* 门店代码
*/
STORECODE("storeCode", "门店代码"),
/**
* 企业id
*/
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", "文档id"),
/**
* 自定义字段
*/
CUSTOM("custom", "自定义字段"),
/**
* 选项字段
*/
SELECT("select", "选项字段"),
/**
* 门店标签
*/
STORETAG("storeTag", "门店标签"),
/**
* 门店是否共享
*/
OWNTYPE("ownType", "门店是否共享"),
/**
* 门店图片
*/
PHOTOLIST("photoList", "门店图片"),
/**
* 门店营业时间
*/
BUSSINESSTIME("businessTimeList", "门店营业时间"),
/**
* 门店详细地址
*/
ADDRESS("address", "门店详细地址"),
/**
* 经纬度
*/
LOCATION("location", "经纬度"),
/**
* 分数
*/
SCORE("score", "分数"),
/**
* 评价分数
*/
EVALUATECOUNT("evaluateCount", "评价分数"),
/**
* 联系电话
*/
CONACTSPHONE("conactsPhone", "联系电话"),
/**
* 更新时间
*/
UPDATETIME("updateTime", "更新时间"),
/**
* 自定义字段1
*/
C1("c1", "自定义字段1"),
/**
* 自定义字段2
*/
C2("c2", "自定义字段2"),
/**
* 自定义字段3
*/
C3("c3", "自定义字段3"),
/**
* 自定义字段4
*/
C4("c4", "自定义字段4"),
/**
* 自定义字段5
*/
C5("c5", "自定义字段5"),
/**
* 自定义字段6
*/
C6("c6", "自定义字段6"),
/**
* 自定义字段7
*/
C7("c7", "自定义字段7"),
/**
* 自定义字段8
*/
C8("c8", "自定义字段8"),
/**
* 自定义字段9
*/
C9("c9", "自定义字段9"),
/**
* 自定义字段10
*/
C10("c10", "自定义字段10");
private String field;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreEnableOrDisAbleEnum.java
......@@ -5,7 +5,13 @@ package com.gic.store.constant;
* @date 2019/7/8
*/
public enum StoreEnableOrDisAbleEnum {
/**
* 启用
*/
ENABLE(1, "启用"),
/**
* 不启用
*/
DISABLE(2, "不启用"),
;
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreFieldDateEnum.java
......@@ -7,10 +7,25 @@ package com.gic.store.constant;
* @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;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreFieldTextEnum.java
......@@ -5,9 +5,21 @@ package com.gic.store.constant;
* @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;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreFieldTypeEnum.java
......@@ -7,10 +7,25 @@ package com.gic.store.constant;
* @date 2019/6/28 11:10 AM
*/
public enum StoreFieldTypeEnum {
/**
* 文本
*/
TEXT(1, "文本"),
/**
* 单选
*/
RADIO(2, "单选"),
/**
* 多选
*/
CHECK(3, "多选"),
/**
* 实数
*/
REAL_NUMBER(4, "实数"),
/**
* 时间
*/
DATE(5, "时间");
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreGroupErrorEnum.java
......@@ -7,14 +7,41 @@ package com.gic.store.constant;
* @date 2019/6/26 1:46 PM
*/
public enum StoreGroupErrorEnum {
/**
* 门店分组服务异常
*/
ERROR("9999", "门店分组服务异常"),
/**
* 该分组下存在门店
*/
DELETE_ERROR("1000", "该分组下存在门店，不能删除"),
/**
* 分组层级参数数据错误
*/
GROUP_LEVEL_ERROR("2000", "分组层级参数数据错误"),
/**
* 所有门店已存在
*/
ALL_STORE_GROUP_ERROR("3000", "所有门店已存在"),
/**
* 父级ID参数错误
*/
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;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreImportEnum.java
......@@ -6,7 +6,13 @@ package com.gic.store.constant;
*/
public enum StoreImportEnum {
/**
* 等待
*/
WAIT("wait", "等待"),
/**
* 成功
*/
SUCCESS("success", "成功"),
;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreLogReasonEnum.java
......@@ -7,13 +7,37 @@ package com.gic.store.constant;
* @date 2019-11-11 10:28
*/
public enum StoreLogReasonEnum {
/**
* WEB后台操作
*/
WEB(1, "WEB后台操作"),
/**
* 外部触发
*/
EXTERNAL(2, "外部触发"),
/**
* 订单同步
*/
ORDER(3, "订单同步"),
/**
* 会员同步
*/
MEMBER(4, "会员同步"),
/**
* 系统配置触发
*/
SYSTEM(5, "系统配置触发"),
/**
* ETL同步
*/
ETL(6, "ETL同步"),
/**
* 批量同步订单
*/
BULKORDER(7, "批量同步订单"),
/**
* 批量同步会员
*/
BULKMEMBER(8, "批量同步会员")
;
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreLogTypeEnum.java
......@@ -7,10 +7,25 @@ package com.gic.store.constant;
* @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;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreOwnTypeEnum.java
......@@ -7,7 +7,13 @@ package com.gic.store.constant;
* @date 2019/9/23 9:39 AM

*/
public enum StoreOwnTypeEnum {
/**
* owner
*/
OWNER(0, "owner"),
/**
* other
*/
OTHER(1, "other");
private int code;
......
gic-store-api/src/main/java/com/gic/store/constant/StoreStatusEnum.java
package com.gic.store.constant;
/**
*
* @ClassName: StoreStatusEnum
* @Description:
* @author zhiwj
* @date 2020-09-09 16:07
*/
public enum StoreStatusEnum {
/**
* 启用
*/
ONLINE(1, "启用"),
/**
* 不启用
*/
INONLINE(2, "不启用");
private int code;
private String message;
......
gic-store-api/src/main/java/com/gic/store/constant/StrategyStoreFieldEnum.java
......@@ -7,9 +7,21 @@ package com.gic.store.constant;
* @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;
......
gic-store-api/src/main/java/com/gic/store/constant/WeekdayEnum.java
......@@ -5,12 +5,33 @@ package com.gic.store.constant;
* @date 2019/7/2
*/
public enum WeekdayEnum {
/**
* 周一
*/
MONDAY(1, "周一"),
/**
* 周二
*/
TUESDAY(2, "周二"),
/**
* 周三
*/
WEDNESDAY(3, "周三"),
/**
* 周四
*/
THURSDAY(4, "周四"),
/**
* 周五
*/
FRIDAY(5, "周五"),
/**
* 周六
*/
SATURDAY(6, "周六"),
/**
* 周日
*/
SUNDAY(7, "周日");
private int code;
......
gic-store-api/src/main/java/com/gic/store/dto/CityDTO.java
......@@ -6,6 +6,13 @@ import java.util.Date;
/**
* tab_city
*/
/**
*
* @ClassName: CityDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:03
*/
public class CityDTO implements Serializable {
/**
* 城市id
......@@ -84,4 +91,16 @@ public class CityDTO implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "CityDTO{" +
"cityId='" + cityId + '\'' +
", cityName='" + cityName + '\'' +
", provinceId='" + provinceId + '\'' +
", cityPy='" + cityPy + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/ClerkDTO.java
......@@ -240,4 +240,30 @@ public class ClerkDTO implements Serializable {
public String getClerkTypeName() {
return clerkTypeName;
}
@Override
public String toString() {
return "ClerkDTO{" +
"clerkId=" + clerkId +
", clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", enterpriseId=" + enterpriseId +
", storeInfoId=" + storeInfoId +
", positionId=" + positionId +
", positionName='" + positionName + '\'' +
", clerkGender=" + clerkGender +
", nationcode='" + nationcode + '\'' +
", phoneNumber='" + phoneNumber + '\'' +
", haobanStatus=" + haobanStatus +
", status=" + status +
", headImg='" + headImg + '\'' +
", reason=" + reason +
", remark='" + remark + '\'' +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
", storeName='" + storeName + '\'' +
", haobanStatusName='" + haobanStatusName + '\'' +
", clerkTypeName='" + clerkTypeName + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ClerkLogDTO.java
......@@ -185,4 +185,24 @@ public class ClerkLogDTO implements Serializable {
public String getEndTime() {
return endTime;
}
@Override
public String toString() {
return "ClerkLogDTO{" +
"clerkLogId=" + clerkLogId +
", enterpriseId=" + enterpriseId +
", clerkId=" + clerkId +
", content='" + content + '\'' +
", reason=" + reason +
", logType=" + logType +
", remark='" + remark + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
", startTime='" + startTime + '\'' +
", endTime='" + endTime + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ClerkPositionDTO.java
......@@ -50,7 +50,7 @@ public class ClerkPositionDTO implements Serializable {
*
*/
private Integer status;
private int seq;
private Integer seq;
private Integer relNum;
......@@ -118,11 +118,11 @@ public class ClerkPositionDTO implements Serializable {
this.status = status;
}
public void setSeq(int seq) {
public void setSeq(Integer seq) {
this.seq = seq;
}
public int getSeq() {
public Integer getSeq() {
return seq;
}
......@@ -133,4 +133,20 @@ public class ClerkPositionDTO implements Serializable {
public Integer getRelNum() {
return relNum;
}
@Override
public String toString() {
return "ClerkPositionDTO{" +
"clerkPositionId=" + clerkPositionId +
", enterpriseId=" + enterpriseId +
", positionName='" + positionName + '\'' +
", positionCode='" + positionCode + '\'' +
", sort=" + sort +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", seq=" + seq +
", relNum=" + relNum +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ClerkSearchDTO.java
......@@ -26,7 +26,7 @@ public class ClerkSearchDTO implements Serializable {
private Integer excelExtension;
private List<String> fieldCodeList;
private Integer dataType;
private int status;
private Integer status;
public String getSearch() {
......@@ -141,11 +141,32 @@ public class ClerkSearchDTO implements Serializable {
this.storeSearch = storeSearch;
}
public void setStatus(int status) {
public void setStatus(Integer status) {
this.status = status;
}
public int getStatus() {
public Integer getStatus() {
return status;
}
@Override
public String toString() {
return "ClerkSearchDTO{" +
"search='" + search + '\'' +
", storeGroupId=" + storeGroupId +
", searchJson='" + searchJson + '\'' +
", enterpriseId=" + enterpriseId +
", storeIds='" + storeIds + '\'' +
", storeInfoIds='" + storeInfoIds + '\'' +
", currentPage=" + currentPage +
", pageSize=" + pageSize +
", clerkType=" + clerkType +
", storeSearch='" + storeSearch + '\'' +
", fileName='" + fileName + '\'' +
", excelExtension=" + excelExtension +
", fieldCodeList=" + fieldCodeList +
", dataType=" + dataType +
", status=" + status +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ClerkStoreListDTO.java
......@@ -73,4 +73,16 @@ public class ClerkStoreListDTO implements Serializable {
public Integer getOwnType() {
return ownType;
}
@Override
public String toString() {
return "ClerkStoreListDTO{" +
"storeId=" + storeId +
", storeInfoId=" + storeInfoId +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", clerkList=" + clerkList +
", ownType=" + ownType +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ClerkTmpDTO.java
......@@ -87,7 +87,7 @@ public class ClerkTmpDTO implements Serializable {
*/
private String operatorName;
private String clerkType;
private boolean replace;
private Boolean replace;
public Integer getClerkTmpId() {
return clerkTmpId;
......@@ -233,11 +233,36 @@ public class ClerkTmpDTO implements Serializable {
this.regionName = regionName;
}
public void setReplace(boolean replace) {
public void setReplace(Boolean replace) {
this.replace = replace;
}
public boolean getReplace() {
public Boolean getReplace() {
return replace;
}
@Override
public String toString() {
return "ClerkTmpDTO{" +
"clerkTmpId=" + clerkTmpId +
", enterpriseId=" + enterpriseId +
", regionId='" + regionId + '\'' +
", regionName='" + regionName + '\'' +
", clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", positionName='" + positionName + '\'' +
", clerkGender='" + clerkGender + '\'' +
", nationcode='" + nationcode + '\'' +
", phoneNumber='" + phoneNumber + '\'' +
", errorMessage='" + errorMessage + '\'' +
", signKey='" + signKey + '\'' +
", updateTime=" + updateTime +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
", clerkType='" + clerkType + '\'' +
", replace=" + replace +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/CountyDTO.java
......@@ -6,6 +6,13 @@ import java.util.Date;
/**
* tab_county
*/
/**
*
* @ClassName: CountyDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class CountyDTO implements Serializable {
/**
*
......@@ -110,4 +117,18 @@ public class CountyDTO implements Serializable {
public void setCountyPy(String countyPy) {
this.countyPy = countyPy;
}
@Override
public String toString() {
return "CountyDTO{" +
"countyId='" + countyId + '\'' +
", countyName='" + countyName + '\'' +
", cityId='" + cityId + '\'' +
", provinceId='" + provinceId + '\'' +
", fullName='" + fullName + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", countyPy='" + countyPy + '\'' +
'}';
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/GicDictDTO.java
......@@ -116,4 +116,18 @@ public class GicDictDTO implements Serializable {
public void setDictSort(Integer dictSort) {
this.dictSort = dictSort;
}
@Override
public String toString() {
return "GicDictDTO{" +
"dictId='" + dictId + '\'' +
", dictType='" + dictType + '\'' +
", dictCode='" + dictCode + '\'' +
", dictValue='" + dictValue + '\'' +
", dictName='" + dictName + '\'' +
", dictStatus=" + dictStatus +
", createDate=" + createDate +
", dictSort=" + dictSort +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ProcessBatchStoreDTO.java
......@@ -221,4 +221,26 @@ public class ProcessBatchStoreDTO implements Serializable {
public void setBrandId(Integer brandId) {
this.brandId = brandId;
}
@Override
public String toString() {
return "ProcessBatchStoreDTO{" +
"enterpriseId=" + enterpriseId +
", regionId=" + regionId +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", conactsPhone='" + conactsPhone + '\'' +
", brandId=" + brandId +
", brandName='" + brandName + '\'' +
", province='" + province + '\'' +
", city='" + city + '\'' +
", county='" + county + '\'' +
", address='" + address + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", customField='" + customField + '\'' +
", storeType='" + storeType + '\'' +
", storeGroupName='" + storeGroupName + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/ProvinceDTO.java
......@@ -6,6 +6,13 @@ import java.util.Date;
/**
* tab_province
*/
/**
*
* @ClassName: ProvinceDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class ProvinceDTO implements Serializable {
/**
* 省份id
......@@ -71,4 +78,15 @@ public class ProvinceDTO implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "ProvinceDTO{" +
"provinceId='" + provinceId + '\'' +
", provinceName='" + provinceName + '\'' +
", provincePy='" + provincePy + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java
......@@ -155,4 +155,22 @@ public class StoreBrandDTO implements Serializable {
public void setHasRel(Integer hasRel) {
this.hasRel = hasRel;
}
@Override
public String toString() {
return "StoreBrandDTO{" +
"storeBrandId=" + storeBrandId +
", storeBrandCode='" + storeBrandCode + '\'' +
", storeBrandName='" + storeBrandName + '\'' +
", storeBrandCategoryCode='" + storeBrandCategoryCode + '\'' +
", storeBrandCategory='" + storeBrandCategory + '\'' +
", sort=" + sort +
", enterpriseId=" + enterpriseId +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
", seq=" + seq +
", hasRel=" + hasRel +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreBulkOrderDTO.java
......@@ -2,8 +2,14 @@ package com.gic.store.dto;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
/**
*
* @ClassName: StoreBulkOrderDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class StoreBulkOrderDTO implements Serializable {
private List<StoreOrderDTO> store;
private List<StoreOrderDTO> clerk;
......@@ -58,4 +64,15 @@ public class StoreBulkOrderDTO implements Serializable {
public void setStatus(Integer status) {
this.status = status;
}
@Override
public String toString() {
return "StoreBulkOrderDTO{" +
"store=" + store +
", clerk=" + clerk +
", batchId=" + batchId +
", status=" + status +
", type=" + type +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreBusinessTimeDTO.java
......@@ -91,10 +91,12 @@ public class StoreBusinessTimeDTO implements Serializable {
@Override
public boolean equals(Object o) {
if (this == o)
if (this == o) {
return true;
if (o == null || getClass() != o.getClass())
}
if (o == null || getClass() != o.getClass()) {
return false;
}
StoreBusinessTimeDTO that = (StoreBusinessTimeDTO) o;
return Objects.equals(weekday, that.weekday) &&
Objects.equals(openTime, that.openTime) &&
......@@ -105,4 +107,16 @@ public class StoreBusinessTimeDTO implements Serializable {
public int hashCode() {
return Objects.hash(weekday, openTime, closeTime);
}
@Override
public String toString() {
return "StoreBusinessTimeDTO{" +
"storeBusinessTimeId=" + storeBusinessTimeId +
", weekday='" + weekday + '\'' +
", openTime=" + openTime +
", closeTime=" + closeTime +
", storeInfoId=" + storeInfoId +
", weekdayShow='" + weekdayShow + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreColumnSet.java
......@@ -4,10 +4,17 @@ import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
/**
*
* @ClassName: StoreColumnSet
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class StoreColumnSet implements Serializable {
private Set<Integer> storeType = new HashSet<>();
private Set<Integer> status = new HashSet<>();
private Set<Integer> ErpStatus = new HashSet<>();
private Set<Integer> erpStatus = new HashSet<>();
private Set<Integer> storeGroupId = new HashSet<>();
private Set<Integer> region = new HashSet<>();
......@@ -28,11 +35,11 @@ public class StoreColumnSet implements Serializable {
}
public Set<Integer> getErpStatus() {
return ErpStatus;
return erpStatus;
}
public void setErpStatus(Set<Integer> erpStatus) {
ErpStatus = erpStatus;
this.erpStatus = erpStatus;
}
public Set<Integer> getStoreGroupId() {
......
gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java
......@@ -6,6 +6,14 @@ import java.util.List;
/**
* tab_store
*/
/**
*
* @ClassName: StoreDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class StoreDTO extends StoreInfoDTO implements Serializable {
/**
*
......@@ -57,8 +65,10 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
private String statusName;
private String erpStatusName;
private String storeTypeName;
// 有没有在转移中的会员 1有 0没有
private int hasTransMember=0;
/**
* 有没有在转移中的会员 1有 0没有
*/
private Integer hasTransMember=0;
public Integer getStoreId() {
return storeId;
......@@ -83,11 +93,11 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
public void setOwnType(Integer ownType) {
this.ownType = ownType;
}
@Override
public Integer getStatus() {
return status;
}
@Override
public void setStatus(Integer status) {
this.status = status;
}
......@@ -236,11 +246,40 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
return storeTypeName;
}
public void setHasTransMember(int hasTransMember) {
public void setHasTransMember(Integer hasTransMember) {
this.hasTransMember = hasTransMember;
}
public int getHasTransMember() {
public Integer getHasTransMember() {
return hasTransMember;
}
@Override
public String toString() {
return "StoreDTO{" +
"storeId=" + storeId +
", enterpriseId=" + enterpriseId +
", ownType=" + ownType +
", status=" + status +
", storeGroupId=" + storeGroupId +
", storeGroupIdList=" + storeGroupIdList +
", storeGroupName='" + storeGroupName + '\'' +
", isEditStoreGroup=" + isEditStoreGroup +
", fromEnterpriseId=" + fromEnterpriseId +
", fromEnterpriseName='" + fromEnterpriseName + '\'' +
", score=" + score +
", evaluateCount=" + evaluateCount +
", reason=" + reason +
", remark='" + remark + '\'' +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
", license=" + license +
", defaultPhoto=" + defaultPhoto +
", completeStatusName='" + completeStatusName + '\'' +
", statusName='" + statusName + '\'' +
", erpStatusName='" + erpStatusName + '\'' +
", storeTypeName='" + storeTypeName + '\'' +
", hasTransMember=" + hasTransMember +
'}';
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/StoreDictDTO.java
......@@ -7,6 +7,13 @@ import java.util.List;
/**
* tab_store_dict
*/
/**
*
* @ClassName: StoreDictDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class StoreDictDTO implements Serializable {
/**
*
......@@ -126,4 +133,20 @@ public class StoreDictDTO implements Serializable {
public List<StoreDictDTO> getStoreDictList() {
return storeDictList;
}
@Override
public String toString() {
return "StoreDictDTO{" +
"storeDictId=" + storeDictId +
", enterpriseId=" + enterpriseId +
", type='" + type + '\'' +
", value='" + value + '\'' +
", key='" + key + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", checked=" + checked +
", ownType=" + ownType +
", storeDictList=" + 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.Date;
import java.util.List;
/**
*
* @ClassName: StoreEsDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class StoreEsDTO implements Serializable {
private Integer storeId;
private Integer storeInfoId;
......@@ -293,4 +298,42 @@ public class StoreEsDTO implements Serializable {
public void setUpdateTime(Long updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "StoreEsDTO{" +
"storeId=" + storeId +
", storeInfoId=" + storeInfoId +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", enterpriseId=" + enterpriseId +
", 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 + '\'' +
", ownType=" + ownType +
", photoList=" + photoList +
", businessTimeList=" + businessTimeList +
", location='" + location + '\'' +
", address='" + address + '\'' +
", score=" + score +
", evaluateCount=" + evaluateCount +
", conactsPhone='" + conactsPhone + '\'' +
", updateTime=" + updateTime +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreExtendDTO.java
......@@ -155,10 +155,12 @@ public class StoreExtendDTO implements Serializable {
@Override
public boolean equals(Object o) {
if (this == o)
if (this == o) {
return true;
if (o == null || getClass() != o.getClass())
}
if (o == null || getClass() != o.getClass()) {
return false;
}
StoreExtendDTO that = (StoreExtendDTO) o;
return Objects.equals(storeFieldId, that.storeFieldId) &&
Objects.equals(value, that.value) &&
......@@ -170,4 +172,21 @@ public class StoreExtendDTO implements Serializable {
public int hashCode() {
return Objects.hash(storeFieldId, value, storeFieldName, storeFieldCode);
}
@Override
public String toString() {
return "StoreExtendDTO{" +
"storeExtendId=" + storeExtendId +
", storeInfoId=" + storeInfoId +
", enterpriseId=" + enterpriseId +
", storeFieldId=" + storeFieldId +
", value='" + value + '\'' +
", sort=" + sort +
", storeFieldName='" + storeFieldName + '\'' +
", storeFieldCode='" + storeFieldCode + '\'' +
", storeFieldType=" + storeFieldType +
", storeFieldDetail='" + storeFieldDetail + '\'' +
", erpRelCode='" + erpRelCode + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldDTO.java
......@@ -208,4 +208,24 @@ public class StoreFieldDTO implements Serializable {
public void setOwnType(Integer ownType) {
this.ownType = ownType;
}
@Override
public String toString() {
return "StoreFieldDTO{" +
"storeFieldId=" + storeFieldId +
", storeFieldName='" + storeFieldName + '\'' +
", storeFieldCode='" + storeFieldCode + '\'' +
", storeFieldType=" + storeFieldType +
", enterpriseId=" + enterpriseId +
", storeRegionId='" + storeRegionId + '\'' +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
", storeFieldDetail='" + storeFieldDetail + '\'' +
", erpRelCode='" + erpRelCode + '\'' +
", sort=" + sort +
", seq=" + seq +
", ownType=" + ownType +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionMapDTO.java
......@@ -30,4 +30,12 @@ public class StoreFieldRegionMapDTO implements Serializable{
public void setRegionIds(String regionIds) {
this.regionIds = regionIds;
}
@Override
public String toString() {
return "StoreFieldRegionMapDTO{" +
"storeFieldId=" + storeFieldId +
", regionIds='" + regionIds + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionRelDTO.java
......@@ -90,4 +90,16 @@ public class StoreFieldRegionRelDTO implements Serializable{
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "StoreFieldRegionRelDTO{" +
"fieldRegionId=" + fieldRegionId +
", regionId=" + regionId +
", storeFieldId=" + storeFieldId +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRelDTO.java
......@@ -102,4 +102,17 @@ public class StoreFieldRelDTO implements Serializable{
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "StoreFieldRelDTO{" +
"fieldRelationId=" + fieldRelationId +
", enterpriseId=" + enterpriseId +
", storeFieldId=" + storeFieldId +
", ownType=" + ownType +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreFieldSelectDTO.java
......@@ -128,4 +128,18 @@ public class StoreFieldSelectDTO implements Serializable {
public void setSeq(Integer seq) {
this.seq = seq;
}
@Override
public String toString() {
return "StoreFieldSelectDTO{" +
"storeFieldSelectId=" + storeFieldSelectId +
", storeFieldSelectName='" + storeFieldSelectName + '\'' +
", storeFieldSelectCode='" + storeFieldSelectCode + '\'' +
", sort=" + sort +
", createTime=" + createTime +
", updateTime=" + updateTime +
", storeFieldId=" + storeFieldId +
", seq=" + seq +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreGroupDTO.java
......@@ -154,4 +154,21 @@ public class StoreGroupDTO implements Serializable{
public void setIsDefault(Integer isDefault) {
this.isDefault = isDefault;
}
@Override
public String toString() {
return "StoreGroupDTO{" +
"storeGroupId=" + storeGroupId +
", storeGroupName='" + storeGroupName + '\'' +
", parentStoreGroupId=" + parentStoreGroupId +
", enterpriseId=" + enterpriseId +
", groupLevel=" + groupLevel +
", storeGroupChain='" + storeGroupChain + '\'' +
", sort=" + sort +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
", isDefault=" + isDefault +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreInfoDTO.java
......@@ -58,8 +58,6 @@ public class StoreInfoDTO implements Serializable {
*/
private String areaId;
// private String countyId;
/**
* 经度
*/
......@@ -482,4 +480,58 @@ public class StoreInfoDTO implements Serializable {
public void setCountyId(String countyId) {
this.areaId = countyId == null ? null : areaId;
}
public StoreInfoDTO() {
super();
}
@Override
public String toString() {
return "StoreInfoDTO{" +
"storeInfoId=" + storeInfoId +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", regionId=" + regionId +
", regionName='" + regionName + '\'' +
", conactsPhone='" + conactsPhone + '\'' +
", address='" + address + '\'' +
", brandIds='" + brandIds + '\'' +
", storeBrandIdList=" + storeBrandIdList +
", storeBrandNames='" + storeBrandNames + '\'' +
", storeBrands='" + storeBrands + '\'' +
", areaId='" + areaId + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", location=" + location +
", distance=" + distance +
", overflowStatus=" + overflowStatus +
", status=" + status +
", completeStatus=" + completeStatus +
", erpStatus=" + erpStatus +
", storeType=" + storeType +
", createTime=" + createTime +
", updateTime=" + updateTime +
", brandList=" + brandList +
", photoList=" + photoList +
", delPhotos='" + delPhotos + '\'' +
", delBusinessTimes='" + delBusinessTimes + '\'' +
", businessTimeList=" + businessTimeList +
", provinceId='" + provinceId + '\'' +
", cityId='" + cityId + '\'' +
", provinces='" + provinces + '\'' +
", createType=" + createType +
", storeExtendList=" + storeExtendList +
", indexId=" + indexId +
", c1='" + c1 + '\'' +
", c2='" + c2 + '\'' +
", c3='" + c3 + '\'' +
", c4='" + c4 + '\'' +
", c5='" + c5 + '\'' +
", c6='" + c6 + '\'' +
", c7='" + c7 + '\'' +
", c8='" + c8 + '\'' +
", c9='" + c9 + '\'' +
", c10='" + c10 + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreLogDTO.java
......@@ -184,4 +184,24 @@ public class StoreLogDTO implements Serializable {
public String getEndTime() {
return endTime;
}
@Override
public String toString() {
return "StoreLogDTO{" +
"storeLogId=" + storeLogId +
", enterpriseId=" + enterpriseId +
", storeId=" + storeId +
", content='" + content + '\'' +
", reason=" + reason +
", logType=" + logType +
", remark='" + remark + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
", startTime='" + startTime + '\'' +
", endTime='" + endTime + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreOrderDTO.java
......@@ -3,6 +3,13 @@ package com.gic.store.dto;
import java.io.Serializable;
import java.util.List;
/**
*
* @ClassName: StoreOrderDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class StoreOrderDTO implements Serializable {
private Integer regionId;
private Integer enterpriseId;
......@@ -80,4 +87,18 @@ public class StoreOrderDTO implements Serializable {
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
@Override
public String toString() {
return "StoreOrderDTO{" +
"regionId=" + regionId +
", enterpriseId=" + enterpriseId +
", storeCode='" + storeCode + '\'' +
", storeName='" + storeName + '\'' +
", clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", remark='" + remark + '\'' +
", reason=" + reason +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StorePhotoDTO.java
......@@ -89,10 +89,12 @@ public class StorePhotoDTO implements Serializable {
@Override
public boolean equals(Object o) {
if (this == o)
if (this == o) {
return true;
if (o == null || getClass() != o.getClass())
}
if (o == null || getClass() != o.getClass()) {
return false;
}
StorePhotoDTO that = (StorePhotoDTO) o;
return Objects.equals(storeId, that.storeId) &&
Objects.equals(enterpriseId, that.enterpriseId) &&
......@@ -104,4 +106,16 @@ public class StorePhotoDTO implements Serializable {
public int hashCode() {
return Objects.hash(storeId, enterpriseId, imageCode, imageUrl);
}
@Override
public String toString() {
return "StorePhotoDTO{" +
"storePhotoId=" + storePhotoId +
", storeId=" + storeId +
", enterpriseId=" + enterpriseId +
", imageCode='" + imageCode + '\'' +
", imageUrl='" + imageUrl + '\'' +
", sort=" + sort +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreRegionDTO.java
......@@ -129,4 +129,20 @@ public class StoreRegionDTO implements Serializable {
public String getShareEnterpriseName() {
return shareEnterpriseName;
}
@Override
public String toString() {
return "StoreRegionDTO{" +
"regionId=" + regionId +
", regionCode='" + regionCode + '\'' +
", regionName='" + regionName + '\'' +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
", enterpriseId=" + enterpriseId +
", fromEnterpriseId=" + fromEnterpriseId +
", ownType=" + ownType +
", shareEnterpriseName='" + shareEnterpriseName + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
......@@ -3,6 +3,13 @@ package com.gic.store.dto;
import java.io.Serializable;
import java.util.List;
/**
*
* @ClassName: StoreSearchDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:07
*/
public class StoreSearchDTO implements Serializable {
private Integer storeGroupId;
private Integer regionId;
......@@ -286,4 +293,41 @@ public class StoreSearchDTO implements Serializable {
public void setStoreTags(String storeTags) {
this.storeTags = storeTags;
}
@Override
public String toString() {
return "StoreSearchDTO{" +
"storeGroupId=" + storeGroupId +
", regionId=" + regionId +
", storeCode='" + storeCode + '\'' +
", search='" + search + '\'' +
", createType=" + createType +
", status=" + status +
", provinceId='" + provinceId + '\'' +
", cityId='" + cityId + '\'' +
", countyId='" + countyId + '\'' +
", enterpriseId=" + enterpriseId +
", storeIds='" + storeIds + '\'' +
", storeInfoIds='" + storeInfoIds + '\'' +
", storeIdsOfNot='" + storeIdsOfNot + '\'' +
", storeBrandId=" + storeBrandId +
", searchJson='" + searchJson + '\'' +
", authSearchJson='" + authSearchJson + '\'' +
", latitude='" + latitude + '\'' +
", longitude='" + longitude + '\'' +
", storeResource=" + storeResource +
", currentPage=" + currentPage +
", pageSize=" + pageSize +
", storeTagId=" + storeTagId +
", completeStatus=" + completeStatus +
", storeResourceList=" + storeResourceList +
", erpStatus=" + erpStatus +
", storeGroupIds='" + storeGroupIds + '\'' +
", regionIds='" + regionIds + '\'' +
", storeTypes='" + storeTypes + '\'' +
", storeStatuss='" + storeStatuss + '\'' +
", erpStatuss='" + erpStatuss + '\'' +
", storeTags='" + storeTags + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDBDTO.java → gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDbDTO.java
......@@ -3,7 +3,14 @@ package com.gic.store.dto;
import java.io.Serializable;
import java.util.List;
public class StoreSearchDBDTO implements Serializable {
/**
*
* @ClassName: StoreSearchDbDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:07
*/
public class StoreSearchDbDTO implements Serializable {
private String search;
private String storeCode;
private String storeName;
......@@ -220,4 +227,34 @@ public class StoreSearchDBDTO implements Serializable {
public void setCityId(String cityId) {
this.cityId = cityId;
}
@Override
public String toString() {
return "StoreSearchDbDTO{" +
"search='" + search + '\'' +
", storeCode='" + storeCode + '\'' +
", storeName='" + storeName + '\'' +
", createType=" + createType +
", storeGroupId=" + storeGroupId +
", status=" + status +
", erpStatus=" + erpStatus +
", regionId=" + regionId +
", storeInfoId=" + storeInfoId +
", storeId=" + storeId +
", overflowStatus=" + overflowStatus +
", enterpriseId=" + enterpriseId +
", storeBrandId=" + storeBrandId +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", cityId='" + cityId + '\'' +
", storeGroupIdList=" + storeGroupIdList +
", regionIdList=" + regionIdList +
", storeIdList=" + storeIdList +
", storeInfoIdList=" + storeInfoIdList +
", statusList=" + statusList +
", erpStatusList=" + erpStatusList +
", currentPage=" + currentPage +
", pageSize=" + pageSize +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreStatusSettingDTO.java
......@@ -6,6 +6,13 @@ import java.util.Date;
/**
* tab_store_status_setting
*/
/**
*
* @ClassName: StoreStatusSettingDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:08
*/
public class StoreStatusSettingDTO implements Serializable {
/**
*
......@@ -81,4 +88,16 @@ public class StoreStatusSettingDTO implements Serializable {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return "StoreStatusSettingDTO{" +
"storeStatusId=" + storeStatusId +
", regionId=" + regionId +
", days=" + days +
", value=" + value +
", enterpriseId=" + enterpriseId +
", createTime=" + createTime +
'}';
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/StoreStrategyDTO.java
......@@ -206,4 +206,23 @@ public class StoreStrategyDTO implements Serializable {
public void setStoreCreateType(String storeCreateType) {
this.storeCreateType = storeCreateType;
}
@Override
public String toString() {
return "StoreStrategyDTO{" +
"strategyId=" + strategyId +
", strategyName='" + strategyName + '\'' +
", enterpriseId=" + enterpriseId +
", storeRegionId=" + storeRegionId +
", conditions='" + conditions + '\'' +
", targetValue='" + targetValue + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", strategyType=" + strategyType +
", sort=" + sort +
", storeCreateType='" + storeCreateType + '\'' +
", seq=" + seq +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreTagDTO.java
......@@ -103,4 +103,17 @@ public class StoreTagDTO implements Serializable{
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "StoreTagDTO{" +
"storeTagId=" + storeTagId +
", storeWidgetId=" + storeWidgetId +
", enterpriseId=" + enterpriseId +
", storeTagName='" + storeTagName + '\'' +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreTagTmpDTO.java
......@@ -119,4 +119,19 @@ public class StoreTagTmpDTO implements Serializable {
public void setRegionName(String regionName) {
this.regionName = regionName;
}
@Override
public String toString() {
return "StoreTagTmpDTO{" +
"storeTagTmpId=" + storeTagTmpId +
", enterpriseId=" + enterpriseId +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", regionName='" + regionName + '\'' +
", errorMessage='" + errorMessage + '\'' +
", signKey='" + signKey + '\'' +
", updateTime=" + updateTime +
", storeId=" + storeId +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreTmpDTO.java
......@@ -132,7 +132,7 @@ public class StoreTmpDTO implements Serializable {
/**
* 如果有门店code重复，是否替换更新
*/
private boolean isReplace;
private Boolean replace;
public Integer getStoreTmpId() {
return storeTmpId;
......@@ -342,11 +342,44 @@ public class StoreTmpDTO implements Serializable {
this.operatorName = operatorName;
}
public boolean isReplace() {
return isReplace;
}
public void setReplace(boolean replace) {
isReplace = replace;
public Boolean isReplace() {
return replace;
}
public void setReplace(Boolean replace) {
this.replace = replace;
}
@Override
public String toString() {
return "StoreTmpDTO{" +
"storeTmpId=" + storeTmpId +
", enterpriseId=" + enterpriseId +
", regionId=" + regionId +
", regionName='" + regionName + '\'' +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", conactsPhone='" + conactsPhone + '\'' +
", brands='" + brands + '\'' +
", province='" + province + '\'' +
", city='" + city + '\'' +
", county='" + county + '\'' +
", areaId=" + areaId +
", address='" + address + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", customField='" + customField + '\'' +
", state=" + state +
", errorMessage='" + errorMessage + '\'' +
", signKey='" + signKey + '\'' +
", storeType='" + storeType + '\'' +
", erpStatus='" + erpStatus + '\'' +
", storeGroupName='" + storeGroupName + '\'' +
", updateTime=" + updateTime +
", extendList=" + extendList +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
", replace=" + replace +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreTransferDTO.java
......@@ -120,4 +120,19 @@ public class StoreTransferDTO implements Serializable {
public void setToStoreInfoId(Integer toStoreInfoId) {
this.toStoreInfoId = toStoreInfoId;
}
@Override
public String toString() {
return "StoreTransferDTO{" +
"storeTransferId=" + storeTransferId +
", fromStoreId=" + fromStoreId +
", fromStoreInfoId=" + fromStoreInfoId +
", toStoreId=" + toStoreId +
", toStoreInfoId=" + toStoreInfoId +
", enterpriseId=" + enterpriseId +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreWidgetDTO.java
......@@ -5,6 +5,13 @@ import java.io.Serializable;
/**
* tab_store_widget
*/
/**
*
* @ClassName: StoreWidgetDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:10
*/
public class StoreWidgetDTO implements Serializable {
/**
*
......@@ -64,4 +71,15 @@ public class StoreWidgetDTO implements Serializable {
public void setAuthMode(Integer authMode) {
this.authMode = authMode;
}
@Override
public String toString() {
return "StoreWidgetDTO{" +
"storeWidgetId=" + storeWidgetId +
", searchParam='" + searchParam + '\'' +
", writeBackParam='" + writeBackParam + '\'' +
", authSearchParam='" + authSearchParam + '\'' +
", authMode=" + authMode +
'}';
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/WxSearchStoreSearchDTO.java
......@@ -3,6 +3,13 @@ package com.gic.store.dto;
import java.io.Serializable;
import java.util.List;
/**
*
* @ClassName: WxSearchStoreSearchDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:11
*/
public class WxSearchStoreSearchDTO implements Serializable {
private Integer enterpriseId;
private String cityId;
......@@ -10,7 +17,7 @@ public class WxSearchStoreSearchDTO implements Serializable {
private String latitude;
private Integer brandId;
private String appid;
private Integer StoreWidgetId;
private Integer storeWidgetId;
private List<Integer> storeWidgetIdList;
private Integer pageNum = 1;
private Integer pageSize = 20;
......@@ -80,11 +87,11 @@ public class WxSearchStoreSearchDTO implements Serializable {
}
public Integer getStoreWidgetId() {
return StoreWidgetId;
return storeWidgetId;
}
public void setStoreWidgetId(Integer storeWidgetId) {
StoreWidgetId = storeWidgetId;
this.storeWidgetId = storeWidgetId;
}
public List<Integer> getStoreWidgetIdList() {
......@@ -94,4 +101,20 @@ public class WxSearchStoreSearchDTO implements Serializable {
public void setStoreWidgetIdList(List<Integer> storeWidgetIdList) {
this.storeWidgetIdList = storeWidgetIdList;
}
@Override
public String toString() {
return "WxSearchStoreSearchDTO{" +
"enterpriseId=" + enterpriseId +
", cityId='" + cityId + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", brandId=" + brandId +
", appid='" + appid + '\'' +
", StoreWidgetId=" + storeWidgetId +
", storeWidgetIdList=" + storeWidgetIdList +
", pageNum=" + pageNum +
", pageSize=" + pageSize +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/clerk/OrderAddClerkDTO.java
......@@ -66,4 +66,16 @@ public class OrderAddClerkDTO implements Serializable {
public void setOrderTime(Date orderTime) {
this.orderTime = orderTime;
}
@Override
public String toString() {
return "OrderAddClerkDTO{" +
"clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", storeInfoId=" + storeInfoId +
", enterpriseId=" + enterpriseId +
", orderNum='" + orderNum + '\'' +
", orderTime=" + orderTime +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/clerk/PosAddClerkDTO.java
......@@ -17,7 +17,7 @@ public class PosAddClerkDTO implements Serializable {
private String clerkCode;
private Integer storeInfoId;
private Integer enterpriseId;
private String cardNO;
private String cardNo;
private Date openCardTime;
public String getClerkName() {
......@@ -52,12 +52,12 @@ public class PosAddClerkDTO implements Serializable {
this.enterpriseId = enterpriseId;
}
public String getCardNO() {
return cardNO;
public String getCardNo() {
return cardNo;
}
public void setCardNO(String cardNO) {
this.cardNO = cardNO;
public void setCardNo(String cardNo) {
this.cardNo = cardNo;
}
public Date getOpenCardTime() {
......@@ -67,4 +67,16 @@ public class PosAddClerkDTO implements Serializable {
public void setOpenCardTime(Date openCardTime) {
this.openCardTime = openCardTime;
}
@Override
public String toString() {
return "PosAddClerkDTO{" +
"clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", storeInfoId=" + storeInfoId +
", enterpriseId=" + enterpriseId +
", cardNO='" + cardNo + '\'' +
", openCardTime=" + openCardTime +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/clerk/ProcessBatchClerkDTO.java
......@@ -201,4 +201,25 @@ public class ProcessBatchClerkDTO implements Serializable{
public void setClerkType(Integer clerkType) {
this.clerkType = clerkType;
}
@Override
public String toString() {
return "ProcessBatchClerkDTO{" +
"enterpriseId=" + enterpriseId +
", clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", positionName='" + positionName + '\'' +
", clerkGender=" + clerkGender +
", nationcode='" + nationcode + '\'' +
", phoneNumber='" + phoneNumber + '\'' +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", regionId=" + regionId +
", clerkType=" + clerkType +
", reason=" + reason +
", remark='" + remark + '\'' +
", operatorId=" + operatorId +
", operatorName='" + operatorName + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/open/BusinessTimeOpenDTO.java
......@@ -46,4 +46,13 @@ public class BusinessTimeOpenDTO implements Serializable {
public void setCloseTime(String closeTime) {
this.closeTime = closeTime;
}
@Override
public String toString() {
return "BusinessTimeOpenDTO{" +
"weekday='" + weekday + '\'' +
", openTime='" + openTime + '\'' +
", closeTime='" + closeTime + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/open/ClerkDTO.java
......@@ -2,6 +2,14 @@ package com.gic.store.dto.open;
import java.io.Serializable;
/**
*
* @ClassName: ClerkDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public class ClerkDTO implements Serializable{
private static final long serialVersionUID = 3501566554528955502L;
/**
......@@ -103,4 +111,18 @@ public class ClerkDTO implements Serializable{
public void setRegionId(Integer regionId) {
this.regionId = regionId;
}
@Override
public String toString() {
return "ClerkDTO{" +
"clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", enterpriseId=" + enterpriseId +
", positionName='" + positionName + '\'' +
", clerkGender=" + clerkGender +
", phoneNumber='" + phoneNumber + '\'' +
", storeCode='" + storeCode + '\'' +
", regionId=" + regionId +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/open/ClerkDetailDTO.java
......@@ -2,6 +2,13 @@ package com.gic.store.dto.open;
import java.io.Serializable;
/**
*
* @ClassName: ClerkDetailDTO
* @Description:
* @author zhiwj
* @date 2020-09-09 16:03
*/
public class ClerkDetailDTO implements Serializable{
private static final long serialVersionUID = -7047885877471820359L;
......@@ -92,4 +99,17 @@ public class ClerkDetailDTO implements Serializable{
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
@Override
public String toString() {
return "ClerkDetailDTO{" +
"clerkName='" + clerkName + '\'' +
", clerkCode='" + clerkCode + '\'' +
", enterpriseId=" + enterpriseId +
", positionName='" + positionName + '\'' +
", clerkGender=" + clerkGender +
", phoneNumber='" + phoneNumber + '\'' +
", storeCode='" + storeCode + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/open/StoreOpenDTO.java
......@@ -253,4 +253,29 @@ public class StoreOpenDTO implements Serializable {
public void setErpType(Integer erpType) {
this.erpType = erpType;
}
@Override
public String toString() {
return "StoreOpenDTO{" +
"storeId=" + storeId +
", enterpriseId=" + enterpriseId +
", storeName='" + storeName + '\'' +
", storeCode='" + storeCode + '\'' +
", regionId=" + regionId +
", photos='" + photos + '\'' +
", erpType=" + erpType +
", erpStatus=" + erpStatus +
", conactsPhone='" + conactsPhone + '\'' +
", businessTime='" + businessTime + '\'' +
", groupName='" + groupName + '\'' +
", brand='" + brand + '\'' +
", province='" + province + '\'' +
", city='" + city + '\'' +
", county='" + county + '\'' +
", address='" + address + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", customField='" + customField + '\'' +
'}';
}
}
gic-store-api/src/main/java/com/gic/store/dto/open/TestDTO.java deleted 100644 → 0
package com.gic.store.dto.open;
import java.io.Serializable;
public class TestDTO implements Serializable{
private static final long serialVersionUID = 572423506566154620L;
private String guojxTest;
public String getGuojxTest() {
return guojxTest;
}
public void setGuojxTest(String guojxTest) {
this.guojxTest = guojxTest;
}
}
gic-store-api/src/main/java/com/gic/store/service/ClerkImportApiService.java
......@@ -15,6 +15,7 @@ import java.util.Map;
*/
public interface ClerkImportApiService {
/**
* 企业下是否存在 正在导入导购的任务
* @Title: hasImportingClerk
* @Description: 企业下是否存在 正在导入导购的任务
* @author zhiwj
......@@ -25,6 +26,7 @@ public interface ClerkImportApiService {
ServiceResponse<Boolean> hasImportingClerk(Integer enterpriseId);
/**
* 删除企业下所有导购
* @Title: delClerkTmp
* @Description: 删除企业下所有导购
* @author zhiwj
......@@ -35,6 +37,7 @@ public interface ClerkImportApiService {
ServiceResponse<Void> delClerkTmp(Integer enterpriseId);
/**
* 保存clerkTmp
* @Title: save
* @Description: 保存clerkTmp
* @author zhiwj
......@@ -45,6 +48,7 @@ public interface ClerkImportApiService {
ServiceResponse<Void> save(ClerkTmpDTO bean);
/**
* 导入导购
* @Title: importDataToClerk
* @Description: 导入导购
* @author zhiwj
......@@ -58,6 +62,7 @@ public interface ClerkImportApiService {
ServiceResponse<String> importDataToClerk(Integer enterpriseId, String userId, String uuId, boolean isReplace);
/**
* 分页查导购导入日志
* @Title: listClerkTmp
* @Description: 分页查导购导入日志
* @author zhiwj
......@@ -71,6 +76,7 @@ public interface ClerkImportApiService {
ServiceResponse<Page> listClerkTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize);
/**
* 查询导入进度
* @Title: getClerkBatchProcess
* @Description: 查询导入进度
* @author zhiwj
......@@ -84,6 +90,7 @@ public interface ClerkImportApiService {
ServiceResponse<Map<String, Object>> getClerkBatchProcess(Integer enterpriseId, String uuId, Integer currentPage, Integer pageSize);
/**
* listClerkTmp
* @Title: listClerkTmp
* @Description:
* @author zhiwj
......@@ -95,6 +102,7 @@ public interface ClerkImportApiService {
ServiceResponse<List<ClerkTmpDTO>> listClerkTmp(Integer enterpriseId, Boolean isRight);
/**
* 查询错误日志
* @Title: pageError
* @Description: 查询错误日志
* @author zhiwj
......@@ -107,6 +115,7 @@ public interface ClerkImportApiService {
ServiceResponse<Page> pageError(Integer enterpriseId, Integer currentPage, Integer pageSize);
/**
* 查询所有
* @Title: listAllClerkTmp
* @Description: 查询所有
* @author zhiwj
......@@ -117,6 +126,7 @@ public interface ClerkImportApiService {
ServiceResponse<List<ClerkTmpDTO>> listAllClerkTmp(Integer enterpriseId);
/**
* 查询所有错误日志
* @Title: listError
* @Description: 查询所有错误日志
* @author zhiwj
......@@ -127,6 +137,7 @@ public interface ClerkImportApiService {
ServiceResponse<List<List<String>>> listError(Integer enterpriseId);
/**
* validateClerkCode
* @Title: validateClerkCode
* @Description:
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/ClerkLogApiService.java
......@@ -14,6 +14,7 @@ import com.gic.store.dto.ClerkLogDTO;
public interface ClerkLogApiService {
/**
* listClerkLog
* @Title: listClerkLog
* @Description:
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/ClerkPositionApiService.java
......@@ -14,6 +14,7 @@ import java.util.List;
public interface ClerkPositionApiService {
/**
* save
* @Title: save
* @Description:
* @author zhiwj
......@@ -24,6 +25,7 @@ public interface ClerkPositionApiService {
ServiceResponse<Void> save(ClerkPositionDTO clerkPositionDTO);
/**
* update
* @Title: update
* @Description:
* @author zhiwj
......@@ -34,6 +36,7 @@ public interface ClerkPositionApiService {
ServiceResponse<Void> update(ClerkPositionDTO clerkPositionDTO);
/**
* getByClerkPositionId
* @Title: getByClerkPositionId
* @Description:
* @author zhiwj
......@@ -44,6 +47,7 @@ public interface ClerkPositionApiService {
ServiceResponse<ClerkPositionDTO> getByClerkPositionId(Integer clerkPositionId);
/**
* delete
* @Title: delete
* @Description:
* @author zhiwj
......@@ -54,6 +58,7 @@ public interface ClerkPositionApiService {
ServiceResponse<Void> delete(Integer clerkPositionId);
/**
* listClerkPosition
* @Title: listClerkPosition
* @Description:
* @author zhiwj
......@@ -67,6 +72,7 @@ public interface ClerkPositionApiService {
ServiceResponse<Page<ClerkPositionDTO>> listClerkPosition(Integer enterpriseId, String search, Integer currentPage, Integer pageSize);
/**
* listAllClerkPosition
* @Title: listAllClerkPosition
* @Description:
* @author zhiwj
......@@ -78,6 +84,7 @@ public interface ClerkPositionApiService {
ServiceResponse<List<ClerkPositionDTO>> listAllClerkPosition(Integer enterpriseId, String search);
/**
* setSort
* @Title: setSort
* @Description:
* @author zhiwj
......@@ -90,10 +97,11 @@ public interface ClerkPositionApiService {
ServiceResponse<Void> setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq);
/**
* getByName
* @Title: getByName
* @Description:
* @author zhiwj
* @param enterpriseId
* @param enterpriseId
* @param positionName@return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.ClerkPositionDTO>
* @throws
*/
......
gic-store-api/src/main/java/com/gic/store/service/ClerkTaskApiService.java
......@@ -9,6 +9,7 @@ package com.gic.store.service;
public interface ClerkTaskApiService {
/**
* importDataToClerk
* @Title: importDataToClerk
* @Description:
* @author zhiwj
......@@ -22,6 +23,7 @@ public interface ClerkTaskApiService {
String importDataToClerk(Integer enterpriseId, String userId, String uuId, boolean isReplace);
/**
* 异步任务入口
* @Title: run
* @Description: 异步任务入口
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/DictApiService.java
......@@ -2,6 +2,7 @@ package com.gic.store.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.store.dto.GicDictDTO;
import com.sun.org.glassfish.gmbal.Description;
/**
* @author zhiwj
......@@ -11,10 +12,13 @@ import com.gic.store.dto.GicDictDTO;
public interface DictApiService {
/**
getDictByCode
* @Title: getDictByCode
* @Description:
* @author zhiwj
* @return com.gic.store.entity.TabGicDict
* @param dictType
* @param dictCode
* @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.GicDictDTO>
* @throws
*/
ServiceResponse<GicDictDTO> getDictByCode(String dictType, String dictCode);
......
gic-store-api/src/main/java/com/gic/store/service/ProvincesApiService.java
......@@ -5,14 +5,21 @@ import com.gic.store.dto.CityDTO;
import com.gic.store.dto.CountyDTO;
import com.gic.store.dto.ProvinceDTO;
import javax.xml.ws.Service;
import java.util.List;
/**
*
* @ClassName: ProvincesApiService
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public interface ProvincesApiService {
/** @Description: 查询所有省份
* @author taogs
/**
* 查询所有省份
* @Description: 查询所有省份
* @author taogs
* @Date 13:57 2019/8/5
* @Param
* @return
......@@ -20,7 +27,9 @@ public interface ProvincesApiService {
ServiceResponse<List<ProvinceDTO>> selectAllProvince();
/** @Description: 查询所有城市
/**
* 查询所有城市
* @Description: 查询所有城市
* @author taogs
* @Date 14:07 2019/8/5
* @Param
......@@ -28,23 +37,29 @@ public interface ProvincesApiService {
*/
ServiceResponse<List<CityDTO>> selectAllCity();
/** @Description: 通过城市id查询城市
/**
* 通过城市id查询城市
* @Description: 通过城市id查询城市
* @author taogs
* @Date 11:10 2019/12/9
* @Param
* @param cityId
* @return
*/
ServiceResponse<CityDTO> getCityByCityId(String cityId);
/** @Description: 通过省id查询城市
/**
* 通过省id查询城市
* @Description: 通过省id查询城市
* @author taogs
* @Date 14:29 2019/12/4
* @Param
* @param provinceId
* @return
*/
ServiceResponse<List<CityDTO>> selectCityByProvinceId(String provinceId);
/** @Description: 查询所有地区
/**
* 查询所有地区
* @Description: 查询所有地区
* @author taogs
* @Date 14:07 2019/8/5
* @Param
......@@ -53,68 +68,116 @@ public interface ProvincesApiService {
ServiceResponse<List<CountyDTO>> selectAllCounty();
/** @Description: 通过地区id查询
/**
*
* 通过地区id查询
* @Description: 通过地区id查询
* @author taogs
* @Date 11:11 2019/12/9
* @Param
* @param countyId
* @return
*/
ServiceResponse<CountyDTO> getCountyByCountyId(String countyId);
/** @Description: 通过城市id查询地区
/**
* 通过城市id查询地区
* @Description: 通过城市id查询地区
* @author taogs
* @Date 14:38 2019/12/4
* @Param
* @param cityId
* @return
*/
ServiceResponse<List<CountyDTO>> selectCountyByCityId(String cityId);
/** @Description: 通过城市id查询地区id
/**
* 通过城市id查询地区id
* @Description: 通过城市id查询地区id
* @author taogs
* @Date 14:44 2019/12/4
* @Param
* @param cityId
* @return
*/
ServiceResponse<List<String>> selectCountyIdByCityId(String cityId);
/** @Description: 根据省份名称查询code
/**
* 根据省份名称查询code
* @Description: 根据省份名称查询code
* @author taogs
* @Date 13:59 2019/8/5
* @Param
* @param search
* @return
*/
ServiceResponse<List<ProvinceDTO>> queryProvinces(String search);
/** @Description: 根据城市名称查询code
* @author taogs
* @Date 14:08 2019/8/5
* @Param
* @return
*/
/**
* queryCity 根据城市名称查询code
* @Title: queryCity
* @Description:
* @author zhiwj
* @param search
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.CityDTO>>
* @throws
*/
ServiceResponse<List<CityDTO>> queryCity(String search);
/** @Description: 根据地区名称查询地区code
/**
* 根据地区名称查询地区code
* @Description: 根据地区名称查询地区code
* @author taogs
* @Date 14:08 2019/8/5
* @Param
* @param search
* @return
*/
ServiceResponse<List<CountyDTO>> queryCounty(String search);
/**
* getProvinceById
* getProvinceById
* @Title: getProvinceById
* @Description:
* @author zhiwj
* @param provinceId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.ProvinceDTO>
* @throws
*/
ServiceResponse<ProvinceDTO> getProvinceById(String provinceId);
/**
* getProvinceNameByAreaId
* getProvinceNameByAreaId
* @Title: getProvinceNameByAreaId
* @Description:
* @author zhiwj
* @param aredId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> getProvinceNameByAreaId(String aredId);
/** @Description: 热门城市
* @author taogs
* @Date 17:35 2019/12/4
* @Param
* @return
*/
/**
* 热门城市
* @Title: listHotCity
* @Description:
* @author zhiwj
* @param enterpriseId
* @param brandId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.CityDTO>>
* @throws
*/
ServiceResponse<List<CityDTO>> listHotCity(Integer enterpriseId, Integer brandId);
/**
* listEnterpriseCity
* listEnterpriseCity
* @Title: listEnterpriseCity
* @Description:
* @author zhiwj
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.CityDTO>>
* @throws
*/
ServiceResponse<List<CityDTO>> listEnterpriseCity(Integer enterpriseId);
}
gic-store-api/src/main/java/com/gic/store/service/StoreAuthorizationApiService.java
......@@ -3,28 +3,94 @@ package com.gic.store.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.store.dto.StoreDTO;
import javax.xml.ws.Service;
import java.util.List;
/**
*
* @ClassName: StoreAuthorizationApiService
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public interface StoreAuthorizationApiService {
/** @Description: 联合商户授权初始化
* @author taogs
* @Date 11:46 2019/9/23
* @Param
* @return
*/
/**
* authStore 联合商户授权初始化
* @Title: authStore
* @Description:
* @author zhiwj
* @param storeResourceId
* @param toEnterpriseId
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> authStore(Integer storeResourceId, Integer toEnterpriseId, Integer enterpriseId);
/**
* reAuthStore
* @Title: reAuthStore
* @Description:
* @author zhiwj
* @param key
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> reAuthStore(String key);
/**
* authorizationSingleStore
* @Title: authorizationSingleStore
* @Description:
* @author zhiwj
* @param params
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> authorizationSingleStore(String params);
/**
* saveStore
* @Title: saveStore
* @Description:
* @author zhiwj
* @param storeDTO
* @param logId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> saveStore(StoreDTO storeDTO, Integer logId);
/**
* saveStore
* @Title: saveStore
* @Description:
* @author zhiwj
* @param storeDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> saveStore(StoreDTO storeDTO);
/**
* cancelStore
* @Title: cancelStore
* @Description:
* @author zhiwj
* @param storeInfoId
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> cancelStore(Integer storeInfoId, Integer enterpriseId);
/**
* cancelStoreAll
* @Title: cancelStoreAll
* @Description:
* @author zhiwj
* @param fromEnterpriseId
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> cancelStoreAll(Integer fromEnterpriseId, Integer enterpriseId);
}
gic-store-api/src/main/java/com/gic/store/service/StoreBrandApiService.java
......@@ -15,6 +15,7 @@ import java.util.List;
public interface StoreBrandApiService {
/**
* 保存或编辑
* @Title: saveOrUpdateStoreBrand
* @Description: 保存或编辑
* @author zhiwj
......@@ -25,6 +26,7 @@ public interface StoreBrandApiService {
ServiceResponse<Integer> saveOrUpdateStoreBrand(StoreBrandDTO storeBrandDTO);
/**
* 查询列表
* @Title: listStoreBrand
* @Description: 查询列表
* @author zhiwj
......@@ -38,6 +40,7 @@ public interface StoreBrandApiService {
ServiceResponse<Page<StoreBrandDTO>> listStoreBrand(Integer enterpriseId, String search, Integer pageNum, Integer pageSize);
/**
* listAllStoreBrand
* @Title: listAllStoreBrand
* @Description:
* @author zhiwj
......@@ -49,6 +52,7 @@ public interface StoreBrandApiService {
ServiceResponse<List<StoreBrandDTO>> listAllStoreBrand(Integer enterpriseId, String search);
/**
* 删除全部
* @Title: deleteAll
* @Description: 删除全部
* @author zhiwj
......@@ -59,6 +63,7 @@ public interface StoreBrandApiService {
ServiceResponse<Void> deleteAll(Integer enterpriseId);
/**
* 批量删除
* @Title: deleteByIds
* @Description: 批量删除
* @author zhiwj
......@@ -70,6 +75,7 @@ public interface StoreBrandApiService {
ServiceResponse<Void> deleteByIds(Integer enterpriseId, String ids);
/**
* 移动顺序
* @Title: moveStoreBrand
* @Description: 移动顺序
* @author zhiwj
......@@ -82,6 +88,7 @@ public interface StoreBrandApiService {
ServiceResponse<Void> moveStoreBrand(Integer enterpriseId, Integer storeBrandId, Integer moveType);
/**
* 设置序号
* @Title: setStoreBrandSort
* @Description: 设置序号
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/StoreBusinessTimeApiService.java
......@@ -12,6 +12,7 @@ import com.gic.store.dto.StoreBusinessTimeDTO;
public interface StoreBusinessTimeApiService {
/**
* 查询列表
* @Title: listStoreBusinessTime
* @Description: 查询列表
* @author zhiwj
......@@ -23,6 +24,7 @@ public interface StoreBusinessTimeApiService {
ServiceResponse<StoreBusinessTimeDTO> listStoreBusinessTime(Integer enterpriseId, Integer storeId);
/**
* 保存
* @Title: saveOrUpdateStoreBusinessTime
* @Description: 保存
* @author zhiwj
......@@ -33,6 +35,7 @@ public interface StoreBusinessTimeApiService {
ServiceResponse<StoreBusinessTimeDTO> saveOrUpdateStoreBusinessTime(StoreBusinessTimeDTO storeBusinessTimeDTO);
/**
* 删除
* @Title: deleteStoreBusinessTime
* @Description: 删除
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/StoreDictApiService.java
......@@ -5,6 +5,13 @@ import com.gic.store.dto.StoreDictDTO;
import java.util.List;
/**
*
* @ClassName: StoreDictApiService
* @Description:
* @author zhiwj
* @date 2020-09-09 16:04
*/
public interface StoreDictApiService {
/**
......@@ -19,7 +26,7 @@ public interface StoreDictApiService {
ServiceResponse<List<StoreDictDTO>> listAllBusinessCategory(Integer enterpriseId);
/**
*
*getStoreDict
* @Title: getStoreDict
* @Description:
* @author zhiwj
......@@ -31,52 +38,88 @@ public interface StoreDictApiService {
ServiceResponse<StoreDictDTO> getStoreDict(String categoryCode, String code);
/**
* 查询运维后台所有门店类型，企业选中checked=1
* listAllStoreType
* @Title: listAllStoreType
* @Description:
* @author zhiwj
* @param enterpriseId
* @return
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreDictDTO>>
* @throws
*/
ServiceResponse<List<StoreDictDTO>> listAllStoreType(Integer enterpriseId);
/**
* 查询运维后台所有门店状态，企业选中checked=1
* listAllStoreStatus
* @Title: listAllStoreStatus
* @Description:
* @author zhiwj
* @param enterpriseId
* @return
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreDictDTO>>
* @throws
*/
ServiceResponse<List<StoreDictDTO>> listAllStoreStatus(Integer enterpriseId);
/**
* 查询企业下门店类型
* listStoreType
* @Title: listStoreType
* @Description:
* @author zhiwj
* @param enterpriseId
* @return
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreDictDTO>>
* @throws
*/
ServiceResponse<List<StoreDictDTO>> listStoreType(Integer enterpriseId);
/**
* 查询企业下门店状态
* listStoreStatus
* @Title: listStoreStatus
* @Description:
* @author zhiwj
* @param enterpriseId
* @return
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreDictDTO>>
* @throws
*/
ServiceResponse<List<StoreDictDTO>> listStoreStatus(Integer enterpriseId);
/**
* 保存门店类型
* saveStoreType
* @Title: saveStoreType
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeTypeArr
* @return
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveStoreType(Integer enterpriseId, String[] storeTypeArr);
/**
* 保存门店类型
* saveStoreStatus
* @Title: saveStoreStatus
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeStatusArr
* @return
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveStoreStatus(Integer enterpriseId, String[] storeStatusArr);
/**
* saveStoreStatusAndStoreType
* @Title: saveStoreStatusAndStoreType
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeStatusArr
* @param storeTypeArr
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveStoreStatusAndStoreType(Integer enterpriseId, String[] storeStatusArr, String[] storeTypeArr);
/**
* 审批回调
* @Title: saveStoreStatusAndStoreTypeCallback
* @Description: 审批回调
* @author zhiwj
......@@ -85,10 +128,15 @@ public interface StoreDictApiService {
* @throws
*/
ServiceResponse saveStoreStatusAndStoreTypeCallback(String json);
/**
* 查询支持列表查询的自定义字段
* @Title: 查询支持列表查询的自定义字段
* @Description:
* @author zhiwj
* @param enterpriseId
* @return
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreDictDTO>>
* @throws
*/
ServiceResponse<List<StoreDictDTO>> listStoreField(Integer enterpriseId);
......@@ -104,24 +152,40 @@ public interface StoreDictApiService {
/**
* 保存自定义字段关联查询
* @Title: 保存自定义字段关联查询
* @Description:
* @author zhiwj
* @param enterpriseId
* @param value
* @return
* @param type
* @param userId
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveStoreField(Integer enterpriseId, String value, int type, Integer userId);
/** @Description: 列表筛选字段配置
* @author taogs
* @Date 18:16 2020/3/11
* @Param
* @return
*/
ServiceResponse saveStoreField(Integer enterpriseId, String values, Integer userId);
/**
* 查询列表/筛选属性光支持 列表数据
* saveStoreField
* @Title: saveStoreField
* @Description:
* @author zhiwj
* @param enterpriseId
* @return
* @param values
* @param userId
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveStoreField(Integer enterpriseId, String values, Integer userId);
/**
* listStoreFieldDictValue
* @Title: listStoreFieldDictValue
* @Description:
* @author zhiwj
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<java.lang.String>>
* @throws
*/
ServiceResponse<List<String>> listStoreFieldDictValue(Integer enterpriseId);
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/service/StoreFieldApiService.java
......@@ -52,6 +52,7 @@ public interface StoreFieldApiService {
ServiceResponse<String> setStoreFieldSort(int storeFieldId, int setValue, Integer enterpriseId);
/**
* delete
* @Title: delete

* @Description:

 * @author guojuxing
......
gic-store-api/src/main/java/com/gic/store/service/StoreGroupApiService.java
package com.gic.store.service;
import java.util.List;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.store.dto.StoreGroupDTO;
import java.util.List;
/**
* 门店分组
* @ClassName: StoreGroupApiService

......@@ -150,31 +150,58 @@ public interface StoreGroupApiService {
ServiceResponse<Boolean> isLeafNode(Integer storeGroupId);
/** @Description: 通过分组id查询分组
* @author taogs
* @Date 18:44 2019/8/12
* @Param
* @return
*/
/**
* 通过分组id查询分组
* @Title: 通过分组id查询分组
* @Description:
* @author zhiwj
* @param storeGroupIdList
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreGroupDTO>>
* @throws
*/
ServiceResponse<List<StoreGroupDTO>> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId);
/** @Description: 通过分组id查询分组
* @author taogs
* @Date 18:44 2019/8/12
* @Param
* @return
/**
* 通过分组id查询分组
* @Title: 通过分组id查询分组
* @Description:
* @author zhiwj
* @param storeGroupIdList
* @param enterpriseId
* @param level
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreGroupDTO>>
* @throws
*/
ServiceResponse<List<StoreGroupDTO>> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level);
/** @Description: 分页查询分组
* @author taogs
* @Date 10:31 2020/7/15
* @Param
* @return
*/
/**
* 分页查询分组
* @Title: 分页查询分组
* @Description:
* @author zhiwj
* @param storeGroupIdList
* @param enterpriseId
* @param parentId
* @param search
* @param pageSize
* @param pageNum
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.store.dto.StoreGroupDTO>>
* @throws
*/
ServiceResponse<Page<StoreGroupDTO>> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId,
Integer parentId, String search, Integer pageSize, Integer pageNum);
/**
* listChildrenStoreGroup
* @Title: listChildrenStoreGroup
* @Description:
* @author zhiwj
* @param enterpriseId
* @param parentStoreGroupId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreGroupDTO>>
* @throws
*/
ServiceResponse<List<StoreGroupDTO>> listChildrenStoreGroup(Integer enterpriseId, Integer parentStoreGroupId);
}
gic-store-api/src/main/java/com/gic/store/service/StoreImportApiService.java
......@@ -15,6 +15,7 @@ import java.util.Map;
*/
public interface StoreImportApiService {
/**
* 判断当前企业下是否有正在导入的门店
* @Title: hasImportingStore
* @Description: 判断当前企业下是否有正在导入的门店
* @author zhiwj
......@@ -25,6 +26,7 @@ public interface StoreImportApiService {
ServiceResponse<Boolean> hasImportingStore(Integer enterpriseId);
/**
* 删除实体
* @Title: delStoreTmp
* @Description: 删除实体
* @author zhiwj
......@@ -35,6 +37,7 @@ public interface StoreImportApiService {
ServiceResponse<Void> delStoreTmp(Integer enterpriseId);
/**
* 导入门店
* @Title: importDataToStore
* @Description: 导入门店
* @author zhiwj
......@@ -48,6 +51,7 @@ public interface StoreImportApiService {
ServiceResponse<String> importDataToStore(Integer enterpriseId, String userId, String uuId, boolean isReplace);
/**
* 保存
* @Title: save
* @Description: 保存
* @author zhiwj
......@@ -58,6 +62,7 @@ public interface StoreImportApiService {
ServiceResponse<Void> save(StoreTmpDTO bean);
/**
* 查询列表
* @Title: listStoreTmp
* @Description: 查询列表
* @author zhiwj
......@@ -71,6 +76,7 @@ public interface StoreImportApiService {
ServiceResponse<Page> listStoreTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize);
/**
* 校验storeCode
* @Title: validateStoreCode
* @Description: 校验storeCode
* @author zhiwj
......@@ -83,6 +89,7 @@ public interface StoreImportApiService {
ServiceResponse<Boolean> validateStoreCode(Integer enterpriseId, Integer regionId, String storeCode);
/**
* 门店分组是否存在
* @Title: isExistStoreGroup
* @Description: 门店分组是否存在
* @author zhiwj
......@@ -94,6 +101,7 @@ public interface StoreImportApiService {
ServiceResponse<String> isExistStoreGroup(Integer enterpriseId, String storeGroupName);
/**
* 所有不存在的门店品牌
* @Title: listBrandByNotExist
* @Description: 所有不存在的门店品牌
* @author zhiwj
......@@ -105,6 +113,7 @@ public interface StoreImportApiService {
ServiceResponse<List<String>> listBrandByNotExist(Integer enterpriseId, String brands);
/**
* 查询导入列表
* @Title: listStoreTmp
* @Description: 查询导入列表
* @author zhiwj
......@@ -116,6 +125,7 @@ public interface StoreImportApiService {
ServiceResponse<List<StoreTmpDTO>> listStoreTmp(Integer enterpriseId, Boolean isRight);
/**
* 查询所有导入列表
* @Title: listAllStoreTmp
* @Description: 查询所有导入列表
* @author zhiwj
......@@ -126,6 +136,7 @@ public interface StoreImportApiService {
ServiceResponse<List<StoreTmpDTO>> listAllStoreTmp(Integer enterpriseId);
/**
* 查询所有导入列表
* @Title: listError
* @Description: 查询所有导入列表
* @author zhiwj
......@@ -136,6 +147,7 @@ public interface StoreImportApiService {
ServiceResponse<List<List<String>>> listError(Integer enterpriseId);
/**
* 查询导入列表
* @Title: pageError
* @Description: 查询导入列表
* @author zhiwj
......@@ -147,9 +159,8 @@ public interface StoreImportApiService {
*/
ServiceResponse<Page> pageError(Integer enterpriseId, Integer currentPage, Integer pageSize);
// List<StoreTmpDTO> listStoreTmp(Integer enterpriseId, Boolean isSuccess, Boolean isWait);
/**
* 查询title
* @Title: listImportTitle
* @Description: 查询title
* @author zhiwj
......@@ -161,6 +172,7 @@ public interface StoreImportApiService {
ServiceResponse<List<List<String>>> listImportTitle(Integer enterpriseId, Integer regionId);
/**
* 查询field是否是date
* @Title: fieldIsDateType
* @Description: 查询field是否是date
* @author zhiwj
......@@ -172,17 +184,20 @@ public interface StoreImportApiService {
ServiceResponse<Map<Integer, Boolean>> fieldIsDateType(Integer enterpriseId, Integer regionId);
/**
* 验证storeName
* @Title: validateStoreName
* @Description: 验证storeName
* @author zhiwj
* @param enterpriseId
* @param storeName
* @param regionId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Boolean>
* @throws
*/
ServiceResponse<Boolean> validateStoreName(Integer enterpriseId, Integer regionId, String storeName);
/**
* 查询导入状态
* @Title: getStoreBatchProcess
* @Description: 查询导入状态
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/StoreOpenApiService.java
......@@ -37,11 +37,12 @@ public interface StoreOpenApiService {

*/
ServiceResponse<String> getStoreDetail(String appId, Integer enterpriseId, String storeCode, Integer regionId);
/**
/***
* 门店新增接口
* @Title: addStore
* @Description:
* @author zhiwj
* @param appId
* @param enterpriseId
* @param storeOpenDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
......@@ -55,6 +56,7 @@ public interface StoreOpenApiService {
* @Title: editStore
* @Description:
* @author zhiwj
* @param appId
* @param enterpriseId
* @param storeOpenDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
......@@ -63,34 +65,59 @@ public interface StoreOpenApiService {
ServiceResponse<String> editStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO);
/**
* 门店列表接口
* pageStore
* @Title: pageStore
* @Description:
* @author zhiwj
* @param appId
* @param enterpriseId
* @param regionId
* @param pageNum
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> pageStore(String appId, Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize);
/**
* 查询导购详情
* @Title: getClerkDetail

* @Title: getClerkDetail
* @Description:

* @author guojuxing
* @author zhiwj
* @param appId
* @param enterpriseId 商户ID
* @param storeCode 门店code
* @param clerkCode 导购code
* @param regionId
门店域ID
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>


*/
* @param enterpriseId
* @param storeCode
* @param clerkCode
* @param regionId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, String storeCode, String clerkCode, Integer regionId);
/**
* addClerk
* @Title: addClerk
* @Description:
* @author zhiwj
* @param appId
* @param enterpriseId
* @param clerkInfo
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> addClerk(String appId, Integer enterpriseId, ClerkDTO clerkInfo);
/**
* editClerk
* @Title: editClerk
* @Description:
* @author zhiwj
* @param appId
* @param enterpriseId
* @param clerkInfo
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> editClerk(String appId, Integer enterpriseId, ClerkDTO clerkInfo);
/**
......
gic-store-api/src/main/java/com/gic/store/service/StoreRegionApiService.java
......@@ -15,6 +15,7 @@ import java.util.List;
public interface StoreRegionApiService {
/**
* 保存门店域
* @Title: saveOrUpdateStoreRegion
* @Description: 保存门店域
* @author zhiwj
......@@ -28,6 +29,7 @@ public interface StoreRegionApiService {
ServiceResponse<Integer> saveOrUpdateStoreRegion(Integer enterpriseId, String regionCode, String regionName, Integer regionId);
/**
* 分页查询门店域列表
* @Title: listStoreRegion
* @Description: 分页查询门店域列表
* @author zhiwj
......@@ -41,6 +43,7 @@ public interface StoreRegionApiService {
ServiceResponse<Page<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search, Integer pageNum, Integer pageSize);
/**
* 查询全部的门店域
* @Title: listStoreRegion
* @Description: 查询全部的门店域
* @author zhiwj
......@@ -52,11 +55,13 @@ public interface StoreRegionApiService {
ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search);
/**
* listStoreRegion
* @Title: listStoreRegion
* @Description:
* @author zhiwj
* @param enterpriseId
* @param search
* @param ownType
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreRegionDTO>>
* @throws
*/
......@@ -74,6 +79,7 @@ public interface StoreRegionApiService {
ServiceResponse<List<StoreRegionDTO>> listOwnerStoreRegion(Integer enterpriseId);
/**
* 查询门店域详情
* @Title: getStoreRegionByRegion
* @Description: 查询门店域详情
* @author zhiwj
......@@ -84,11 +90,15 @@ public interface StoreRegionApiService {
*/
ServiceResponse<StoreRegionDTO> getStoreRegionByRegion(Integer enterpriseId, Integer regionId);
/** @Description: 通过域id查询域列表
* @author taogs
* @Date 19:59 2019/8/12
* @Param
* @return
/**
* listStoreRegionByIds 通过域id查询域列表
* @Title: listStoreRegionByIds
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeRegionIdList
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreRegionDTO>>
* @throws
*/
ServiceResponse<List<StoreRegionDTO>> listStoreRegionByIds(Integer enterpriseId, List<Integer> storeRegionIdList);
/**
......
gic-store-api/src/main/java/com/gic/store/service/StoreStatusSettingApiService.java
......@@ -5,10 +5,48 @@ import com.gic.store.dto.StoreStatusSettingDTO;
import java.util.List;
/**
*
* @ClassName: StoreStatusSettingApiService
* @Description:
* @author zhiwj
* @date 2020-09-09 16:07
*/
public interface StoreStatusSettingApiService {
/**
* saveSetting
* @Title: saveSetting
* @Description:
* @author zhiwj
* @param dto
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveSetting(StoreStatusSettingDTO dto);
/**
* listSetting
* @Title: listSetting
* @Description:
* @author zhiwj
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreStatusSettingDTO>>
* @throws
*/
ServiceResponse<List<StoreStatusSettingDTO>> listSetting(Integer enterpriseId);
/**
* delete
* @Title: delete
* @Description:
* @author zhiwj
* @param enterpriseId
* @param id
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse delete(Integer enterpriseId, Integer id);
}
gic-store-api/src/main/java/com/gic/store/service/StoreTagApiService.java
......@@ -14,13 +14,58 @@ import java.util.List;
*/
public interface StoreTagApiService {
/**
* save
* @Title: save
* @Description:
* @author zhiwj
* @param dto
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> save(StoreTagDTO dto);
/**
* update
* @Title: update
* @Description:
* @author zhiwj
* @param dto
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> update(StoreTagDTO dto);
/**
* delete
* @Title: delete
* @Description:
* @author zhiwj
* @param storeTagId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> delete(Integer storeTagId);
/**
* getByStoreTagId
* @Title: getByStoreTagId
* @Description:
* @author zhiwj
* @param storeTagId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.StoreTagDTO>
* @throws
*/
ServiceResponse<StoreTagDTO> getByStoreTagId(Integer storeTagId);
/**
* listByEnterprise
* @Title: listByEnterprise
* @Description:
* @author zhiwj
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreTagDTO>>
* @throws
*/
ServiceResponse<List<StoreTagDTO>> listByEnterprise(Integer enterpriseId);
}
gic-store-api/src/main/java/com/gic/store/service/StoreTagTmpApiService.java
......@@ -11,11 +11,53 @@ import com.gic.store.dto.StoreTagTmpDTO;
* @date 2020-02-24 10:08
*/
public interface StoreTagTmpApiService {
/**
* delStoreTagTmp
* @Title: delStoreTagTmp
* @Description:
* @author zhiwj
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> delStoreTagTmp(Integer enterpriseId);
/**
* saveStoreTagTmp
* @Title: saveStoreTagTmp
* @Description:
* @author zhiwj
* @param bean
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> saveStoreTagTmp(StoreTagTmpDTO bean);
/**
* listImportError
* @Title: listImportError
* @Description:
* @author zhiwj
* @param enterpriseId
* @param currentPage
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.store.dto.StoreTagTmpDTO>>
* @throws
*/
ServiceResponse<Page<StoreTagTmpDTO>> listImportError(Integer enterpriseId, Integer currentPage, Integer pageSize);
/**
* queryCount
* @Title: queryCount
* @Description:
* @author zhiwj
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<com.alibaba.fastjson.JSONObject>
* @throws
*/
ServiceResponse<JSONObject> queryCount(Integer enterpriseId);
}
gic-store-api/src/main/java/com/gic/store/service/StoreTaskApiService.java
......@@ -10,6 +10,7 @@ package com.gic.store.service;
public interface StoreTaskApiService {
/**
* 开启异步
* @Title: importDataToStore
* @Description: 开启异步
* @author zhiwj
......@@ -23,6 +24,7 @@ public interface StoreTaskApiService {
String importDataToStore(Integer enterpriseId, String userId, String uuId, boolean isReplace);
/**
* 异步任务入口
* @Title: run
* @Description: 异步任务入口
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/StoreTransferApiService.java
......@@ -10,15 +10,20 @@ import com.gic.api.base.commons.ServiceResponse;
public interface StoreTransferApiService {
/**
* 门店成本主体转移
* @Title: save
* @Description: 门店成本主体转移
* @Description:
* @author zhiwj
* @param enterpriseId
* @param fromStoreId
* @param toStoreId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> save(Integer enterpriseId, Integer fromStoreId, Integer toStoreId);
/**
* save
* @Title: save
* @Description:
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/StoreWidgetApiService.java
......@@ -9,85 +9,186 @@ import com.gic.store.dto.StoreWidgetDTO;
import java.util.List;
/**
*
* @ClassName: StoreWidgetApiService
* @Description:
* @author zhiwj
* @date 2020-09-09 16:08
*/
public interface StoreWidgetApiService {
/** @Description: 保存门店选择器内容
* @author taogs
* @Date 18:49 2019/9/20
* @Param
* @return
*/
/**
* 保存门店选择器内容
* @Title: 保存门店选择器内容
* @Description:
* @author zhiwj
* @param storeWidgetDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> saveStoreWidget(StoreWidgetDTO storeWidgetDTO);
/** @Description: 保存权限门店选择器（管理员和联合商户专用）
* @author taogs
* @Date 18:49 2019/9/20
* @Param
* @return
*/
/**
* 保存权限门店选择器（管理员和联合商户专用）
* @Title: 保存权限门店选择器（管理员和联合商户专用）
* @Description:
* @author zhiwj
* @param storeWidgetDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> saveAuthStoreWidget(StoreWidgetDTO storeWidgetDTO);
/** @Description: 获取门店选择器内容
* @author taogs
* @Date 18:49 2019/9/20
* @Param
* @return
*/
/**
* getStoreWidget 获取门店选择器内容
* @Title: getStoreWidget
* @Description:
* @author zhiwj
* @param id
* @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.StoreWidgetDTO>
* @throws
*/
ServiceResponse<StoreWidgetDTO> getStoreWidget(Integer id);
/** @Description: 更新选择器的权限内容
* @author taogs
* @Date 18:50 2019/9/20
* @Param
* @return
*/
/**
* 更新选择器的权限内容
* @Title: updateAuth
* @Description:
* @author zhiwj
* @param storeWidgetDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> updateAuth(StoreWidgetDTO storeWidgetDTO);
/** @Description: 通过门店控件id查询门店
* @author taogs
* @Date 16:35 2019/12/4
* @Param
* @return
*/
/**
* 通过门店控件id查询门店
* @Title: listStoreByStoreWidgetId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @param pageNum
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.store.dto.StoreDTO>>
* @throws
*/
ServiceResponse<Page<StoreDTO>> listStoreByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId, int pageNum, int pageSize);
/**
* listStoreIdByStoreWidgetId
* @Title: listStoreIdByStoreWidgetId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @param pageNum
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<java.lang.Integer>>
* @throws
*/
ServiceResponse<Page<Integer>> listStoreIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId, int pageNum, int pageSize);
/**
* listStoreInfoIdByStoreWidgetId
* @Title: listStoreInfoIdByStoreWidgetId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @param pageNum
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<java.lang.Integer>>
* @throws
*/
ServiceResponse<Page<Integer>> listStoreInfoIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId, int pageNum, int pageSize);
/**
* listStoreIdByStoreWidgetId
* @Title: listStoreIdByStoreWidgetId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<java.lang.Integer>>
* @throws
*/
ServiceResponse<List<Integer>> listStoreIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId);
/**
* listStoreInfoIdByStoreWidgetId
* @Title: listStoreInfoIdByStoreWidgetId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<java.lang.Integer>>
* @throws
*/
ServiceResponse<List<Integer>> listStoreInfoIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId);
/**
* listBrandIdByStoreWidgetId
* @Title: listBrandIdByStoreWidgetId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreBrandDTO>>
* @throws
*/
ServiceResponse<List<StoreBrandDTO>> listBrandIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId);
/** @Description: 判断门店是否在门店控件里
* @author taogs
* @Date 11:03 2020/3/27
* @Param
* @return result true表示存在
*/
/**
* 判断门店是否在门店控件里
* @Title: exist
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @param storeId
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse exist(Integer enterpriseId, Integer storeWidgetId, Integer storeId);
/** @Description: 判断门店是否在门店控件里
* @author taogs
* @Date 11:03 2020/3/27
* @Param
* @return result true表示存在
/**
* exist 判断门店是否在门店控件里
* @Title: exist
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @param storeId
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse exist(String enterpriseId, Integer storeWidgetId, Integer storeId);
/** @Description: 判断门店是否在门店控件里
* @author taogs
* @Date 11:03 2020/3/27
* @Param
* @return result true表示存在
/**
* existByStoreInfoId 判断门店是否在门店控件里
* @Title: existByStoreInfoId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @param storeInfoId
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse existByStoreInfoId(Integer enterpriseId, Integer storeWidgetId, Integer storeInfoId);
/**
* getStoreColumnSet
* @Title: getStoreColumnSet
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeWidgetId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.StoreColumnSet>
* @throws
*/
ServiceResponse<StoreColumnSet> getStoreColumnSet(Integer enterpriseId, Integer storeWidgetId);
}
gic-store-api/src/main/java/com/gic/store/utils/StoreRedisKeyUtils.java
package com.gic.store.utils;
/**
*
* @ClassName: StoreRedisKeyUtils
* @Description:
* @author zhiwj
* @date 2020-09-09 16:05
*/
public class StoreRedisKeyUtils {
public static String getStoreFieldKey(Integer enterpriseId, Integer storeFieldId){
return "enterprise:store:storeField:"+enterpriseId+":"+storeFieldId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment