消息

yujian

2020-04-13 c93dfa3912f0fed74faa2f5f3ef42c318a04a7a2

消息

 fanli/src/main/java/com/yeshi/fanli/aspect/AdminLoginAspect.java

@@ -35,7 +35,7 @@
    @Resource
    private AdminUserService adminUserService;

//    @Around("execution(public * com.yeshi.fanli.controller.admin..*.*(..))")
    @Around("execution(public * com.yeshi.fanli.controller.admin..*.*(..))")
    public Object verifyLoginState(ProceedingJoinPoint joinPoint) throws IOException {

        Signature signature = joinPoint.getSignature();

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -744,8 +744,7 @@
        UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());

        if (userLevel == null)

            userLevel = UserLevelEnum.daRen;

		
        UserLevelEnum upperLevel = UserLevelUtil.getNextLevel(userLevel);

        UserLevelEnum upperLevel =  UserLevelEnum.superVIP;

                

        BigDecimal upperTotalMoney = new BigDecimal(0);

        List<GoodsRebateVO> voList = new ArrayList<>();

@@ -773,7 +772,7 @@
            

            BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);

            if (type == 3) { // 奖金

                goodsVO.setBonus(hongBaoOrder.getHongBaoV2().getMoney() +"");

                goodsVO.setBonus("¥" + hongBaoOrder.getHongBaoV2().getMoney() +"");

            } else { // 佣金

                goodsVO.setCommision("¥" +commission);

            }

@@ -788,10 +787,8 @@
            }

            

            voList.add(goodsVO);

            if (upperLevel != null) {

                upperTotalMoney = upperTotalMoney

                        .add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

            }

		
            upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

        }

            

        // 团队补贴

@@ -821,7 +818,7 @@
                orderRebateVO.setOriginSubsidy("¥" + lowerSubsidy.setScale(2));

            }

            orderRebateVO.setSubsidyDesc("团队补贴");

            orderRebateVO.setSubsidy(teamSubsidy.setScale(2) +"");

            orderRebateVO.setSubsidy("¥" + teamSubsidy.setScale(2) +"");

        }

        

        orderRebateVO.setType(type);


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

@@ -22,12 +22,12 @@
    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"),

        foundSucceed("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        foundFail("订单找回", "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/order/CommonOrderServiceImpl.java

@@ -2613,8 +2613,7 @@
            order.setHongBaoInfo(hongBaoMap);

            // 分享、邀请 隐藏订单号
            if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
                    || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
            if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
                    || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
                order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
            }

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java

@@ -17,6 +17,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;

import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

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

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

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

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

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

@@ -33,6 +35,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;

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

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

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

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

@@ -88,6 +91,9 @@
    

    @Resource

    private UserInviteValidNumService userInviteValidNumService;

	
    @Resource

    private UserLevelUpgradedNotifyService userLevelUpgradedNotifyService;



    @Override

    @Transactional(rollbackFor = Exception.class)

@@ -221,6 +227,15 @@
        info.setUpdateTime(upgradeTime);

        userVIPInfoMapper.updateByPrimaryKeySelective(info);



        // 升级弹框提示

        UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

        notify.setUid(uid);

        notify.setFromLevel(UserLevelEnum.highVIP);

        notify.setToLevel(UserLevelEnum.superVIP);

        notify.setValid(true);

        notify.setCreateTime(new Date());

        userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

		
        try {

            // 赠送免单券

            String giveCoupon = userVipConfigService.getValueByKey("vip_pre_10_gift_givefree_coupon");


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java

@@ -21,6 +21,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfoRegister;

import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;

import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

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

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

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

import com.yeshi.fanli.entity.integral.IntegralDetail;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

@@ -39,6 +41,7 @@
import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -93,6 +96,9 @@
    

    @Resource

    private UserInviteMsgNotificationService userInviteMsgNotificationService;

	
    @Resource

    private UserLevelUpgradedNotifyService userLevelUpgradedNotifyService;



    @Override

    public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {

@@ -296,6 +302,16 @@
                int daysBetween = DateUtil.daysBetween(registerTime, new Date());

                userAccountMsgNotificationService.vipPreUpgrade(uid, "快省达人", "普通会员", daysBetween, targetNum1, targetNum2, type);

                

				
                // 升级弹框提示

                UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

                notify.setUid(uid);

                notify.setFromLevel(UserLevelEnum.daRen);

                notify.setToLevel(UserLevelEnum.normalVIP);

                notify.setValid(true);

                notify.setCreateTime(new Date());

                userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

				
                // 赠送金币

                String goldcoin = userVipConfigService.getValueByKey("vip_pre_3_gift_goldcoin");

                if (!StringUtil.isNullOrEmpty(goldcoin)) {

@@ -398,6 +414,15 @@
                info.setUpdateTime(upgradeTime);

                addUserVIPPreInfo(info);

                

                // 升级弹框提示

                UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

                notify.setUid(uid);

                notify.setFromLevel(UserLevelEnum.normalVIP);

                notify.setToLevel(UserLevelEnum.highVIP);

                notify.setValid(true);

                notify.setCreateTime(new Date());

                userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

				
                // 升级消息

                UserVIPPreInfo pre1 = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_1);

                int daysBetween = DateUtil.daysBetween(pre1.getCreateTime(), upgradeTime);


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

@@ -14,18 +14,12 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;



public class MsgOrderDetailFactory {



	
	


	
	
	


    /**

     * 创建订单被统计消息

@@ -67,9 +61,14 @@
        List<CommonMsgItemVO> listMsg = new ArrayList<>();

        listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单详情", ClientTextStyleVO.COLOR_TITLE),

                new ClientTextStyleVO(sourceName, ClientTextStyleVO.COLOR_CONTENT)));

        // 订单号可点击

        listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单号", ClientTextStyleVO.COLOR_TITLE),

                new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));

		
        if (Constant.TYPE_INVITE == type) {

            listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单号", ClientTextStyleVO.COLOR_TITLE),

                    new ClientTextStyleVO(UserUtil.filterOrderId(orderId), ClientTextStyleVO.COLOR_CONTENT), true));

        } else {

            listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("订单号", ClientTextStyleVO.COLOR_TITLE),

                    new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));

        }



        List<ClientTextStyleVO> contentList = new ArrayList<>();

        contentList


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

@@ -79,6 +79,11 @@
            userMsgVO.setTitle(msg.getType().getDesc());

            userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());

            userMsgVO.setContentItems(items);

			
            userMsgVO.setJumpDetail(jumpDetail);

            if (params != null)

                userMsgVO.setParams(params.toString());

			
            return userMsgVO;

        }