新需求

src/main/java/com/huiju/estateagents/redpack/entity/TaMpPerson.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.redpack.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,6 +27,7 @@ public class TaMpPerson implements Serializable {
     /**
      * 人员ID
      */
+    @TableId(value = "mp_person_id", type = IdType.UUID)
     private String mpPersonId;
 
     /**

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

@@ -12,10 +12,8 @@ import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -28,7 +26,7 @@ import java.util.stream.Collectors;
  * @author Edward
  */
 @AllArgsConstructor
-@Controller
+@RestController
 @RequestMapping("/api")
 public class WxRedpackController {
 
@@ -46,7 +44,7 @@ public class WxRedpackController {
      * @return
      */
     @GetMapping("/third/redirect/{mpAppid}/greet")
-    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId,@RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId,@RequestParam(required = false) String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
@@ -55,7 +53,6 @@ public class WxRedpackController {
         try {
             //换取openid
             WxMpOAuth2AccessToken accessToken = wxService.oauth2getAccessToken(code);
-            WxMpUser user = wxService.oauth2getUserInfo(accessToken, null);
             //获取H5项目相关信息
             QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
 
@@ -65,9 +62,10 @@ public class WxRedpackController {
                 return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
             }
             //插入公众号人员信息并插入表
-            map = iTaThirdPartyMiniappConfigService.newMpPerson(user, mpAppid, taThirdPartyMiniappConfig.getTargetId(), sponsorPersonId, personId);
+            map = iTaThirdPartyMiniappConfigService.newMpPerson(accessToken, mpAppid, taThirdPartyMiniappConfig.getTargetId(), sponsorPersonId, personId);
         } catch (WxErrorException e) {
-            e.printStackTrace();
+//            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
         return ResponseBean.success(map);
     }
@@ -95,12 +93,12 @@ public class WxRedpackController {
     /**
      * 我要参加 活动接口
      * @param mpAppid
-     * @param mpPersonId
+     * @param personId
      * @param request
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/participate")
-    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId,@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String appid, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
@@ -114,7 +112,7 @@ public class WxRedpackController {
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
         }
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.participateActivity(mpAppid,mpPersonId,taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.participateActivity(mpAppid,personId,taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
             return res;
         }catch (Exception e){
             e.printStackTrace();

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

@@ -3,7 +3,7 @@ package com.huiju.estateagents.third.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 
 import java.util.Map;
 
@@ -28,21 +28,21 @@ public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdParty
 
 	/**
 	 * 创建公众号人员并关联上小程序人员
-	 * @param user
+	 * @param accessToken
 	 * @param drainageId
 	 * @param sponsorPersonId
 	 * @param personId
 	 */
-	Map<String,Object> newMpPerson(WxMpUser user, String mpAppid, String drainageId, String sponsorPersonId, String personId);
+	Map<String,Object> newMpPerson(WxMpOAuth2AccessToken accessToken, String mpAppid, String drainageId, String sponsorPersonId, String personId);
 
 	/**
 	 * 参加活动生成参与记录等
 	 * @param mpAppid
-	 * @param mpPersonId
+	 * @param personId
 	 * @param targetId
 	 * @param orgId
 	 */
-	ResponseBean participateActivity(String mpAppid, String mpPersonId, String targetId, Integer orgId);
+	ResponseBean participateActivity(String mpAppid, String personId, String targetId, Integer orgId);
 
 	/**
 	 * 助力活动接口

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

@@ -24,7 +24,7 @@ import com.huiju.estateagents.redpack.mapper.*;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.mapper.TaThirdPartyMiniappConfigMapper;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -133,29 +133,23 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 	/**
 	 * 创建公众号人员并关联上小程序人员
 	 *
-	 * @param user
+	 * @param accessToken
 	 * @param drainageId
 	 * @param sponsorPersonId
 	 * @param personId
 	 */
 	@Override
-	public Map<String,Object> newMpPerson(WxMpUser user, String mpAppid, String drainageId, String sponsorPersonId, String personId) {
+	public Map<String,Object> newMpPerson(WxMpOAuth2AccessToken accessToken, 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()));
+		TaMpPerson mpPerson = taMpPersonMapper.selectOne(new QueryWrapper<TaMpPerson>().eq("mp_openid", accessToken.getOpenId()));
 		//不存在就新建
 		if (null == mpPerson){
 			//新增入公众号人员表
 			TaMpPerson taMpPerson = new TaMpPerson();
 			taMpPerson.setAppid(mpAppid);
-			taMpPerson.setCity(user.getCity());
-			taMpPerson.setCountry(user.getCountry());
 			taMpPerson.setCreateDate(LocalDateTime.now());
-			taMpPerson.setHeadimgurl(user.getHeadImgUrl());
-			taMpPerson.setMpOpenid(user.getOpenId());
-			taMpPerson.setNickname(user.getNickname());
-			taMpPerson.setProvince(user.getProvince());
-			taMpPerson.setSex(user.getSex());
+			taMpPerson.setMpOpenid(accessToken.getOpenId());
 			taMpPerson.setStatus(CommConstant.STATUS_NORMAL);
 			taMpPersonMapper.insert(taMpPerson);
 			mpPerson = taMpPerson;
@@ -197,7 +191,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		map.put("mineRedPacketPerson",mineRedPacketPerson);
 		//token
 		Map<Object, Object> tokenMap = new HashMap<>();
-		tokenMap.put("openId", user.getOpenId());
+		tokenMap.put("openId", accessToken.getOpenId());
 		tokenMap.put("orgId", taRedPacket.getOrgId());
 		tokenMap.put("personId", taMpMiniapp.getMiniappPersonId());//小程序的personid
 		map.put("token", JWTUtils.newTokenByMap(tokenMap));
@@ -209,12 +203,12 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 	 * 参加活动生成参与记录等
 	 *
 	 * @param mpAppid 公众号appid
-	 * @param mpPersonId 公众号人员id
+	 * @param personId 小程序人员id
 	 * @param drainageId H5活动id
 	 * @param orgId 小程序id
 	 */
 	@Override
-	public ResponseBean participateActivity(String mpAppid, String mpPersonId, String drainageId, Integer orgId) {
+	public ResponseBean participateActivity(String mpAppid, String personId, String drainageId, Integer orgId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
@@ -228,26 +222,26 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		}
 
 		//参与活动
-		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(mpPersonId,taRedPacket,orgId);
+		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(personId,taRedPacket,orgId);
 
 		return ResponseBean.success(taRedPacketPerson);
 	}
 
 	/**
 	 * 参与活动方法--悲观锁
-	 * @param mpPersonId
+	 * @param personId
 	 * @param taRedPacket
 	 * @param orgId
 	 */
-	private synchronized TaRedPacketPerson saveRedPacketPerson(String mpPersonId, TaRedPacket taRedPacket, Integer orgId) {
+	private synchronized TaRedPacketPerson saveRedPacketPerson(String personId, TaRedPacket taRedPacket, Integer orgId) {
 		//查看这个人绑定的小程序用户
-		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
+		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", personId));
 
 		//查看此人是否参加过活动如果参加过直接返回
 		QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("activity_id",taRedPacket.getActivityId());
 		queryWrapper.eq("org_id",orgId);
-		queryWrapper.eq("mp_person_id",mpPersonId);
+		queryWrapper.eq("mp_person_id",taMpMiniapp.getMpPersonId());
 		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
 		TaRedPacketPerson redPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
 		if (null != redPacketPerson){
@@ -260,7 +254,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		taRedPacketPerson.setCreateDate(LocalDateTime.now());
 		taRedPacketPerson.setIsSignedUp(true);
 		taRedPacketPerson.setMiniappPersonId(taMpMiniapp.getMiniappPersonId());
-		taRedPacketPerson.setMpPersonId(mpPersonId);
+		taRedPacketPerson.setMpPersonId(taMpMiniapp.getMpPersonId());
 		taRedPacketPerson.setOrgId(orgId);
 		taRedPacketPersonMapper.insert(taRedPacketPerson);
 		return taRedPacketPerson;