新需求调整

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -75,7 +75,8 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/notify",//微信支付所有回调放过
             "/api/refund/",//微信退款所有回调放过
             "/api/fadd/",//所有的法大大回调放过
-            "/api/third"
+            "/api/third",
+            "/api/third/redirect/"
     };
 
     /*

src/main/java/com/huiju/estateagents/third/controller/WxRedpackController.java

@@ -3,7 +3,6 @@ package com.huiju.estateagents.third.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.huiju.estateagents.third.entity.TaMpInfo;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaMpInfoService;
@@ -20,7 +19,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -45,27 +46,23 @@ public class WxRedpackController {
      * @return
      */
     @GetMapping("/third/redirect/{mpAppid}/greet")
-    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId, HttpServletRequest request) {
+    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId,@RequestParam String sponsorPersonId,@RequestParam String drainageId, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
-        TaMpPerson taMpPerson = new TaMpPerson();
+        Map<String,Object> map = new HashMap<>();
         try {
             //换取openid
             WxMpOAuth2AccessToken accessToken = wxService.oauth2getAccessToken(code);
             WxMpUser user = wxService.oauth2getUserInfo(accessToken, null);
 
-            //获取H5项目相关信息
-            String xAppid = request.getHeader("x-appid");
-             //获取小程序appid
-            String miniAppid = request.getHeader("appid");
             //插入公众号人员信息并插入表
-            taMpPerson = iTaThirdPartyMiniappConfigService.newMpPerson(user, mpAppid, xAppid, miniAppid, personId);
+            map = iTaThirdPartyMiniappConfigService.newMpPerson(user, mpAppid, drainageId, sponsorPersonId, personId);
         } catch (WxErrorException e) {
             e.printStackTrace();
         }
-        return ResponseBean.success(taMpPerson);
+        return ResponseBean.success(map);
     }
 
     private WxMpService getWxMpService() {
@@ -95,16 +92,15 @@ public class WxRedpackController {
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/participate")
-    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, HttpServletRequest request) {
+    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId,@RequestParam String drainageId, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
         //获取H5项目相关信息
-        String xAppid = request.getHeader("x-appid");
         QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
 
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", drainageId);
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
         if (null == taThirdPartyMiniappConfig){
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
@@ -126,22 +122,21 @@ public class WxRedpackController {
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/help")
-    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String parentMpPersonId ,HttpServletRequest request) {
+    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String sponsorPersonId,@RequestParam String drainageId, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
         //获取H5项目相关信息
-        String xAppid = request.getHeader("x-appid");
         QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
 
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", drainageId);
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
         if (null == taThirdPartyMiniappConfig){
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
         }
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, mpPersonId, parentMpPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, mpPersonId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
             return res;
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/third/service/ITaThirdPartyMiniappConfigService.java

@@ -2,10 +2,11 @@ package com.huiju.estateagents.third.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
+import java.util.Map;
+
 /**
  * <p>
  *   服务类
@@ -28,11 +29,11 @@ public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdParty
 	/**
 	 * 创建公众号人员并关联上小程序人员
 	 * @param user
-	 * @param xAppid
-	 * @param miniAppid
+	 * @param drainageId
+	 * @param sponsorPersonId
 	 * @param personId
 	 */
-	TaMpPerson newMpPerson(WxMpUser user, String mpAppid, String xAppid, String miniAppid, String personId);
+	Map<String,Object> newMpPerson(WxMpUser user, String mpAppid, String drainageId, String sponsorPersonId, String personId);
 
 	/**
 	 * 参加活动生成参与记录等
@@ -47,10 +48,10 @@ public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdParty
 	 * 助力活动接口
 	 * @param mpAppid
 	 * @param mpPersonId
-	 * @param parentMpPersonId
+	 * @param sponsorPersonId
 	 * @param targetId
 	 * @param orgId
 	 * @return
 	 */
-	ResponseBean helpActivity(String mpAppid, String mpPersonId, String parentMpPersonId, String targetId, Integer orgId);
+	ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String targetId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -11,6 +11,7 @@ import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
@@ -30,7 +31,9 @@ import org.springframework.stereotype.Service;
 
 import java.net.InetAddress;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -131,12 +134,13 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 	 * 创建公众号人员并关联上小程序人员
 	 *
 	 * @param user
-	 * @param xAppid
-	 * @param miniAppid
+	 * @param drainageId
+	 * @param sponsorPersonId
 	 * @param personId
 	 */
 	@Override
-	public TaMpPerson newMpPerson(WxMpUser user,String mpAppid, String xAppid, String miniAppid, String personId) {
+	public Map<String,Object> newMpPerson(WxMpUser user, String mpAppid, String drainageId, String sponsorPersonId, String personId) {
+		Map<String,Object> map = new HashMap<>();
 		//查询这个人员是否存在
 		TaMpPerson mpPerson = taMpPersonMapper.selectOne(new QueryWrapper<TaMpPerson>().eq("mp_openid", user.getOpenId()));
 		//不存在就新建
@@ -149,7 +153,6 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 			taMpPerson.setCreateDate(LocalDateTime.now());
 			taMpPerson.setHeadimgurl(user.getHeadImgUrl());
 			taMpPerson.setMpOpenid(user.getOpenId());
-			taMpPerson.setMpPersonId(personId);
 			taMpPerson.setNickname(user.getNickname());
 			taMpPerson.setProvince(user.getProvince());
 			taMpPerson.setSex(user.getSex());
@@ -167,7 +170,39 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 			taMpMiniappMapper.insert(taMpMiniapp);
 		}
 
-		return mpPerson;
+		//我的小程序信息
+		TaPerson minePerson = taPersonMapper.selectById(personId);
+		map.put("minePerson",minePerson);
+
+		//我要助力的人的小程序信息
+		if (StringUtils.isNotEmpty(sponsorPersonId)){
+			TaPerson parentPerson = taPersonMapper.selectById(sponsorPersonId);
+			map.put("parentPerson",parentPerson);
+		}
+
+		//第一步根据drainggeid查询出红包表对应的记录
+		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+		//第二步查询出这个H5对应的活动
+		TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+		//活动信息
+		map.put("taRedPacket",taRedPacket);
+
+		//是否我的红包助力报名信息
+		QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("activity_id",taRedPacket.getActivityId());
+		queryWrapper.eq("org_id",taRedPacket.getOrgId());
+		queryWrapper.eq("mp_person_id",taMpMiniapp.getMpPersonId());
+		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
+		TaRedPacketPerson mineRedPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
+		map.put("mineRedPacketPerson",mineRedPacketPerson);
+		//token
+		Map<Object, Object> tokenMap = new HashMap<>();
+		tokenMap.put("openId", user.getOpenId());
+		tokenMap.put("orgId", taRedPacket.getOrgId());
+		tokenMap.put("personId", taMpMiniapp.getMiniappPersonId());//小程序的personid
+		map.put("token", JWTUtils.newTokenByMap(tokenMap));
+
+		return map;
 	}
 
 	/**
@@ -236,13 +271,13 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 	 *
 	 * @param mpAppid 公众号appid
 	 * @param mpPersonId 公众号personId
-	 * @param parentMpPersonId 公众号被助力者的peisonId
+	 * @param sponsorPersonId 公众号发起人id
 	 * @param drainageId H5活动id
 	 * @param orgId 小程序id
 	 * @return
 	 */
 	@Override
-	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String parentMpPersonId, String drainageId, Integer orgId) {
+	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String drainageId, Integer orgId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
@@ -259,7 +294,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
 
 		//查询被助力者的绑定的小程序用户
-		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", parentMpPersonId));
+		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", sponsorPersonId));
 
 		//根据活动id查询这个活动的助力规则
 		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());