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

admin

2020-05-14 674bfe588f4360afdbeae9a725dca4b8e995e326

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

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

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

@@ -905,6 +905,7 @@
                || focus.getMinFansNum() != null || focus.getMinFansNum() != null

                || focus.getMinActiveTime() != null || focus.getMaxActiveTime() != null

                || focus.getMinIncome() != null  || focus.getMaxIncome() != null 

                || focus.getMinJoinTime() != null  || focus.getMaxJoinTime() != null 
                || !StringUtil.isNullOrEmpty(focus.getKey()) || !StringUtil.isNullOrEmpty(focus.getLevel()))

             return true;

    


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java

@@ -245,5 +245,12 @@
            @Param("count") int count);



    long countAll(@Param("minTime") Long minTime, @Param("maxTime") Long maxTime);

	
	
    /**

     * 查询所有bossID

     * @return

     */

    List<Long> getAllBossId();



}

 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml

@@ -527,5 +527,9 @@
            and #{maxTime}>`succeedTime`

        </if>

    </select>

	
    <select id="getAllBossId" resultType="java.lang.Long">

        SELECT DISTINCT `boss_id` FROM `yeshi_ec_threesale`

    </select>



</mapper>

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

@@ -133,7 +133,7 @@
    }
    
    @Override
    public void addFansInfo(Long workerId, Long bossId) {
    public void addFansInfo(Long workerId, Long bossId, Date successTime) {
        UserInfo userInfo = userInfoService.selectByPKey(workerId);
        if (userInfo == null) {
            return;
@@ -228,6 +228,7 @@
        focusInfo.setBossId(bossId);
        focusInfo.setWorkerId(workerId);
        focusInfo.setBossSuperId(bossSuperId);
        focusInfo.setJoinTime(successTime);
        focusInfo.setNickName(userInfo.getNickName());
        focusInfo.setMemoName(memoName);
        focusInfo.setWeixinIdExist(weixinBind);
@@ -245,9 +246,6 @@
        focusInfo.setId(workerId.toString());
        save(focusInfo);
    }
	
	
	
    
    
    @Override

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

@@ -606,4 +606,10 @@
                maxTime == null ? null : maxTime.getTime());

    }



	
    @Override

    public List<Long> getAllBossId(){

        return threeSaleMapper.getAllBossId();

    }



}


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

@@ -135,6 +135,6 @@
     * @param workerId

     * @param bossId

     */

    public void addFansInfo(Long workerId, Long bossId);

    public void addFansInfo(Long workerId, Long bossId, Date successTime);



}


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

@@ -326,5 +326,12 @@
     */

    public long countSecondTeamByDate(Long uid, int dayType);



	
    /**

     * 查询boosID

     * @return

     */

    public List<Long> getAllBossId();





}


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

@@ -90,8 +90,9 @@
                    // 更新上级的粉丝数量

                    teamFansInfoService.updateFansNum(mqMsg.getBossId());

                    // 添加粉丝信息

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




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

					
                    threeSaleDetailService.addByWorkerUid(mqMsg.getWorkerId());

                }

            } else if (tag.equalsIgnoreCase(UserTopicTagEnum.userMoneyAdd.name())) {// 资金到账


 fanli/src/main/resource/env-dev/mongo.properties

@@ -1,13 +1,13 @@
mongo.dbname=flq

mongo.port=27017

mongo.port=27016

#开发环境

mongo.host=192.168.1.253

mongo.username=admin

mongo.password=123456

#mongo.host=192.168.1.253

#mongo.username=admin

#mongo.password=123456



#mongo.host=193.112.35.168

#mongo.username=yeshi

#mongo.password=Yeshi2016@

mongo.host=193.112.35.168

mongo.username=yeshi

mongo.password=Yeshi2016@



mongo.connectionsPerHost=8

mongo.threadsAllowedToBlockForConnectionMultiplier=4