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

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

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

@@ -200,7 +200,9 @@
      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.getUrank() != UserLevelEnum.superVIP.getOrderRank()

               && (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)

@@ -282,7 +284,7 @@
                     else

                        orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);

                     // 会员才能补贴

                     if (userLevel != UserLevelEnum.daRen)

                     if (userLevel != UserLevelEnum.daRen) {

                        try {

                           addOrderSubsidy(orderSubsidy);

                        } catch (OrderTeamRewardException e) {

@@ -290,6 +292,11 @@
                        } catch (CommonOrderException e) {

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

                        }

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

                        if (isShare) {

                           validByOrderIdAndSourceType(orderId, sourceType);

                        }

                     }

                  }

               }

            }