suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250211_v2.6

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
This commit is contained in:
shuo.wang
2025-02-14 16:18:00 +08:00
parent 212a1b6c1c 0a8951dab4
commit 71db4d6e6e
105 changed files with 3388 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -79,7 +79,7 @@ public enum ErrorCodeEnum {
NO_TRANSFER_REQUIRED(500013, "招商经理现有私海线索无需转让，请检查后重试！", null),
NO_BATCH_TRANSFER_REQUIRED(500014, "已选线索包含此招商经理现有私海线索，无需转让，请检查后重试!", null),
PARTNER_MOBILE_EXIST(500010, "手机号码已存在，请核实！", null),
MOBILE_EXIST(500015, "此手机号码已存在，请修改后重试", null),
MOBILE_EXIST(500015, "此手机号码已存在，线索所属列表：{0}，督导：{1}，创建日期：{2}", null),
INVESTMENT_MANAGER_NOT_EXIST(500016, "当前招商经理不存在", null),
PARTNER_MOBILE_EXIST_0(500017, "手机号码已存在", null),
TIME_OCCUPIED(500018, "预约时间被占用", null),
@@ -200,6 +200,8 @@ public enum ErrorCodeEnum {
INVOICING_EXIST(109016, "当前门店发票信息已存在！", null),
SHOP_STATUS_NOT_SUPPORT_HANDLER(109016, "当前门店状态为:{0},不能进行结束跟进操作", null),
INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null),
INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null),
@@ -229,7 +231,8 @@ public enum ErrorCodeEnum {
UPDATE_FAIL(131000,"修改失败，表单不存在！",null),
LICENSE_LEGAL_STAGE_FAIL(131001,"营业执照阶段未上传！",null),
GET_JURIDICAL_ID_CARD_NO_FAIL(131002,"获取法人身份证信息失败！",null)
GET_JURIDICAL_ID_CARD_NO_FAIL(131002,"获取法人身份证信息失败！",null),
UPDATE_INVESTMENT_MANAGER_FAIL(131005,"当前用户已经为该门店招商经理",null)
;

1
coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
View File

@@ -14,6 +14,7 @@ public enum FileTypeEnum {
MY_FRANCHISEES("my_franchisees","我的加盟商"),
TEAM_FRANCHISEES("team_franchisees","团队加盟商"),
PREPARATION("preparation","进度管理"),
BRANCH_SHOP_LIST("branchShopList","开店管理")
;
private String fileType;
private String desc;

24
coolstore-partner-common/src/main/java/com/cool/store/enums/FollowLogTypeEnum.java Normal file
View File

@@ -0,0 +1,24 @@
package com.cool.store.enums;
/**
* @Author: WangShuo
* @Date: 2025/01/07/下午2:18
* @Version 1.0
* @注释:
*/
public enum FollowLogTypeEnum {
LINE(1,"线索"),
SHOP(2,"门店");
private int code;
private String desc;
private FollowLogTypeEnum(int code, String desc) {
this.code = code;
this.desc = desc;
}
public int getCode() {
return code;
}
public String getDesc() {
return desc;
}
}

26
coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java
View File

@@ -1,4 +1,13 @@
package com.cool.store.enums;/**
package com.cool.store.enums;
import com.cool.store.utils.StringUtil;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author: WangShuo
* @Date: 2024/11/04/下午7:00
* @Version 1.0
@@ -23,4 +32,19 @@ public enum FranchiseBrandEnum {
public String getDesc() {
return desc;
}
public static String getDescByCode(String code) {
if (StringUtils.isBlank(code)){
return null;
}
List<Integer> integerList = Arrays.stream(code.split(","))
.map(Integer::parseInt)
.collect(Collectors.toList());
StringBuffer stringBuffer = new StringBuffer();
for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
if (integerList.contains(e.getCode())) {
stringBuffer.append(e.getDesc()).append(",");
}
}
return stringBuffer.toString();
}
}

36
coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.enums;
/**
* @Author: WangShuo
* @Date: 2025/01/08/下午5:51
* @Version 1.0
* @注释:
*/
public enum JoinModeEnum {
FRANCHISE_DEPARTMENT(1,"社会加盟模式/加盟部加盟店"),
FRANCHISE_COMPANIES(2,"强加盟模式/加盟公司加盟店"),
OWN_STORE(3,"加盟公司自有店");
private int code;
private String desc;
private JoinModeEnum(int code, String desc) {
this.code = code;
this.desc = desc;
}
public int getCode() {
return code;
}
public String getDesc() {
return desc;
}
public static String getByCode(Integer code) {
if (code == null){
return null;
}
for (JoinModeEnum e : JoinModeEnum.values()) {
if (e.getCode() == code) {
return e.desc;
}
}
return null;
}
}

3
coolstore-partner-common/src/main/java/com/cool/store/enums/OperationLogTypeEnum.java
View File

@@ -9,7 +9,8 @@ public enum OperationLogTypeEnum {
TRANSFER_INVESTMENT_MANAGER(1, "转让招商经理_线索"),
ENTRUST_INTERVIEW(2, "委托面试"),
TRANSFER_INVESTMENT_MANAGER_3(3, "转让招商经理_加盟商");
TRANSFER_INVESTMENT_MANAGER_3(3, "转让招商经理_加盟商"),
TRANSFER_INVESTMENT_MANAGER_4(4, "转让招商经理_门店");
private final int code;
private final String description;

1
coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
View File

@@ -43,6 +43,7 @@ public enum UserRoleEnum {
TENT_PASS_CUSTOMER(380000000L,"营帐通客服"),
DESIGN_CUSTOMER(390000000L,"设计客服"),
CONSTRUCTION_CUSTOMER(400000000L,"施工客服"),
BRANCH_OFFICE(1724233283449L,"分布内勤"),
;
private Long code;

33
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopStatusEnum.java Normal file
View File

@@ -0,0 +1,33 @@
package com.cool.store.enums.point;
/**
* @Author: WangShuo
* @Date: 2025/01/08/下午3:54
* @Version 1.0
* @注释:
*/
public enum ShopStatusEnum {
ING(0,"跟进中"),
DONE(1,"已完成"),
ABANDON(2,"已放弃");
private int code;
private String desc;
private ShopStatusEnum(int code, String desc) {
this.code = code;
this.desc = desc;
}
public int getCode() {
return code;
}
public String getDesc() {
return desc;
}
public static String getDesc(int code){
for (ShopStatusEnum shopStatusEnum:ShopStatusEnum.values()){
if (shopStatusEnum.getCode()==code){
return shopStatusEnum.getDesc();
}
}
return null;
}
}