Merge remote-tracking branch 'origin/master'

admin

2019-06-28 9cdb5e6e3474933536f53720497be9a4764fba4f

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -8,6 +8,7 @@


import javax.annotation.Resource;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -15,6 +16,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

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

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

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

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

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.log.LogHelper;

@@ -23,6 +25,7 @@
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -55,6 +58,13 @@
    

    @Resource

    private UserTaoLiJinOriginService userTaoLiJinOriginService;

	
    @Resource

    private UserActiveLogService userActiveLogService;

	
    @Resource(name = "taskExecutor")

    private TaskExecutor executor;

	
    



    public UserInfo getBoss(final long uid) {

@@ -527,21 +537,43 @@
        // 邀请消息

        userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);

        

        if (VersionUtil.greaterThan_1_5_60(platform, version)) {

            // 奖励淘礼金红包

            try {

                String inviteName= invitee.getNickName();

                if (StringUtil.isNullOrEmpty(inviteName)) {

                    UserInfo userInfo = userInfoService.selectByPKey(invitee.getId());

                    if (userInfo != null) {

                        inviteName= userInfo.getNickName();

        executor.execute(new Runnable() {

            @Override

            public void run() {

                try {

                    UserActiveLog activeLog  = userActiveLogService.getUserLatestActiveInfo(inviter.getId());

                    if (activeLog != null  && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {

                        String versionCode = activeLog.getVersionCode();

                        String channel = activeLog.getChannel();

						
                        boolean result = false;

                        // 渠道是appstore 判断为IOS

                        if (!StringUtil.isNullOrEmpty(channel) && "appstore".equalsIgnoreCase(channel)) {

                            result = VersionUtil.greaterThan_1_5_60("ios", versionCode);

                        } else {

                            result = VersionUtil.greaterThan_1_5_60("android", versionCode);

                        }

						
                        if (result) {

                            // 被邀请名称

                            String inviteName= invitee.getNickName();

                            if (StringUtil.isNullOrEmpty(inviteName)) {

                                UserInfo userInfo = userInfoService.selectByPKey(invitee.getId());

                                if (userInfo != null) {

                                    inviteName= userInfo.getNickName();

                                }

                            }

                            // 奖励邀请红包（淘礼金）

                            userTaoLiJinOriginService.addInviteWinMoney(inviter.getId(), inviteName);

                        }

                    }

                } catch (Exception e) {

                    LogHelper.errorDetailInfo(e);

                }

                userTaoLiJinOriginService.addInviteWinMoney(inviter.getId(), inviteName);

            } catch (Exception e) {

                LogHelper.errorDetailInfo(e);

            }

        }

        });

		
		
    }



    @Override

@@ -590,29 +622,48 @@
        UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

        threeSale.setBoss(boss);

        

		
        // 添加到队列

        ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);

	
        // 邀请消息

        userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);

        

        if (VersionUtil.greaterThan_1_5_60(platform, version)) {

            // 奖励淘礼金红包

            try {

                String inviteName= invitee.getNickName();

                if (StringUtil.isNullOrEmpty(inviteName)) {

                    UserInfo userInfo = userInfoService.selectByPKey(invitee.getId());

                    if (userInfo != null) {

                        inviteName= userInfo.getNickName();

		
        executor.execute(new Runnable() {

            @Override

            public void run() {

                try {

                    UserActiveLog activeLog  = userActiveLogService.getUserLatestActiveInfo(inviterId);

                    if (activeLog != null  && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {

                        boolean result = false;

                        String versionCode = activeLog.getVersionCode();

                        String channel = activeLog.getChannel();

						
                        // 渠道是appstore 判断为IOS

                        if (!StringUtil.isNullOrEmpty(channel) && "appstore".equalsIgnoreCase(channel)) {

                            result = VersionUtil.greaterThan_1_5_60("ios", versionCode);

                        } else {

                            result = VersionUtil.greaterThan_1_5_60("android", versionCode);

                        }

						
                        if (result) {

                            // 被邀请名称

                            String inviteName= invitee.getNickName();

                            if (StringUtil.isNullOrEmpty(inviteName)) {

                                UserInfo userInfo = userInfoService.selectByPKey(invitee.getId());

                                if (userInfo != null) {

                                    inviteName= userInfo.getNickName();

                                }

                            }

                            // 奖励邀请红包（淘礼金）

                            userTaoLiJinOriginService.addInviteWinMoney(inviterId, inviteName);

                        }

                    }

                } catch (Exception e) {

                    LogHelper.errorDetailInfo(e);

                }

                userTaoLiJinOriginService.addInviteWinMoney(inviterId, inviteName);

            } catch (Exception e) {

                LogHelper.errorDetailInfo(e);

            }

        }

		
		
        });

    }

    

    /**