Преглед на файлове

领取奖励,拦截已领取的情况

ZhangWenQiang преди 6 години
родител
ревизия
77c3805cbe

+ 1 - 0
happy-job-base-common/src/main/java/com/jeeplus/modules/utils/ErrorCode.java

@@ -34,6 +34,7 @@ public interface ErrorCode {
     final int code_1026 = 1026;    //兑换时间结束啦~
     final int code_1026 = 1026;    //兑换时间结束啦~
     final int code_1027 = 1027;    //您慢了一步,已经被抢完了哦~
     final int code_1027 = 1027;    //您慢了一步,已经被抢完了哦~
     final int code_1028 = 1028;    //钱余额不足
     final int code_1028 = 1028;    //钱余额不足
+    final int code_1029 = 1029;    //您已领取奖励,请勿重复领取
     final int code_2006 = 2006; // 操作数据失败
     final int code_2006 = 2006; // 操作数据失败
     final int code_2007 = 2007; // 数据不存在
     final int code_2007 = 2007; // 数据不存在
     final int code_2008 = 2008;   //用户信息验证失败或token失效
     final int code_2008 = 2008;   //用户信息验证失败或token失效

+ 2 - 0
happy-job-module-hpvip/src/main/java/com/jeeplus/modules/api/jifenmanager/MpPointControllerAPI.java

@@ -147,6 +147,8 @@ public class MpPointControllerAPI extends BaseAppController {
                 obj = errorResult(ErrorCode.code_2008, "用户信息验证失败");
                 obj = errorResult(ErrorCode.code_2008, "用户信息验证失败");
             } else if ("2010".equals(returnMap.get("success"))) {
             } else if ("2010".equals(returnMap.get("success"))) {
                 obj = errorResult(ErrorCode.code_2010, Global.getNoLogin());
                 obj = errorResult(ErrorCode.code_2010, Global.getNoLogin());
+            } else if ("1029".equals(returnMap.get("success"))) {
+                obj = errorResult(ErrorCode.code_1029, "您已领取奖励,请勿重复领取");
             } else {
             } else {
                 obj = successResult(ErrorCode.code_1000, "领取成功", returnMap);
                 obj = successResult(ErrorCode.code_1000, "领取成功", returnMap);
             }
             }

+ 18 - 3
happy-job-module-hpvip/src/main/java/com/jeeplus/modules/jfmanager/service/MpPointsDetailService.java

@@ -8,12 +8,12 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.api.moneymanager.entity.MpMemberAccountAPI;
 import com.jeeplus.modules.api.moneymanager.entity.MpMemberAccountAPI;
-import com.jeeplus.modules.hpposition.entity.HpFulltimePosition;
 import com.jeeplus.modules.hpuser.entity.*;
 import com.jeeplus.modules.hpuser.entity.*;
 import com.jeeplus.modules.hpuser.mapper.HpApplyPositionMapper;
 import com.jeeplus.modules.hpuser.mapper.HpApplyPositionMapper;
 import com.jeeplus.modules.hpuser.mapper.HpFavoritePositionMapper;
 import com.jeeplus.modules.hpuser.mapper.HpFavoritePositionMapper;
 import com.jeeplus.modules.hpuser.mapper.HpInterviewInviteMapper;
 import com.jeeplus.modules.hpuser.mapper.HpInterviewInviteMapper;
-import com.jeeplus.modules.hpuser.service.*;
+import com.jeeplus.modules.hpuser.service.HpResumeService;
+import com.jeeplus.modules.hpuser.service.HpResumeWorkExperienceService;
 import com.jeeplus.modules.jfmanager.entity.MpPointRuleSetting;
 import com.jeeplus.modules.jfmanager.entity.MpPointRuleSetting;
 import com.jeeplus.modules.jfmanager.entity.MpPointsDetail;
 import com.jeeplus.modules.jfmanager.entity.MpPointsDetail;
 import com.jeeplus.modules.jfmanager.mapper.MpPointsDetailMapper;
 import com.jeeplus.modules.jfmanager.mapper.MpPointsDetailMapper;
@@ -387,11 +387,26 @@ public class MpPointsDetailService extends CrudService<MpPointsDetailMapper, MpP
         String userToken = requestMap.get("user_token");
         String userToken = requestMap.get("user_token");
         String memberId = requestMap.get("member_id");
         String memberId = requestMap.get("member_id");
         String taskId = requestMap.get("taskId");
         String taskId = requestMap.get("taskId");
-        String taskType = requestMap.get("taskType");
+        String taskType = requestMap.get("taskType");    //任务类型(0:新手任务 1:日常任务)
         //验证用户是否处于登录态
         //验证用户是否处于登录态
         if (TokenUtil.validateLogin(memberId, userId)) {
         if (TokenUtil.validateLogin(memberId, userId)) {
             //验证用户合法性
             //验证用户合法性
             if (TokenUtil.validateToken(userId, userToken)) {
             if (TokenUtil.validateToken(userId, userToken)) {
+                if ("0".equals(taskType)) {
+                    //查询有没有领取该新手任务奖励
+                    int count1 = mapper.getCountForNewTask(taskId, memberId);
+                    if (count1 > 0) {
+                        returnMap.put("success", "1029");
+                        return returnMap;
+                    }
+                } else if ("1".equals(taskType)) {
+                    //查询当天日常任务是否已领取奖励
+                    int count2 = mapper.getCountForCurrentBrower(taskId, memberId);
+                    if (count2 > 0) {
+                        returnMap.put("success", "1029");
+                        return returnMap;
+                    }
+                }
                 MpMemberAccount mpMemberAccount = mpMemberAccountMapper.getByMemberId(memberId);
                 MpMemberAccount mpMemberAccount = mpMemberAccountMapper.getByMemberId(memberId);
                 MpTaskSetting mpTaskSetting = mpTaskSettingService.get(taskId);
                 MpTaskSetting mpTaskSetting = mpTaskSettingService.get(taskId);
                 mpMemberAccount.setPointsBalance(mpMemberAccount.getPointsBalance() + mpTaskSetting.getPoints());
                 mpMemberAccount.setPointsBalance(mpMemberAccount.getPointsBalance() + mpTaskSetting.getPoints());