合并分支 'qa' 到 'master'

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

@@ -5,4 +5,5 @@ public class Constants {
      * UTF-8 字符集
      */
     public static final String UTF8 = "UTF-8";
+    public static final String REDIS_ACCESS_TOKEN = "promotion:cxminigram:access_token";
 }

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

@@ -5,4 +5,8 @@ public class WechatConstants {
      * 订阅消息模板ID
      */
     public static final String SUBSCRIBE_MESSAGE_TEMPLATE_ID = "YFwoiRVs26WEJ59k9yjIkh6NlV0PgtWoy_L9GYbkZUw";
-}
+    /**
+     * 随机任务跳转页面
+     */
+    public static final String RANDOM_TASK_URL = "/pages/mine/index";
+ }

src/main/java/com/wangxiaolu/promotion/common/enums/FlagType.java

+package com.wangxiaolu.promotion.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-08-05 15
+ * @describe :
+ */
+@AllArgsConstructor
+@Getter
+public enum FlagType {
+
+    /**
+     * 有效
+     */
+    YES(1),
+    NO(0),
+    ;
+
+     private Integer type;
+
+}

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

@@ -9,7 +9,9 @@ import com.wangxiaolu.promotion.result.basedata.RCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
  * @describe : 统一异常处理
  */
 
+//@ControllerAdvice
 @RestControllerAdvice
 @Slf4j
 public class ControllerExceptionAdvice {
@@ -29,6 +32,12 @@ public class ControllerExceptionAdvice {
         return new R(e.getCode(), e.getMsg());
     }
 
+    @ExceptionHandler({IllegalArgumentException.class})
+    public R paramExceptionHandler(IllegalArgumentException e) {
+        log.error("参数异常2: {}", e);
+        return new R(HttpStatus.BAD_REQUEST.value(), e.getMessage());
+    }
+
     @ExceptionHandler({FlowException.class})
     public R flowExceptionHandler(FlowException e) {
         log.error("流量异常: {}", e);

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

@@ -54,7 +54,7 @@ public enum RCode implements StatusCode {
     WX_OPENID_PARAM_ERROR(3012, "微信登录错误，请退出小程序重新登录"),
     NOT_AVATAR_URL_PARAM_ERROR(3013, "请上传头像"),
     NOT_USER_NAME_PARAM_ERROR(3014, "姓名不可为空"),
-    USER_WXOPENID_UNIQUE_ERROR(3015, "已使用其他手机号注册"),
+    USER_WXOPENID_UNIQUE_ERROR(3015, "此微信已绑定其他手机号"),
     LOGIN_PHONE_PARAM_ERROR(3016, "手机号错误"),
     NOT_LOGIN_TIMEOUT_ERROR(3017, "您的登录已过期，请重新登录"),
     EMP_PRIVILEGE_ERROR(3018, "账号权限错误"),
@@ -92,6 +92,7 @@ public enum RCode implements StatusCode {
     LOGIN_PHONE_COUNT_MUCH(4025, "获取手机号超过5次，请手动填写"),
     QINCE_STORE_DEALER_ERROR(4026, "所属经销商与修改前不一致，请重新选择"),
     ACTIVITY_PLAN_DATETIME_ERROR(4027, "时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；"),
+    NOT_POS_TASK_PHOTO_ERROR(4028, "不拍 POS 照场次费用扣减 10 "),
 
 
     /**