From a1cc60298bd8b9cbddb29ad7c5e8e59ea1ee790c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 16 四月 2020 11:42:20 +0800
Subject: [PATCH] 分享订单到账消息调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..62e7ab9 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,13 @@
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;
+import com.yeshi.fanli.util.user.UserLevelUtil;
@Service
public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyService {
-
@Resource
private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
@@ -126,12 +127,12 @@
throw new InviteOrderSubsidyException(10, "璁㈠崟涓虹┖");
CommonOrder firstOrder = orderList.get(0);
Date placeOrderTime = firstOrder.getThirdCreateTime();
- int urank = firstOrder.getUrank();
- UserLevelEnum buyerUserLevel = null;
- for (UserLevelEnum level : UserLevelEnum.values())
- if (level.getOrderRank() == urank)
- buyerUserLevel = level;
+ if (placeOrderTime.getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+ return;
+
+ int urank = firstOrder.getUrank();
+ UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
if (buyerUserLevel == null)
throw new InviteOrderSubsidyException(11, "鐢ㄦ埛绛夌骇涓虹┖");
@@ -310,4 +311,9 @@
return money;
}
+ @Override
+ public List<InviteOrderSubsidy> listByOrderNoAndTypeAndUid(String orderNo, Integer type, Long uid) {
+ return inviteOrderSubsidyMapper.listByOrderNoAndTypeAndUid(orderNo, type, uid);
+ }
+
}
--
Gitblit v1.8.0