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

admin

2020-06-30 ade84017d710125aeaa256bfea674640b16747db

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

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -473,7 +473,7 @@
        }

        // 验证是否未首单

        CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);

        if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)

        if (!firstOrder.getOrderNo().equals(orderNo) || firstOrder.getSourceType() != source)

            return;

        

        Date downTime = firstOrder.getThirdCreateTime();

@@ -483,7 +483,7 @@
            return;

        long registerTime = register.getCreateTime().getTime();

        // 注册48小时内下单限制

        if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)

        if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)

            return;

                

        // 是否存在上下级关系

@@ -529,7 +529,7 @@
                continue;

            // 付款金额限制

            BigDecimal payment = commonOrder.getPayment();

            if (payment == null || payment.compareTo(limitPayMent) < 0) 
            if (payment == null || payment.compareTo(limitPayMent) <= 0) 
                continue;

            

            // 商品佣金比例限制

@@ -574,13 +574,14 @@
        // 注册48小时 以内:新人

        long registerTime = register.getCreateTime().getTime();

        // 48小时限制

        if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)

        if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)

            return satisfy;

        

        // 验证是否未首单

        CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);

        if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)

        if (!firstOrder.getOrderNo().equals(orderNo) || firstOrder.getSourceType() != source)

            return satisfy;

		
				
        // 是否已奖励

        List<UserSystemCoupon> coupons = userSystemCouponService.getUserCouponBySource(orderUid, UserSystemCoupon.SOURCE_PULL_NEW);

        if (coupons != null && coupons.size() > 0) {

@@ -623,7 +624,7 @@
                        

            // 付款金额限制

            BigDecimal payment = commonOrder.getPayment();

            if (payment == null || payment.compareTo(limitPayMent) < 0) 
            if (payment == null || payment.compareTo(limitPayMent) <= 0) 
                continue;

            

            // 商品佣金比例限制

@@ -657,7 +658,7 @@
        // 注册48小时 以内:新人

        long registerTime = register.getCreateTime().getTime();

        // 48小时限制

        if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)

        if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)

            return;

        

        // 是否已奖励

@@ -684,7 +685,7 @@
                continue;

            // 付款金额限制

            BigDecimal payment = commonOrder.getPayment();

            if (payment == null || payment.compareTo(limitPayMent) < 0) 
            if (payment == null || payment.compareTo(limitPayMent) <= 0) 
                continue;

            

            // 商品佣金比例限制