修改返回异常信息

src/main/java/com/wangxiaolu/promotion/common/constant/ServiceNameConstants.java

+package com.wangxiaolu.promotion.common.constant;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-05-27 19
+ * @describe :
+ */
+public class ServiceNameConstants {
+
+    public static final String WXL_SFA_OPERATION_SERVICE = "wangxiaolu-sfa-operation";
+}

src/main/java/com/wangxiaolu/promotion/result/advice/ControllerExceptionAdvice.java

@@ -4,16 +4,14 @@ import com.wangxiaolu.promotion.exception.APIException;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.exception.FlowException;
 import com.wangxiaolu.promotion.exception.ParamException;
-import com.wangxiaolu.promotion.result.basedata.RCode;
 import com.wangxiaolu.promotion.result.basedata.R;
+import com.wangxiaolu.promotion.result.basedata.RCode;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import java.sql.SQLIntegrityConstraintViolationException;
-
 /**
  * @author : liqiulin
  * @date : 2024-03-28 19
@@ -25,22 +23,22 @@ public class ControllerExceptionAdvice {
 
     @ExceptionHandler({ParamException.class})
     public R paramExceptionHandler(ParamException e) {
-        return new R(e.getCode(), e.getMsg(), e.getMessage());
+        return new R(e.getCode(), e.getMsg());
     }
 
     @ExceptionHandler({FlowException.class})
     public R flowExceptionHandler(FlowException e) {
-        return new R(e.getCode(), e.getMsg(), e.getMessage());
+        return new R(e.getCode(), e.getMsg());
     }
 
     @ExceptionHandler({APIException.class})
     public R apiExceptionHandler(APIException e) {
-        return new R(e.getCode(), e.getMsg(), e.getMessage());
+        return new R(e.getCode(), e.getMsg());
     }
 
     @ExceptionHandler({DataException.class})
     public R dataExceptionHandler(DataException e) {
-        return new R(e.getCode(), e.getMsg(), e.getMessage());
+        return new R(e.getCode(), e.getMsg());
     }
 
     @ExceptionHandler({MethodArgumentNotValidException.class})
@@ -51,8 +49,7 @@ public class ControllerExceptionAdvice {
 
     @ExceptionHandler({DataIntegrityViolationException.class})
     public R dataIntegrityViolationExceptionHandler(DataIntegrityViolationException e) {
-        String msg = e.getMessage();
-        return new R(RCode.API_DATA_ERROR.getCode(), RCode.API_DATA_ERROR.getMsg(), msg);
+        return new R(RCode.API_DATA_ERROR.getCode(), RCode.API_DATA_ERROR.getMsg());
     }
 
     @ExceptionHandler({TooManyResultsException.class})

src/main/java/com/wangxiaolu/promotion/result/basedata/RCode.java

@@ -90,6 +90,7 @@ public enum RCode implements StatusCode {
     QINCE_STORE_CODE_ERROR(4023, "编码或店名错误，请与勤策保持一致"),
     QINCE_STORE_DEALER_ID_ERROR(4024, "经销商错误，请与勤策保持一致"),
     LOGIN_PHONE_COUNT_MUCH(4025, "获取手机号超过5次，请手动填写"),
+    QINCE_STORE_DEALER_ERROR(4026, "所属经销商与修改前不一致，请重新选择"),
 
 
     /**
@@ -102,7 +103,7 @@ public enum RCode implements StatusCode {
     ACTIVITY_PLAN_TEM_ERROR(5003,"当前流程模板错误；"),
     ACTIVITY_PLAN_REPETITION_ERROR(5004,"活动计划列表中，有日期重复的计划；"),
     ACTIVITY_PLAN_NOT_SELF_DELETE(5005,"以前计划/非归属本人计划，不可删除；"),
-    ACTIVITY_PLAN_NOT_DELETE(5005,"今日计划，只能在早上10点前删除；"),
+    ACTIVITY_PLAN_NOT_DELETE(5005,"不可修改今日及以前活动；"),
     ACTIVITY_PLAN_EXECUTE_ERROR(5006,"门店系统名称、经销商不可为空，请到勤策中修改；"),
     ACTIVITY_PLAN_EMPLOYEE_ERROR(5007,"计划归属人只能是城市经理；"),
     ACTIVITY_PLAN_IS_NULL(5008,"促销计划不存在；"),
@@ -110,6 +111,10 @@ public enum RCode implements StatusCode {
     NEXT_MONTH_PLAN_CREATE_ERROR(5010, "只可创建次月计划；"),
     ACTIVITY_PLAN_EMPLOYEE_CREATE(5011, "只能创建自己的计划；"),
     FUNCTION_RESTRICT_ERROR(5012, "功能受限，请联系管理员；"),
+    ACTIVITY_IS_START(5013,"计划已被促销员执行；"),
+    ACTIVITY_ID_IS_START(5014,"「%s」号计划已被促销员执行；"),
+    ACTIVITY_PLAN_ID_NOT_DELETE(5015,"「%s」号已超上班时间1小时，不可修改；"),
+    ACTIVITY_PLAN_DATA_ERROR(5016,"活动日期必需是次日 至 月底"),
 
 
     /**