Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -86,4 +86,31 @@ public class WxRedpackController {
             return ResponseBean.error("程序出错请联系运营人员",ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
     }
+
+    /**
+     * 帮他助力 接口
+     * @param mpAppid
+     * @param mpPersonId
+     * @param request
+     * @return
+     */
+    @PostMapping("/third/activity/{mpAppid}/help")
+    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String parentMpPersonId ,HttpServletRequest request) {
+        //获取H5项目相关信息
+        String xAppid = request.getHeader("x-appid");
+        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
+        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());
+            return res;
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error("程序出错请联系运营人员",ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+    }
 }

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

@@ -42,4 +42,15 @@ public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdParty
 	 * @param orgId
 	 */
 	ResponseBean participateActivity(String mpAppid, String mpPersonId, String targetId, Integer orgId);
+
+	/**
+	 * 助力活动接口
+	 * @param mpAppid
+	 * @param mpPersonId
+	 * @param parentMpPersonId
+	 * @param targetId
+	 * @param orgId
+	 * @return
+	 */
+	ResponseBean helpActivity(String mpAppid, String mpPersonId, String parentMpPersonId, String targetId, Integer orgId);
 }

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

@@ -7,14 +7,8 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
-import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
-import com.huiju.estateagents.redpack.entity.TaMpPerson;
-import com.huiju.estateagents.redpack.entity.TaRedPacket;
-import com.huiju.estateagents.redpack.entity.TaRedPacketPerson;
-import com.huiju.estateagents.redpack.mapper.TaMpMiniappMapper;
-import com.huiju.estateagents.redpack.mapper.TaMpPersonMapper;
-import com.huiju.estateagents.redpack.mapper.TaRedPacketMapper;
-import com.huiju.estateagents.redpack.mapper.TaRedPacketPersonMapper;
+import com.huiju.estateagents.redpack.entity.*;
+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;
@@ -23,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -53,6 +49,15 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 	@Autowired
 	private TaRedPacketPersonMapper taRedPacketPersonMapper;
 
