Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -92,7 +92,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
         return userId;
     }
 
-    public  void  authUser(String code,String key, HttpServletRequest request){
+    public  void  authUser(String code,String key,Integer activityId, HttpServletRequest request){
         if (StringUtils.isBlank(code)){
             log.info("----code为空---");
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
@@ -125,12 +125,14 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
                 throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("调用微信用户基本信息接口失败"));
             }
             log.info("微信用户基本信息---user===" +userinfo_json.toJSONString());*/
+          if (activityId==null||activityId==0){
               ActivityBm activityBm=activityBmBiz.userInfo(key);
               if (activityBm==null){
                   log.info("redis的报名信息为空");
                   throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("redis的报名信息为空"));
               }
-            Integer activityId=activityBm.getActivityId();
+              activityId=activityBm.getActivityId();
+          }
             if (activityId==null||activityId==0){
                 log.info("redis的报名信息activityId---为空");
                 throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("redis的报名信息activityId---为空"));

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java

@@ -82,10 +82,18 @@ public class WeixinController {
                 callback=params[0];
                 key= RedisKey.CONSTANT_CODE_PREFIX+params[1];
             }
-            log.info("-----微信回调userInfo---key=="+key+"----callback==="+callback);
-            userBiz.authUser(code,key,request);
+             params=callback.split("_");
+            Integer activityId=0;
+            if (params.length>1){
+                callback=params[0];
+                activityId=Integer.parseInt(params[1]);
+            }
+            log.info("-----微信回调userInfo---key=="+key+"----activityId==="+activityId+"----callback==="+callback);
+            userBiz.authUser(code,key,activityId,request);
             //callback =new String(Base64.decode(callback), "utf-8");
+            if (StringUtils.isNotBlank(key)){
                 callback+="&key="+key;
+            }
             log.info("callback===" + callback);
             return  String.format("redirect:"+callback);
         }catch (Exception e){