123

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java

@@ -156,26 +156,26 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
                     ObjectRestResponse restResponse=userBmOrQd(activityBm,userId);
                     if (restResponse.getStatus()==RestCode.SUCCESS.getStatus()){
                         log.info("-----userBmByKey---key已存在去报名/签到----报名/签到成功");
-                        if (activityBm.getBmStatus()==1){
+                        if (activityBm.getBmStatus()!=null&&activityBm.getBmStatus()==1){
                             jsonObject.put("isbm",1);
                             jsonObject.put("bmStatus",1);
-                        }else if (activityBm.getQdStatus()==1){
+                        }else if (activityBm.getQdStatus()!=null&&activityBm.getQdStatus()==1){
                             jsonObject.put("isqd",1);
                             jsonObject.put("qdStatus",1);
                         }
                     }else if (restResponse.getStatus()==ResultCode.EXIST_CODE){
                         log.info("-----userBmByKey---key已存在已报名/签到----");
-                        if (activityBm.getBmStatus()==1){
+                        if (activityBm.getBmStatus()!=null&&activityBm.getBmStatus()==1){
                             jsonObject.put("isbm",1);
-                        }else if (activityBm.getQdStatus()==1){
+                        }else if (activityBm.getQdStatus()!=null&&activityBm.getQdStatus()==1){
                             jsonObject.put("isqd",1);
                         }
                         jsonObject.put("value",activityBm);
                     } else {
                         log.info("-----userBmByKey---key已存在去报名/签到----报名/签到失败");
-                        if (activityBm.getBmStatus()==1){
+                        if (activityBm.getBmStatus()!=null&&activityBm.getBmStatus()==1){
                             jsonObject.put("bmStatus",2);
-                        }else if (activityBm.getQdStatus()==1){
+                        }else if (activityBm.getQdStatus()!=null&&activityBm.getQdStatus()==1){
                             jsonObject.put("qdStatus",2);
                         }
                         jsonObject.put("value",activityBm);

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/MeepoUserQdBiz.java

@@ -52,7 +52,9 @@ public class MeepoUserQdBiz extends BaseBiz<MeepoUserQdMapper, MeepoUserQd> {
         meepoUserQd.setWeId(weId);
         meepoUserQd.setCreateTime(System.currentTimeMillis()/1000L);
         insertSelective(meepoUserQd);
-
+        user.setQdStatus(1);
+        userBiz.updateSelectiveById(user);
+        log.info("----签到成功---meepoUserId==="+meepoUserId);
     }