Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //更新账户退款申请
-        TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
+        TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REFUND, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
-        taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
+        taOrgRefundApplicationQueryWrapper.eq("order_id", id);
         taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
         //更新退款申请记录
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
-        taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
+        taOrgRefundApplicationQueryWrapper.eq("order_id", id);
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新订单状态

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

                                     @RequestParam (required = false) String consultant,
                                     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);
-        }
+//        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);
+//        }
         String appid = request.getHeader("appid");
 
         ResponseBean res = miniAppService.getQrCode(paramsStr, appid);

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

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.third.entity.TaMpInfo;
-import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaMpInfoService;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import lombok.AllArgsConstructor;
      * @return
      */
     @GetMapping("/third/redirect/{mpAppid}/greet")
-    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId,@RequestParam(required = false) 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 drainageId, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         try {
             //换取openid
             WxMpOAuth2AccessToken accessToken = wxService.oauth2getAccessToken(code);
-            //获取H5项目相关信息
-            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-
-            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
-            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-            if (null == taThirdPartyMiniappConfig){
-                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
-            }
             //插入公众号人员信息并插入表
-            map = iTaThirdPartyMiniappConfigService.newMpPerson(accessToken, mpAppid, taThirdPartyMiniappConfig.getTargetId(), sponsorPersonId, personId);
+            map = iTaThirdPartyMiniappConfigService.newMpPerson(accessToken, mpAppid, drainageId, sponsorPersonId, personId);
         } catch (WxErrorException e) {
 //            e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
      * @return
      */
     @GetMapping("/third/activity/{mpAppid}/personInfo")
-    public ResponseBean getPersonInfo(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean getPersonInfo(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String drainageId, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
         Map<String,Object> map = new HashMap<>();
         try {
-            //获取H5项目相关信息
-            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-
-            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
-            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-            if (null == taThirdPartyMiniappConfig){
-                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
-            }
             //插入公众号人员信息并插入表
-            map = iTaThirdPartyMiniappConfigService.getPersonInfo(mpAppid, taThirdPartyMiniappConfig.getTargetId(), personId);
+            map = iTaThirdPartyMiniappConfigService.getPersonInfo(mpAppid, drainageId, personId);
         } catch (Exception e) {
-//            e.printStackTrace();
+            e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
         return ResponseBean.success(map);
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/participate")
-    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String drainageId, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
-        //获取H5项目相关信息
-        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
-        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-        if (null == taThirdPartyMiniappConfig){
-            return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
-        }
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.participateActivity(mpAppid,personId,taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.participateActivity(mpAppid,personId,drainageId);
             return res;
         }catch (Exception e){
             e.printStackTrace();
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/help")
-    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String personId, @RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean helpActivity(@PathVariable String mpAppid, @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));
         }
-        //获取H5项目相关信息
-        QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
-        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-        if (null == taThirdPartyMiniappConfig){
-            return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
-        }
-
         if (personId.equals(sponsorPersonId)){
             return ResponseBean.error("自己不能助力自己",ResponseBean.ERROR_UNAVAILABLE);
         }
 
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, personId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, personId, sponsorPersonId, drainageId);
             return res;
         }catch (Exception e){
             e.printStackTrace();
 
     /**
      * 获取此活动的排行榜
-     * @param appid
+     * @param drainageId
      * @param request
      * @return
      */
     @GetMapping("/third/activity/ranking")
-    public ResponseBean getRanking(@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean getRanking(@RequestParam String drainageId, HttpServletRequest request) {
         try {
-            //获取H5项目相关信息
-            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-
-            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
-            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-            if (null == taThirdPartyMiniappConfig){
-                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
-            }
             //获取活动的排行榜
-            return iTaThirdPartyMiniappConfigService.getRanking(taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            return iTaThirdPartyMiniappConfigService.getRanking(drainageId);
         } catch (Exception e) {
 //            e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

 	 * 参加活动生成参与记录等
 	 * @param mpAppid
 	 * @param personId
-	 * @param targetId
-	 * @param orgId
+	 * @param drainageId
 	 */
-	ResponseBean participateActivity(String mpAppid, String personId, String targetId, Integer orgId);
+	ResponseBean participateActivity(String mpAppid, String personId, String drainageId);
 
 	/**
 	 * 助力活动接口
 	 * @param mpAppid
 	 * @param mpPersonId
 	 * @param sponsorPersonId
-	 * @param targetId
-	 * @param orgId
+	 * @param drainageId
 	 * @return
 	 */
-	ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String targetId, Integer orgId);
+	ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String drainageId);
 
 	/**
 	 * 获取活动排行榜
-	 * @param targetId
-	 * @param orgId
+	 * @param drainageId
 	 * @return
 	 */
-    ResponseBean getRanking(String targetId, Integer orgId);
+    ResponseBean getRanking(String drainageId);
 
 	/**
 	 * 根据personiD获取相关信息

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

 	 * @param mpAppid 公众号appid
 	 * @param personId 小程序人员id
 	 * @param drainageId H5活动id
-	 * @param orgId 小程序id
 	 */
 	@Override
-	public ResponseBean participateActivity(String mpAppid, String personId, String drainageId, Integer orgId) {
+	public ResponseBean participateActivity(String mpAppid, String personId, String drainageId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
 		}
 
 		//参与活动
-		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(personId,taRedPacket,orgId);
+		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(personId,taRedPacket,taDrainage.getOrgId());
 
 		return ResponseBean.success(taRedPacketPerson);
 	}
 	 * @param personId 小程序personId
 	 * @param sponsorPersonId 公众号发起人id
 	 * @param drainageId H5活动id
-	 * @param orgId 小程序id
 	 * @return
 	 */
 	@Override
-	public ResponseBean helpActivity(String mpAppid, String personId, String sponsorPersonId, String drainageId, Integer orgId) {
+	public ResponseBean helpActivity(String mpAppid, String personId, String sponsorPersonId, String drainageId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
 		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
 		
 		//助力
-		String result = saveRedPacketHistory(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId,mpAppid);
-		if (!result.equals("success")){
+		String result = saveRedPacketHistory(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, taDrainage.getOrgId(),mpAppid);
+		if (!"success".equals(result)){
 			return ResponseBean.error(result,ResponseBean.ERROR_ILLEGAL_PARAMS);
 		}
 
 	 * 获取活动排行榜
 	 *
 	 * @param drainageId
-	 * @param orgId
 	 * @return
 	 */
 	@Override
-	public ResponseBean getRanking(String drainageId, Integer orgId) {
+	public ResponseBean getRanking(String drainageId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
-		List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(),orgId);
+		List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(),taDrainage.getOrgId());
 		return ResponseBean.success(taRedPacketHistoryList);
 	}
 
 		parentRedPacketHistory.eq("target_miniapp_person",parentMpMiniapp.getMiniappPersonId());
 		List<TaRedPacketHistory> parentRedPacketHistories = taRedPacketHistoryMapper.selectList(parentRedPacketHistory);
 
-		//查看是否助力成功
-		if (parentRedPacketHistories.size() + 1 > taRedPacketHelp.getHelpSuccesPersons()){
-			return "助力已完成，无需助力。";
-		}
-
 		//助力
 		TaRedPacketHistory taRedPacketHistory = new TaRedPacketHistory();
 		taRedPacketHistory.setActivityId(taRedPacketHelp.getActivityId());
 		taRedPacketHistory.setTargetMiniappPerson(parentMpMiniapp.getMiniappPersonId());
 		taRedPacketHistory.setTargetMpPerson(parentMpMiniapp.getMpPersonId());
 		taRedPacketHistoryMapper.insert(taRedPacketHistory);
-		//发送红包
-		sendRedPackage(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId,mpAppid);
+
+		//更新此人获得的票数
+		QueryWrapper<TaRedPacketPerson> taRedPacketPersonQueryWrapper = new QueryWrapper<>();
+		taRedPacketPersonQueryWrapper.eq("activity_id",taRedPacketHelp.getActivityId());
+		taRedPacketPersonQueryWrapper.eq("org_id",orgId);
+		taRedPacketPersonQueryWrapper.eq("mp_person_id",parentMpMiniapp.getMpPersonId());
+		taRedPacketPersonQueryWrapper.eq("miniapp_person_id",parentMpMiniapp.getMiniappPersonId());
+		TaRedPacketPerson redPacketPerson = taRedPacketPersonMapper.selectOne(taRedPacketPersonQueryWrapper);
+		if (null != redPacketPerson){
+			redPacketPerson.setVotes(redPacketPerson.getVotes() +1);
+			taRedPacketPersonMapper.updateById(redPacketPerson);
+		}
+
+		//查看是否助力成功发送红包
+		if (parentRedPacketHistories.size() + 1 == taRedPacketHelp.getHelpSuccesPersons()){
+			//发送红包
+			sendRedPackage(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId,mpAppid,redPacketPerson);
+		}
+
 		return "success";
 	}
 
 	 * @param orgId
 	 * @param mpAppid
 	 */
-	private synchronized void sendRedPackage(TaMpMiniapp taMpMiniapp, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid) {
+	private synchronized void sendRedPackage(TaMpMiniapp taMpMiniapp, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid,TaRedPacketPerson redPacketPerson) {
 		//红包金额设置相关信息
 		TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
 		//总账户金额
 				.remark(taRedPacketClient.getRemark())//备注
 				.reOpenid(parentMpPerson.getMpOpenid())//接受红包的用户openid
 
-				.sceneId("PRODUCT_2")//场景id
+				.sceneId("PRODUCT_1")//场景id
 				.sendName(taRedPacketClient.getMchName())//红包发送者名称
 				.totalAmount(redPackageMoney)//付款金额，单位分
 				.totalNum(1)//红包发放总人数
 			String resultCode = wxPaySendRedpackResult.getResultCode();
 			if (resultCode.equals("SUCCESS")){
 				//插入订单表并扣钱反更新
-				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid);
+				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid,redPacketPerson);
 			}else {
 				return;
 			}
 		}
 	}
 
-	private synchronized void saveRedpacketOrder(String tradeNo, WxPaySendRedpackResult wxPaySendRedpackResult, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid) {
+	private synchronized void saveRedpacketOrder(String tradeNo, WxPaySendRedpackResult wxPaySendRedpackResult, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid,TaRedPacketPerson redPacketPerson) {
+		redPacketPerson.setPacketAmount(wxPaySendRedpackResult.getTotalAmount());
+		redPacketPerson.setPacketStatus(1);
+		redPacketPerson.setIsSuccess(true);
+		taRedPacketPersonMapper.updateById(redPacketPerson);
 		//先扣钱
 		TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
 		taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

         b.name as miniAppName,
         t.is_offline,
         t.create_date,
-        t.trading_status,
-        <if test="orderType == 'recharge' || orderType == 'refund'">
+        <if test="orderType == 'refund'">
             d.audit_status,
             d.audit_result,
         </if>
-        GROUP_CONCAT(c.url) as certificateUrl
+        t.trading_status
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
         left join ta_org_account_certificate c on t.order_id = c.order_id
         left join ta_org_account e on t.org_id = e.org_id
-        <if test="orderType == 'recharge' || orderType == 'refund'">
-            left join ta_org_refund_application d on d.org_id = t.org_id
+        <if test="orderType == 'refund'">
+            left join ta_org_refund_application d on d.org_id = t.org_id and t.order_id = d.order_id
         </if>
         where
         a.item_type = #{orderType}
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        GROUP BY t.order_id
+        group by t.order_id
     </select>
 
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">