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

admin

2020-04-15 d21a2d9757a8d57f0fa1d0097709c764924ff08e

 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, "用户等级为空");