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

Merge #37 into master from cc_20251208_visit

Browse Source 
feat:拜访字段调整

* cc_20251208_visit: (19 commits squashed)

  - feat:拜访记录

  - fix:拜访详情接口新增字段

  - fix:新增状态转义字段

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix

  - fix:管理员能查看所有加盟商

  - fix:去掉部分字段非空校验

  - fix:空校验

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

  - fix

  - fix:拜访记录失效延时消息

  - fix:拜访记录统计

  - fix:拜访记录统计新增筛选条件

  - fix:字段转义

  - feat:拜访调整

  - feat:拜访调整_过滤我的

  - feat:拜访调整_过滤我的

  - feat:拜访字段调整

  - feat:拜访字段调整

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/37
This commit is contained in:
正新
2026-02-02 09:56:33 +00:00
parent 88e7d99f85
commit 83fcb84f9d
37 changed files with 1821 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,6 +373,11 @@ public enum ErrorCodeEnum {
TP_EXIST_PENDING_IMPORT_TASK(1810012, "存在导入中的任务，请稍后再试", null),
TP_NOT_EXIST_FORM_TYPE(1810013, "不存在该表单类型", null),
VISIT_RECORD_NOT_EXIST(1820001, "拜访记录不存在", null),
VISIT_RECORD_NOT_COMPLETE_EDIT(1820002, "未编辑拜访信息，无法签退", null),
VISIT_RECORD_INVALID(1820003, "拜访记录已失效", null),
VISIT_RECORD_NOT_YOUR_OWN(1820004, "非拜访人，无法操作", null),
VISIT_RECORD_COMPLETE(1820005, "已完成拜访", null),
CITY_PLANNING_EXISTS(1820001, "同年份同季度同省市已存在规划，不能重复添加", null),
;

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

@@ -37,7 +37,7 @@ public enum RocketMqGroupEnum {
SHOP_DECORATION_ASSIGN("shop_decoration_assign", new ArrayList<>(Arrays.asList(RocketMqTagEnum.DELAY_SHOP_DECORATION_ASSIGN))),
STORE_MASTER_ISSUE("store_master_issue", new ArrayList<>(Arrays.asList(RocketMqTagEnum.STORE_MASTER_ISSUE))),
VISIT_RECORD_INVALID("visit_record_invalid", new ArrayList<>(Arrays.asList(RocketMqTagEnum.VISIT_RECORD_INVALID))),
;
private final String group;

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

@@ -21,6 +21,7 @@ public enum RocketMqTagEnum {
STORE_USER_UPDATE("store_user_update", "门店信息人员变更同步菜品"),
DELAY_SHOP_DECORATION_ASSIGN("shop_decoration_assign","门店装修分配"),
STORE_MASTER_ISSUE("store_master_issue","门店主数据下发"),
VISIT_RECORD_INVALID("visit_record_invalid", "拜访记录失效"),
;

39
coolstore-partner-common/src/main/java/com/cool/store/enums/visit/VisitStatusEnum.java Normal file
View File

@@ -0,0 +1,39 @@
package com.cool.store.enums.visit;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* <p>
* 拜访记录状态枚举类
* </p>
*
* @author wangff
* @since 2025/12/8
*/
@Getter
@AllArgsConstructor
public enum VisitStatusEnum {
N_SIGN_IN(0, "待签到"),
N_SIGN_OUT(1, "待签退"),
COMPLETE(2, "已完成"),
INVALID(3, "已失效"),
;
private final Integer status;
private final String desc;
public static String getDescByStatus(Integer status) {
for (VisitStatusEnum value : values()) {
if (value.status.equals(status)) {
return value.desc;
}
}
return null;
}
}