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

admin

2020-05-26 beef9055e75ec66abd95d642861e4aab74932a95

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

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

@@ -66,30 +66,6 @@
    @Resource
    private UserActiveLogService userActiveLogService;

    @Override
    public void save(TeamFansInfo record) {
        if (record == null || record.getWorkerId() == null) {
            return;
        }
		
        // 无邀请关系 不操作
        ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(record.getWorkerId());
        if (threeSale == null)
            return;

        record.setId(record.getWorkerId().toString());

        TeamFansInfo teamFansInfo = teamFansInfoDao.get(record.getId());
        if (teamFansInfo != null) {
            teamFansInfoDao.updateSelective(record);
            LogHelper.test("save-更新-" + record.getId());
        } else {
            initData(record);
            record.setCrateTime(new Date());
            LogHelper.test("save-新增-" + record.getId());
            teamFansInfoDao.save(record);
        }
    }

    /**
     * 初始化数据
@@ -251,7 +227,12 @@
        focusInfo.setStateValid(stateValid);
        focusInfo.setLevel(level);
        focusInfo.setId(workerId.toString());
        save(focusInfo);
        focusInfo.setCrateTime(new Date());
		
        // 初始化值
        initData(focusInfo);
		
        teamFansInfoDao.save(focusInfo);
    }

    @Override
@@ -264,7 +245,7 @@
        } else {
            teamFansInfo.setMemoNameSup(memoName);
        }
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -277,7 +258,7 @@
        } else {
            teamFansInfo.setTagsSup(tags);
        }
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -286,7 +267,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setNickName(nickName);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -295,7 +276,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setStateValid(stateValid);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -304,7 +285,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setTaobaoBind(taobaoBind);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -313,7 +294,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setActiveTime(activeTime);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -327,7 +308,7 @@
        } else {
            teamFansInfo.setWeixinIdExist(true);
        }
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -336,7 +317,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setInviteCode(inviteCode);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -345,7 +326,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setPhone(phone);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -354,7 +335,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setLevel(level);
        teamFansInfo.setWorkerId(workerId);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -363,7 +344,7 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setPhoneOpen(phoneOpen);
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -377,7 +358,7 @@
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setIncome(income.multiply(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_DOWN).intValue());
        teamFansInfo.setIncomeTime(new Date());
        save(teamFansInfo);
        update(teamFansInfo);
    }

    @Override
@@ -389,8 +370,22 @@
        TeamFansInfo teamFansInfo = new TeamFansInfo();
        teamFansInfo.setWorkerId(workerId);
        teamFansInfo.setFansNum(fansNum);
        save(teamFansInfo);
        update(teamFansInfo);
    }
	
    private void update(TeamFansInfo record) {
        if (record == null || record.getWorkerId() == null) {
            return;
        }
        // 无邀请关系 不操作
        ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(record.getWorkerId());
        if (threeSale == null)
            return;

        record.setId(record.getWorkerId().toString());
        teamFansInfoDao.updateSelective(record);
    }
	

    @Override
    public List<TeamFansInfo> query(int start, int count, int type, Long uid, ThreeSaleFocusDTO focusDTO) {

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

@@ -23,12 +23,14 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;

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

import com.yeshi.fanli.exception.user.ThreeSaleException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

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

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

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

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

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

@@ -73,6 +75,11 @@
    @Lazy

    @Resource

    private IntegralGetService integralGetService;

	
    @Lazy

    @Resource

    private TeamFansInfoService teamFansInfoService;

	


    @Resource(name = "taskExecutor")

    private TaskExecutor executor;

@@ -426,10 +433,14 @@
     */

    @Transactional

    private void inviteSuccess(Long workerId, Long bossId) {

        // 同步粉丝消息

        teamFansInfoService.addFansInfo(workerId, bossId, new Date());

		
        if (!Constant.IS_TEST) {

            UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),

                    UserInviteMQMsg.STATE_SUCCESS);

            Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);

            message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 5000);

            producer.send(message);

        }



@@ -439,9 +450,10 @@
                try { // 邀请金币

                    integralGetService.addInviteLevelOne(bossId, workerId);

                } catch (Exception e) {

                    e.printStackTrace();

                    LogHelper.error(e);

                }



				
                // 邀请成功消息

                try {

                    // 直接粉丝邀请成功

                    UserInfo invitee = userInfoService.selectByPKey(workerId);

@@ -456,7 +468,7 @@
                                boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());

                    }

                } catch (Exception e) {

                    e.printStackTrace();

                    LogHelper.error(e);

                }

            }

        });


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/TeamFansInfoService.java

@@ -31,12 +31,6 @@
    public TeamFansInfo getbyWorkerId(Long workerId);



    /**

     * 添加

     * @param record

     */

    public void save(TeamFansInfo record);



    /**

     * 更新粉丝数量

     * @param workerId

     */


 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserTeamMessageListener.java

@@ -98,9 +98,6 @@
                if (mqMsg != null) {

                    // 更新上级的粉丝数量

                    teamFansInfoService.updateFansNum(mqMsg.getBossId());

                    // 添加粉丝信息



                    teamFansInfoService.addFansInfo(mqMsg.getWorkerId(), mqMsg.getBossId(), mqMsg.getSuccessTime());



                    threeSaleDetailService.addByWorkerUid(mqMsg.getWorkerId());