From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 2596787..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
@@ -35,6 +35,7 @@
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 {
@@ -131,11 +132,7 @@
return;
int urank = firstOrder.getUrank();
- UserLevelEnum buyerUserLevel = null;
- for (UserLevelEnum level : UserLevelEnum.values())
- if (level.getOrderRank() == urank)
- buyerUserLevel = level;
-
+ UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
if (buyerUserLevel == null)
throw new InviteOrderSubsidyException(11, "鐢ㄦ埛绛夌骇涓虹┖");
@@ -314,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