+	@Autowired
+	private TaRedPacketHelpMapper taRedPacketHelpMapper;
+
+	@Autowired
+	private TaRedPacketHistoryMapper taRedPacketHistoryMapper;
+
+	@Autowired
+	private TaRedPacketMoneyMapper taRedPacketmonetMapper;
+
 	/**
 	 * 校验是否合法第三方接口调用
 	 *
@@ -152,6 +157,19 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 			return ResponseBean.error("此活动未开始",ResponseBean.ERROR_ILLEGAL_PARAMS);
 		}
 
+		//参与活动
+		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(mpPersonId,taRedPacket,orgId);
+
+		return ResponseBean.success(taRedPacketPerson);
+	}
+
+	/**
+	 * 参与活动方法--悲观锁
+	 * @param mpPersonId
+	 * @param taRedPacket
+	 * @param orgId
+	 */
+	private synchronized TaRedPacketPerson saveRedPacketPerson(String mpPersonId, TaRedPacket taRedPacket, Integer orgId) {
 		//查看这个人绑定的小程序用户
 		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
 
@@ -163,7 +181,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
 		TaRedPacketPerson redPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
 		if (null != redPacketPerson){
-			return ResponseBean.success(redPacketPerson);
+			return redPacketPerson;
 		}
 
 		//参与活动
@@ -175,6 +193,110 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		taRedPacketPerson.setMpPersonId(mpPersonId);
 		taRedPacketPerson.setOrgId(orgId);
 		taRedPacketPersonMapper.insert(taRedPacketPerson);
-		return ResponseBean.success(taRedPacketPerson);
+		return taRedPacketPerson;
+	}
+
+	/**
+	 * 助力活动接口
+	 *
+	 * @param mpAppid 公众号appid
+	 * @param mpPersonId 公众号personId
+	 * @param parentMpPersonId 公众号被助力者的peisonId
+	 * @param drainageId H5活动id
+	 * @param orgId 小程序id
+	 * @return
+	 */
+	@Override
+	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String parentMpPersonId, String drainageId, Integer orgId) {
+		//第一步根据drainggeid查询出红包表对应的记录
+		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+		//第二步查询出这个H5对应的活动
+		TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+		//判断这个活动的过期时间
+		if (LocalDateTime.now().isAfter(taRedPacket.getEndDate())){
+			return ResponseBean.error(taRedPacket.getActivityEndTip(),ResponseBean.ERROR_ILLEGAL_PARAMS);
+		}
+		if (LocalDateTime.now().isBefore(taRedPacket.getStartDate())){
+			return ResponseBean.error("此活动未开始",ResponseBean.ERROR_ILLEGAL_PARAMS);
+		}
+
+		//查看这个人绑定的小程序用户
+		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
+
+		//查询被助力者的绑定的小程序用户
+		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", parentMpPersonId));
+
+		//根据活动id查询这个活动的助力规则
+		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
+		
+		//助力
+		String result = saveRedPacketHistory(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId);
+		if (result.equals("success")){
+			ResponseBean.error(result,ResponseBean.ERROR_ILLEGAL_PARAMS);
+		}
+
+		return ResponseBean.success(taRedPacketHelp.getSuccessTip());
+	}
+
+	private synchronized String saveRedPacketHistory(TaMpMiniapp taMpMiniapp, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId) {
+		//查看我是否助力过
+		QueryWrapper<TaRedPacketHistory> queryWrapper = new QueryWrapper();
+		queryWrapper.eq("activity_id",taRedPacketHelp.getActivityId());
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("from_mp_person",taMpMiniapp.getMpPersonId());
+		queryWrapper.eq("from_miniapp_person",taMpMiniapp.getMiniappPersonId());
+		List<TaRedPacketHistory> taRedPacketHistories = taRedPacketHistoryMapper.selectList(queryWrapper);
+		//校验总助力次数
+		if (taRedPacketHistories.size() >= taRedPacketHelp.getLimitNumPerPerson()){
+			return taRedPacketHelp.getLimitPerPersonIllegalTip();
+		}
+		//校验单人每日助力次数限制
+		List<TaRedPacketHistory> dayHelpList = taRedPacketHistories.stream().filter(e -> e.getCreateDate().toLocalDate().equals(LocalDateTime.now().toLocalDate())).collect(Collectors.toList());
+		if (dayHelpList.size() >= taRedPacketHelp.getLimitNumPerDay()){
+			return taRedPacketHelp.getLimitPerDayIllegalTip();
+		}
+		//校验为同一人助力次数限制
+		List<TaRedPacketHistory> eachHelpList = taRedPacketHistories.stream().filter(e -> e.getTargetMiniappPerson().equals(parentMpMiniapp.getMiniappPersonId())).collect(Collectors.toList());
+		if (eachHelpList.size() >= taRedPacketHelp.getLimitNumForEachPerson()){
+			return taRedPacketHelp.getLimitForEachPersonIllegalTip();
+		}
+
+		//校验还有此次助力成功后是否需要发送红包
+		QueryWrapper<TaRedPacketHistory> parentRedPacketHistory = new QueryWrapper();
+		parentRedPacketHistory.eq("activity_id",taRedPacketHelp.getActivityId());
+		parentRedPacketHistory.eq("org_id",orgId);
+		parentRedPacketHistory.eq("target_mp_person",parentMpMiniapp.getMpPersonId());
+		parentRedPacketHistory.eq("target_miniapp_person",parentMpMiniapp.getMiniappPersonId());
+		List<TaRedPacketHistory> parentRedPacketHistories = taRedPacketHistoryMapper.selectList(parentRedPacketHistory);
+		Boolean redPackageState = parentRedPacketHistories.size() + 1 <= taRedPacketHelp.getHelpSuccesPersons();
+
+
+		//助力
+		TaRedPacketHistory taRedPacketHistory = new TaRedPacketHistory();
+		taRedPacketHistory.setActivityId(taRedPacketHelp.getActivityId());
+		taRedPacketHistory.setCreateDate(LocalDateTime.now());
+		taRedPacketHistory.setFromMiniappPerson(taMpMiniapp.getMiniappPersonId());
+		taRedPacketHistory.setFromMpPerson(taMpMiniapp.getMpPersonId());
+		taRedPacketHistory.setOrgId(orgId);
+		taRedPacketHistory.setTargetMiniappPerson(parentMpMiniapp.getMiniappPersonId());
+		taRedPacketHistory.setTargetMpPerson(parentMpMiniapp.getMpPersonId());
+		taRedPacketHistoryMapper.insert(taRedPacketHistory);
+		if (redPackageState){
+			//发送红包
+			sendRedPackage(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId);
+		}
+		return "success";
+	}
+
+	/**
+	 * 发送红包
+	 * @param taMpMiniapp
+	 * @param parentMpMiniapp
+	 * @param taRedPacketHelp
+	 * @param orgId
+	 */
+	private synchronized void sendRedPackage(TaMpMiniapp taMpMiniapp, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId) {
+		TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
+		
 	}
 }

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -1,17 +1,12 @@
 package com.huiju.estateagents;
 
-import com.huiju.estateagents.common.wxpay.WXPayUtil;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
-import sun.misc.BASE64Decoder;
 
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-import java.util.Map;
+import java.time.LocalDateTime;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -34,5 +29,7 @@ public class WxPayTest {
 //            e.printStackTrace();
 //        }
 
+        System.out.println(LocalDateTime.now().toLocalDate().equals(LocalDateTime.now().toLocalDate()));
+
     }
 }