Merge #34 into master from cc_20260116_new_field

fix:加盟合同新增字段推送红圈通

* cc_20260116_new_field: (5 commits squashed)

  - fix:加盟合同新增字段

  - fix:加盟合同新增字段

  - Merge branch 'refs/heads/master' into cc_20260116_new_field
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

  - fix:加盟合同新增字段推送红圈通

  - Merge branch 'master' into cc_20260116_new_field
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/34
This commit is contained in:
王非凡
2026-01-23 08:37:13 +00:00
committed by 正新
parent 10dca9bf9b
commit 3206a20dd6
12 changed files with 330 additions and 4 deletions

View File

@@ -0,0 +1,16 @@
package com.cool.store.constants;
/**
* <p>
* 字典表常量池
* </p>
*
* @author wangff
* @since 2026/1/19
*/
public class DictConstants {
/**
* 装修设计要求-统一装修设计
*/
public static final String DECORATION_REQUIREMENT_UNIFORM = "decoration_requirement_uniform";
}

View File

@@ -334,6 +334,7 @@ public enum ErrorCodeEnum {
WALLET_API_ERROR(1620003,"{0}",null),
MINI_PROGRAM_VERSION_TOO_LOW(1620004,"小程序版本过低,请刷新小程序再操作!",null),
CONTRACT_SIGNED(600002, "操作失败,合同签约已完成", null),
ZXJP_AMOUNT_INSTRUCTION_IS_BLANK(1620005, "鸡排价格不为10元请填写原因", null),
// 171闭店
CLOSE_STORE_SUB_STAGE_ERROR(171002, "当前流程状态异常", null),

View File

@@ -0,0 +1,45 @@
package com.cool.store.enums.HqtEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* <p>
* 红圈通装修等级枚举类
* </p>
*
* @author wangff
* @since 2026/1/19
*/
@Getter
@AllArgsConstructor
public enum HqtDecorationLevelEnum {
OPTION713("option713", "旗舰店", "decoration_level_flagship_store"),
OPTION714("option714", "A标店", "decoration_level_a_standard"),
OPTION715("option715", "标准店", "decoration_level_standard_store"),
;
/**
* 红圈通编码
*/
private final String code;
/**
* 描述
*/
private final String msg;
/**
* 字典项编码
*/
private final String columnCode;
public static HqtDecorationLevelEnum getByColumnCode(String columnCode) {
for (HqtDecorationLevelEnum value : HqtDecorationLevelEnum.values()) {
if (value.columnCode.equals(columnCode)) {
return value;
}
}
return null;
}
}

View File

@@ -0,0 +1,46 @@
package com.cool.store.enums.HqtEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* <p>
* 红圈通装修设计要求枚举类
* </p>
*
* @author wangff
* @since 2026/1/19
*/
@Getter
@AllArgsConstructor
public enum HqtDecorationReqEnum {
OPTION716("option716", "统一装修设计", "decoration_requirement_uniform"),
OPTION717("option717", "设备减少", "decoration_requirement_equipment"),
OPTION718("option718", "其他", "decoration_requirement_other"),
;
/**
* 红圈通编码
*/
private final String code;
/**
* 描述
*/
private final String msg;
/**
* 字典项编码
*/
private final String columnCode;
public static HqtDecorationReqEnum getByColumnCode(String columnCode) {
for (HqtDecorationReqEnum value : HqtDecorationReqEnum.values()) {
if (value.columnCode.equals(columnCode)) {
return value;
}
}
return null;
}
}

View File

@@ -0,0 +1,46 @@
package com.cool.store.enums.HqtEnum;
import com.cool.store.enums.StoreTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* <p>
* 红圈通门店类型枚举类
* </p>
*
* @author wangff
* @since 2026/1/19
*/
@Getter
@AllArgsConstructor
public enum HqtStoreTypeEnum {
OPTION710("option710", "无展示门店", StoreTypeEnum.NO_SHOW_STORE),
OPTION711("option711", "餐厅店", StoreTypeEnum.RESTAURANT_STORE),
OPTION712("option712", "普通门店", StoreTypeEnum.ORDINARY_STORE),
;
/**
* 红圈通编码
*/
private final String code;
/**
* 描述
*/
private final String msg;
/**
* 门店类型
*/
private final StoreTypeEnum type;
public static HqtStoreTypeEnum getByStoreType(Integer type) {
for (HqtStoreTypeEnum value : HqtStoreTypeEnum.values()) {
if (value.type.getCode().equals(type)) {
return value;
}
}
return null;
}
}