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

Merge branch 'master' into cc_20250526_jingDong

Browse Source 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
This commit is contained in:
shuo.wang
2025-05-27 13:51:36 +08:00
parent 3a17363c7c 865cfdc857
commit 68be3ba4d1
27 changed files with 333 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -279,4 +279,6 @@ public class RedisConstant {
public static final String YUN_XUE_TANG_ACCESS_TOKEN = "yun_xue_tang_access_token_";
public static final String SUBMIT_BUILD_KEY = "submit_build_key_";
public static final String GET_AI_MODULE = "get_ai_module_";
}

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

@@ -65,6 +65,8 @@ public enum UserRoleEnum {
BRAND_HEAD(490000000L,"品牌负责人"),
QW_SUPERVISION(1725431698852L,"企微督导"),
JING_DONG_OPERATIONS_CUSTOMER(500000000L,"京东运营大区客服"),
JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"),
;

3
coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java
View File

@@ -109,5 +109,8 @@ public class RedisConstantUtil {
public String submitBuildKey(Long shopId){
return active + "_" + RedisConstant.SUBMIT_BUILD_KEY + eid + ":" + shopId ;
}
public String getAiModuleKey(){
return active + "_" + RedisConstant.GET_AI_MODULE + eid;
}
}