czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
GYJ
2025-01-01 19:47:55 +08:00
parent bce5111fed ab24effd0f
commit 9624a3350d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java
View File

@@ -23,8 +23,7 @@ import javax.servlet.http.HttpServletRequest;
public class AppApiMethodAspect { public class AppApiMethodAspect {
@Pointcut("!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) " + @Pointcut("!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) " +
"&& (execution(public * (com.sqx.modules.*.controller.*).*(..)) " + "&& execution(public * (com.sqx.modules.*.controller..*).*(..)))")
"|| execution(public * (com.sqx.modules.app.*.controller.*).*(..)))")
public void pkg() { public void pkg() {
} }

16
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@@ -907,13 +907,17 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
if (StringUtils.isEmpty(msg)) { if (StringUtils.isEmpty(msg)) {
return Result.error("验证码不能为空！"); return Result.error("验证码不能为空！");
} }
Msg msg1 = null; Msg msg1 = msgDao.findByPhoneAndCode(phone, msg);
if (!"prod".equals(profiles) && !"61626364".equals(msg)) { if (msg1 == null) {
msg1 = msgDao.findByPhoneAndCode(phone, msg); return Result.error("验证码不正确！");
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(); userInfo = new UserEntity();
UserEntity userEntity = null; UserEntity userEntity = null;

6
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -217,9 +217,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
} }
} else if (taskCenter.getType().equals(3) && taskCenter.getId().equals(1L)) { } else if (taskCenter.getType().equals(3) && taskCenter.getId().equals(1L)) {
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId); InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId);
Integer sumOrderNum = 0;
if (inviteAchievement != null) {
sumOrderNum = inviteAchievement.getCount();
}
// Integer sumOrderNum = ordersService.countOrderNum(userId, null); // Integer sumOrderNum = ordersService.countOrderNum(userId, null);
Integer sumOrderNum = inviteAchievement.getCount();
if (sumOrderNum != null && sumOrderNum < taskCenter.getNumber()) { if (sumOrderNum != null && sumOrderNum < taskCenter.getNumber()) {
return Result.error("领取失败，未达成领取条件"); return Result.error("领取失败，未达成领取条件");
} else if (recordService.countTaskNum(userId, taskCenter.getId(), null) > 0) { } else if (recordService.countTaskNum(userId, taskCenter.getId(), null) > 0) {