From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
index 3eaccbb..2596787 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
@@ -32,12 +32,12 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.manger.user.UserLevelManager;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@Service
public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyService {
-
@Resource
private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
@@ -126,6 +126,10 @@
throw new InviteOrderSubsidyException(10, "璁㈠崟涓虹┖");
CommonOrder firstOrder = orderList.get(0);
Date placeOrderTime = firstOrder.getThirdCreateTime();
+
+ if (placeOrderTime.getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+ return;
+
int urank = firstOrder.getUrank();
UserLevelEnum buyerUserLevel = null;
for (UserLevelEnum level : UserLevelEnum.values())
--
Gitblit v1.8.0