Commit ff1e0f74 authored by hanfeng's avatar hanfeng

解决冲突

parents a7bf6735 3bd8bdd5
......@@ -25,11 +25,8 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
......@@ -53,6 +50,7 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
//用户报名
public ObjectRestResponse userBmOrQd(ActivityBm activityBm,Integer meepoUserId)throws Exception{
......@@ -278,4 +276,15 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
return activityBmExcels;
}
public ObjectRestResponse checkSubscribe(HttpServletRequest request){
int subscribe=-1;
User user=userBiz.getSession(request);
if (user!=null&&StringUtils.isNotBlank(user.getOpenId())){
subscribe=userBiz.checkSubscribe(user.getOpenId());
}
return ObjectRestResponse.succ(subscribe);
}
}
......@@ -191,6 +191,18 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
return null;
}
//判断用户是否关注过
public int checkSubscribe(String openId){
JSONObject userinfo_json=weixinService.getBaseUserInfo(openId);
int subscribe=0;
if (userinfo_json == null || StringUtils.isNotBlank(userinfo_json.getString("errcode"))) {
log.info("调用获取用户基本信息失败");
return subscribe;
}
subscribe=userinfo_json.getInteger("subscribe");
return subscribe;
}
......
......@@ -48,6 +48,13 @@ public class FrontActivityController extends BaseController<ActivityBiz, Activit
return activityBiz.checkQdlimits(latitude,longitude,activityId);
}
@GetMapping("app/unauth/subscribe")
public ObjectRestResponse subscribe(HttpServletRequest request){
return activityBmBiz.checkSubscribe(request);
}
......
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.xxfc.platform.summit.util.HttpRequestUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -20,6 +21,9 @@ public class WeixinService {
@Value("${wx.appSercet}")
private String wy_secret;
@Autowired
AccessTokenService tokenService;
public JSONObject getAccessToken(String code){
String url = "https://api.weixin.qq.com/sns/oauth2/access_token?";
......@@ -63,6 +67,12 @@ public class WeixinService {
return oauth_api;
}
public JSONObject getBaseUserInfo(String openid){
String url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + tokenService.getAccessTokenStr() + "&openid=" + openid + "&lang=zh_CN";
String result = HttpRequestUtil.httpGet(url);
JSONObject data = JSON.parseObject(result);
return data;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment