等级显示问题

yujian

2020-04-26 ee1d39f11b9483b64a88029f1755a6e7166fea15

等级显示问题

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java

@@ -22,12 +22,13 @@
    public final static int STATE_SX = 4;// 未付款/已退款



    public enum MsgTypeOrderTypeEnum {

        fanli("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),

        share("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        invite("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        fanli("返利订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),

        share("分享订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        invite("团队订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        found("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), // 老版

        foundSucceed("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 

        foundFail("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),

        orderStatistics("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        elme("饿了么订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png");

        

        private final String desc;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java

@@ -7,6 +7,7 @@
import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPLevelMapper;

import com.yeshi.fanli.dto.user.UserInviteLevelEnum;

import com.yeshi.fanli.dto.vip.UserVIPLevel;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

@@ -14,6 +15,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.user.UserLevelUtil;



@Service

public class UserInviteServiceImpl implements UserInviteService {

@@ -22,14 +24,12 @@


    @Resource

    private UserVIPInfoService userVIPInfoService;

	


    @Resource

    private UserVIPPreInfoService userVIPPreInfoService;

	


    @Resource

    private UserVIPLevelMapper userVIPLevelMapper;

	
	


    @Override

    public UserInviteLevelEnum getUserInviteLevel(Long uid) {

@@ -43,64 +43,70 @@
        if (info.getState() == UserVIPInfo.STATE_VERIFING)

            return UserInviteLevelEnum.vipApply;



		
        // TODO 没有判断导师



        return UserInviteLevelEnum.vip;

    }



	
    @Override

    public UserInviteLevelEnum getUserInviteLevelNew(Long uid) {

        String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

        if (StringUtil.isNullOrEmpty(inviteCode)) {

            return UserInviteLevelEnum.noActive;

        }

		
        UserVIPInfo info = userVIPInfoService.selectByUid(uid);

        if (info == null) {

            UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);

            if (userVIPPreInfo != null) {



        UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);

        if (userVIPPreInfo != null) {

            Integer process = userVIPPreInfo.getProcess();

            UserLevelEnum levelEnum = UserLevelUtil.getByLevel(process);

			
            levelEnum = UserLevelUtil.getShowLevel(levelEnum);

            if (levelEnum == null || levelEnum == UserLevelEnum.daRen) {

                return UserInviteLevelEnum.actived;

            }



            if (levelEnum == UserLevelEnum.highVIP) {

                UserVIPInfo info = userVIPInfoService.selectByUid(uid);

                if (info != null && info.getState() == UserVIPInfo.STATE_VERIFING) {

                    return UserInviteLevelEnum.vipApply;

                }

                return UserInviteLevelEnum.highVIP;

            }

        } else if (info.getState() == UserVIPInfo.STATE_VERIFING) {

            return UserInviteLevelEnum.vipApply;

        } else if (info.getState() == UserVIPInfo.STATE_SUCCESS) {

            return UserInviteLevelEnum.vip;



            if (levelEnum == UserLevelEnum.superVIP) {

                return UserInviteLevelEnum.vip;

            }



            if (levelEnum == UserLevelEnum.tearcher) {

                return UserInviteLevelEnum.tearcher;

            }

        }

		
        // TODO 没有判断导师

		
        return UserInviteLevelEnum.actived;

    }



	
    @Override

    public boolean verifyVIP(Long uid) {

        String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

        if (StringUtil.isNullOrEmpty(inviteCode)) {

            return false;

        }

		


        UserVIPInfo info = userVIPInfoService.selectByUid(uid);

        if (info != null && info.getState() == UserVIPInfo.STATE_SUCCESS) {

            return true;

        }

		


        UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);

        if (userVIPPreInfo != null) {

            return true;

        }

		


        return false;

    }

	
	
	


    @Override

    public UserVIPLevel getVIPLevelByUid(Long uid) {

        return userVIPLevelMapper.getLevelByUid(uid);

    }

	
	


}


 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java

@@ -41,20 +41,16 @@
            return null;



        String fanliName = "";

        MsgTypeOrderTypeEnum typeEnum = null;

        String sourceName = Constant.getSourceName(source);

        if (Constant.TYPE_REBATE == type) {

            fanliName = "预估返利:";

            sourceName += "-返利订单";

            typeEnum = MsgTypeOrderTypeEnum.fanli;

        } else if (Constant.TYPE_SHAER == type) {

            fanliName = "预估奖金:";

            sourceName += "-分享订单";

            typeEnum = MsgTypeOrderTypeEnum.share;

        } else if (Constant.TYPE_INVITE == type) {

            fanliName = "预估收益:";

            sourceName += "-团队订单";

            typeEnum = MsgTypeOrderTypeEnum.invite;

        }



        // 添加内容

@@ -101,7 +97,7 @@
        detail.setOrderType(source);

        detail.setPayMoney(payMoney);

        detail.setRead(false);

        detail.setType(typeEnum);

        detail.setType(MsgTypeOrderTypeEnum.orderStatistics);

        detail.setUser(new UserInfo(uid));

        detail.setExtraInfo(new Gson().toJson(listMsg));

        return detail;