From f3284c11f6df63790232511bc4f47dbf5fa45ff6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 31 Dec 2024 17:32:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java
index 22cf198d..48115bc1 100644
--- a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java
+++ b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java
@@ -23,8 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 public class AppApiMethodAspect {
 
     @Pointcut("!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) " +
-            "&& (execution(public * (com.sqx.modules.*.controller.*).*(..)) " +
-            "||  execution(public * (com.sqx.modules.app.*.controller.*).*(..)))")
+            "&& execution(public * (com.sqx.modules.*.controller..*).*(..)))")
     public void pkg() {
     }
 

From dcaf258e9a9d194cc811cc5aac8d629863dfb506 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 31 Dec 2024 17:44:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskCenter/service/impl/TaskCenterServiceImpl.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
index 1317a230..638bf400 100644
--- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
+++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
@@ -217,9 +217,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
             }
         } else if (taskCenter.getType().equals(3) && taskCenter.getId().equals(1L)) {
             InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId);
-
+            Integer sumOrderNum = 0;
+            if (inviteAchievement != null) {
+                sumOrderNum = inviteAchievement.getCount();
+            }
 //            Integer sumOrderNum = ordersService.countOrderNum(userId, null);
-            Integer sumOrderNum = inviteAchievement.getCount();
             if (sumOrderNum != null && sumOrderNum < taskCenter.getNumber()) {
                 return Result.error("领取失败，未达成领取条件");
             } else if (recordService.countTaskNum(userId, taskCenter.getId(), null) > 0) {

From ab24effd0f32681c7dd203a58d6e6c142c07ef52 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Wed, 1 Jan 2025 19:42:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/service/impl/UserServiceImpl.java        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
index d9b3425d..b0dab570 100644
--- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
@@ -907,13 +907,17 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             if (StringUtils.isEmpty(msg)) {
                 return Result.error("验证码不能为空！");
             }
-            Msg msg1 = null;
-            if (!"prod".equals(profiles) && !"61626364".equals(msg)) {
-                msg1 = msgDao.findByPhoneAndCode(phone, msg);
-                if (msg1 == null) {
-                    return Result.error("验证码不正确！");
-                }
+            Msg msg1 = msgDao.findByPhoneAndCode(phone, msg);
+            if (msg1 == null) {
+                return Result.error("验证码不正确！");
             }
+//            Msg msg1 = null;
+//            if (!"prod".equals(profiles) || !"61626364".equals(msg)) {
+//                msg1 = msgDao.findByPhoneAndCode(phone, msg);
+//                if (msg1 == null) {
+//                    return Result.error("验证码不正确！");
+//                }
+//            }
 
             userInfo = new UserEntity();
             UserEntity userEntity = null;