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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java

@@ -26,7 +26,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyServiceV2;

import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

@@ -37,7 +37,7 @@
import com.yeshi.fanli.util.TimeUtil;



@Service

public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyServiceV2 {

public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyService {



   @Resource

   private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;

@@ -79,6 +79,11 @@
      return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);

   }



   @Override

   public List<InviteOrderSubsidy> listByOrderNoAndType(String orderNo, Integer type) {

      return inviteOrderSubsidyMapper.listByOrderNoAndType(orderNo, type);

   }



   @Transactional(rollbackFor = Exception.class)

   private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy)

         throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException {

@@ -101,12 +106,10 @@
         update.setState(orderSubsidy.getState());

         update.setUpdateTime(new Date());

         inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);

         //TODO 删除添加奖励

      } else {// 添加

         if (orderSubsidy.getCreateTime() == null)

            orderSubsidy.setCreateTime(new Date());

         inviteOrderSubsidyMapper.insertSelective(orderSubsidy);

         //TODO 删除添加奖励

      }

   }



@@ -117,9 +120,8 @@
      if (list != null && list.size() > 0) {

         // 必须是自购订单才返利

         HongBaoV2 parent = hongBaoV2Service.selectByPrimaryKey(list.get(0).getHongBaoV2().getId());

         if (parent != null && parent.getUrank() != UserLevelEnum.superVIP.getOrderRank()

         if (parent != null

               && (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS || parent.getType() == HongBaoV2.TYPE_ZIGOU)) {// 不是超级会员的自购/分享才补贴

            boolean isShare = (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS);



            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderId);

            if (orderList == null || orderList.size() == 0)

@@ -152,18 +154,7 @@
               }



               List<HongBaoV2> hbList = hongBaoV2Service.listByIds(idList);

               int state = InviteOrderSubsidy.STATE_UNKNOWN;

               // 确定是否使用了奖励券

               if (orderHongBaoMapService.selectByOrderIdAndSourceType(orderId, sourceType) != null) {

                  state = InviteOrderSubsidy.STATE_INVALID;

               } else {

                  // 确定是否返利到账5天后

                  if (recieveMoneyMoreThan(hbList, 5)) {

                     state = InviteOrderSubsidy.STATE_VALID;

                  } else {

                     state = InviteOrderSubsidy.STATE_UNKNOWN;

                  }

               }

               Integer state = null;



               // 产生改订单的返利总金额

               BigDecimal totalBuyFanLiMoney = new BigDecimal(0);

@@ -172,22 +163,33 @@
                  if (v2.getState() == HongBaoV2.STATE_BUKELINGQU || v2.getState() == HongBaoV2.STATE_KELINGQU

                        || v2.getState() == HongBaoV2.STATE_YILINGQU)

                     totalBuyFanLiMoney = totalBuyFanLiMoney.add(v2.getMoney());



                  if (state == null && (v2.getState() == HongBaoV2.STATE_KELINGQU

                        || v2.getState() == HongBaoV2.STATE_YILINGQU)) {// 红包状态为已领取或者是待领取，则设置为补贴有效

                     state = InviteOrderSubsidy.STATE_VALID;

                  }

               }



               if (state == null)

                  state = InviteOrderSubsidy.STATE_UNKNOWN;

               // 计算奖励金

               for (Iterator<Long> its = uidHongBaoMap.keySet().iterator(); its.hasNext();) {

                  Long uid = its.next();

                  UserLevelEnum userLevel = userLevelManager.getUserLevel(uid, placeOrderTime);



                  int type = uidHongBaoMap.get(uid);

                  if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_ERJI) {

                  if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_ERJI

                        || type == HongBaoV2.TYPE_SHARE_YIJI || type == HongBaoV2.TYPE_SHARE_ERJI) {

                     BigDecimal money = null;

                     if (type == HongBaoV2.TYPE_YIJI)

                     if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_SHARE_YIJI)

                        money = orderHongBaoMoneyComputeService.computeFirstTeamSubsidy(totalBuyFanLiMoney,

                              placeOrderTime, buyerUserLevel, userLevel);

                     else

                        money = orderHongBaoMoneyComputeService.computeSecondTeamSubsidy(totalBuyFanLiMoney,

                              placeOrderTime, buyerUserLevel, userLevel);



                     if (money == null)

                        continue;



                     InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy();

                     orderSubsidy.setMoney(money);

@@ -196,23 +198,17 @@
                     orderSubsidy.setOrderNo(orderId);

                     orderSubsidy.setSourceType(sourceType);

                     orderSubsidy.setState(state);

                     if (type == HongBaoV2.TYPE_YIJI)

                     if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_SHARE_YIJI)

                        orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_ONE);

                     else

                        orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);

                     // 会员才能补贴

                     if (userLevel != UserLevelEnum.daRen) {

                        try {

                           addOrderSubsidy(orderSubsidy);

                        } catch (OrderTeamRewardException e) {

                           throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());

                        } catch (CommonOrderException e) {

                           throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());

                        }

                        // 分享赚不能使用返利奖励券，不用等待5天

                        if (isShare) {

                           validByOrderIdAndSourceType(orderId, sourceType);

                        }



                     try {

                        addOrderSubsidy(orderSubsidy);

                     } catch (OrderTeamRewardException e) {

                        throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());

                     } catch (CommonOrderException e) {

                        throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());

                     }

                  }

               }

@@ -220,29 +216,6 @@
         }

      }



   }



   private boolean recieveMoneyMoreThan(List<HongBaoV2> hbList, int day) {

      // 是否全部是到账状态或失效状态

      int invalidCount = 0;// 失效个数

      int recieveCount = 0;// 到账的个数

      long maxGetTime = 0;

      for (HongBaoV2 v2 : hbList) {

         if (v2.getState() == HongBaoV2.STATE_SHIXIAO)

            invalidCount++;

         else if (v2.getState() == HongBaoV2.STATE_YILINGQU) {

            recieveCount++;

            if (v2.getGetTime() != null && v2.getGetTime().getTime() > maxGetTime)

               maxGetTime = v2.getGetTime().getTime();



         }

      }

      if (invalidCount + recieveCount == hbList.size() && recieveCount > 0 && maxGetTime > 0) {// 全部已到账

         // 查询到账时间距离当前时间是否超过指定天

         if (System.currentTimeMillis() - maxGetTime > 1000 * 60 * 60 * 24L * day)

            return true;

      }

      return false;

   }



   @Override

@@ -308,7 +281,6 @@
      inviteOrderSubsidyMapper.updateByPrimaryKeySelective(orderSubsidy);

   }



	
   @Override

   public BigDecimal sumRecievedMoneyByUid(long uid, Integer level) {

      BigDecimal money = inviteOrderSubsidyMapper.sumRecievedMoneyByUid(uid, level);

@@ -317,7 +289,7 @@
      }

      return money;

   }

	


   @Override

   public BigDecimal sumValidMoneyByUidAndDate(long uid, Integer day, Integer level) {

      BigDecimal money = inviteOrderSubsidyMapper.sumValidMoneyByUidAndDate(uid, day, level);

@@ -326,7 +298,7 @@
      }

      return money;

   }

	


   @Override

   public BigDecimal sumMoneyByUidAndDateAndState(long uid, Integer day, Integer level, Integer state) {

      BigDecimal money = inviteOrderSubsidyMapper.sumMoneyByUidAndDateAndState(uid, day, level, state);

@@ -335,6 +307,5 @@
      }

      return money;

   }

	
	


}