队员统计

yujian

2020-05-12 81feea14dbcfe3344961a435a37d24630bcbcc43

队员统计

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

@@ -53,6 +53,7 @@
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

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

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

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

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;

@@ -60,7 +61,6 @@
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

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

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

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

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


 fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java

@@ -8,6 +8,7 @@
import org.springframework.data.mongodb.core.MongoTemplate;

import org.springframework.data.mongodb.core.query.Criteria;

import org.springframework.data.mongodb.core.query.Query;

import org.springframework.data.mongodb.core.query.Update;

import org.springframework.stereotype.Repository;



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

@@ -31,6 +32,43 @@
    }

    

    /**

     * 选择性更新

     * @param record

     */

    public void updateSelective(TeamDailyRecord record) {

        Query query = new Query();

        query.addCriteria(Criteria.where("id").is(record.getId()));



        Update update = new Update();

        if (record.getFirstNum() != null)

            update.set("firstNum", record.getFirstNum());

        if (record.getSecondNum() != null)

            update.set("secondNum", record.getSecondNum());

        if (record.getBeyondNum() != null)

            update.set("beyondNum", record.getBeyondNum());

        if (record.getFirstDaRen() != null)

            update.set("firstDaRen", record.getFirstDaRen());

        if (record.getSecondDaRen() != null)

            update.set("secondDaRen", record.getSecondDaRen());

        if (record.getBeyondDaRen() != null)

            update.set("beyondDaRen", record.getBeyondDaRen());

        if (record.getFirstHighVIP() != null)

            update.set("firstHighVIP", record.getFirstHighVIP());

        if (record.getSecondHighVIP() != null)

            update.set("secondHighVIP", record.getSecondHighVIP());

        if (record.getBeyondHighVIP() != null)

            update.set("beyondHighVIP", record.getBeyondHighVIP());

        if (record.getFirstSuperVIP() != null)

            update.set("firstSuperVIP", record.getFirstSuperVIP());

        if (record.getSecondSuperVIP() != null)

            update.set("secondSuperVIP", record.getSecondSuperVIP());

        if (record.getBeyondSuperVIP() != null)

            update.set("beyondSuperVIP", record.getBeyondSuperVIP());

        update.set("updateTime", new Date());

        mongoTemplate.updateMulti(query, update, TeamDailyRecord.class);

    }



    /**

     * 根据id查询数据

     * 

     * @param id

@@ -42,9 +80,9 @@
        return mongoTemplate.findOne(query, TeamDailyRecord.class);

    }

    

	
    /**

     * 查询

     * 
     * @return

     */

    public List<TeamDailyRecord> getbyUid(Long uid) {

@@ -55,14 +93,14 @@
    

    /**

     * 查询

     * 
     * @return

     */

    public List<TeamDailyRecord> getbyUid(Long uid, Date minTime) {

        Query query = new Query();

        query.addCriteria(Criteria.where("uid").is(uid));

        query.addCriteria(Criteria.where("statisticDay").lte(minTime));

        query.addCriteria(Criteria.where("countDay").lte(minTime));

        return mongoTemplate.find(query, TeamDailyRecord.class);

    }

	
    

}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/vip/TeamDailyRecord.java

@@ -28,27 +28,30 @@
    @Field

    private Integer firstNum; // 一级

    @Field

    private Integer firstDaRen;

    @Field

    private Integer firstHighVIP;

    @Field

    private Integer firstSuperVIP;

    @Field

    private Integer secondNum; // 二级

    @Field

    private Integer secondDaRen;

    @Field

    private Integer secondHighVIP;

    @Field

    private Integer secondSuperVIP;

    @Field

    private Integer beyondNum; // 二级以外

    @Field

    private Integer firstDaRen;

    @Field

    private Integer secondDaRen;

    @Field

    private Integer beyondDaRen;

    @Field

    private Integer firstHighVIP;

    @Field

    private Integer secondHighVIP;

    @Field

    private Integer beyondHighVIP;

    @Field

    private Integer firstSuperVIP;

    @Field

    private Integer secondSuperVIP;

    @Field

    private Integer beyondSuperVIP;

    @Field

    private String updateTime;

	


    public TeamDailyRecord() {}

    

@@ -57,7 +60,6 @@
        this.secondNum = secondNum;

        this.beyondNum = beyondNum;

    }

	
    

    

    public String getId() {

@@ -188,4 +190,13 @@
        this.beyondSuperVIP = beyondSuperVIP;

    }



    public String getUpdateTime() {

        return updateTime;

    }



    public void setUpdateTime(String updateTime) {

        this.updateTime = updateTime;

    }



	
}


 fanli/src/main/java/com/yeshi/fanli/exception/user/TeamDailyRecordException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.user;



import com.yeshi.fanli.exception.BaseException;



public class TeamDailyRecordException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public TeamDailyRecordException(int code, String msg) {

        super(code, msg);

    }



    public TeamDailyRecordException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java

@@ -265,7 +265,8 @@
            ImgInfo info = new ImgInfo();
            int width = sourceImg.getWidth();
            int height = sourceImg.getHeight();
            String picLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
			
            String picLink = COSManager.getInstance().uploadFile(file.getInputStream(), filePath).getUrl();
            
            info.setH(height);
            info.setW(width);
@@ -1162,6 +1163,11 @@
            }
        }
        
        // 一张图显示为大图
        if (tempList.size() == 1) {
            tempList.get(0).setLarge(true);
        }
		
        if (tempList.size() > 0) {
            listImg.addAll(tempList);
        }

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

New file
@@ -0,0 +1,95 @@
package com.yeshi.fanli.service.impl.user.invite;



import java.text.SimpleDateFormat;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.user.invite.TeamDailyRecordDao;

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

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

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

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;



@Service

public class TeamDailyRecordServiceImpl implements TeamDailyRecordService {



    @Resource

    private TeamDailyRecordDao teamDailyRecordDao;



    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



	
    @Override

    public void save(TeamDailyRecord record) throws TeamDailyRecordException {

        if (record == null || record.getCountDay() == null || record.getUid() == null) {

            throw new TeamDailyRecordException(1, "数据不完整");

        }

		
        // 创建id

        String gernalTime = TimeUtil.getGernalTime(record.getCountDay().getTime());

        String id = StringUtil.Md5(record.getUid() + "#" + gernalTime);

		
        // id

        record.setId(id);

        TeamDailyRecord teamDaily = teamDailyRecordDao.getById(id);

        if (teamDaily != null) {

            teamDailyRecordDao.updateSelective(record);

        } else {

            record.setCountDay(new Date(TimeUtil.convertDateToTemp(gernalTime)));

            SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");

            record.setYearMonth(formatMonth.format(record.getCountDay()));

            teamDailyRecordDao.save(record);

        }

    }

	


    @Override

    @RequestSerializableByKeyService(key = "#uid")

    public void addDailyRecord(Long uid) {

        // 重新统计队员等级数量

        recountRecord(uid);



        // 统计上级队员数量

        ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);

        if (threeSale != null) {

            recountRecord(threeSale.getBoss().getId());

        }

    }



    private void recountRecord(Long uid) {

        try {

            // 直接粉丝

            int firstCount = (int) threeSaleSerivce.countFirstTeamByDate(uid, 1);

            // 间接粉丝

            int secondCount = (int) threeSaleSerivce.countSecondTeamByDate(uid, 1);



            int secondBeyond = 0;

			
		 
        } catch (Exception e) {

            e.getSuppressed();

            LogHelper.errorDetailInfo(e);

        }

    }



    @Override

    public List<TeamDailyRecord> getbyUid(Long uid) {

        return teamDailyRecordDao.getbyUid(uid);

    }

	
    @Override

    public List<TeamDailyRecord> getbyUid(Long uid, Date minTime) {

        return teamDailyRecordDao.getbyUid(uid, minTime);

    }

	
}


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

File was deleted

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

File was renamed from fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/TeamDailyRecordService.java
@@ -1,9 +1,10 @@
package com.yeshi.fanli.service.inter.user.vip;

package com.yeshi.fanli.service.inter.user.invite;



import java.util.Date;

import java.util.List;



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

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



public interface TeamDailyRecordService {



@@ -30,4 +31,11 @@
     * @return

     */

    public List<TeamDailyRecord> getbyUid(Long uid, Date minTime);



    /**

     * 保存信息- 新增、选择更新

     * @param record

     * @throws TeamDailyRecordException

     */

    public void save(TeamDailyRecord record) throws TeamDailyRecordException;

}