队员列表

yujian

2020-04-01 7e37f77192fa701e309fa04f821aa5fd5259ca33

队员列表

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

@@ -471,7 +471,7 @@
                validFans = true;

            }

            

            // 最近登录时间

            // 最近粉丝登录时间

            Date lastLoginTime = new Date(threeSale.getCreateTime());

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(workerId);

            if (userInfoExtra != null && userInfoExtra.getActiveTime() != null) {

@@ -488,9 +488,9 @@
            JSONArray array = new JSONArray();

            array.add(loginJson);



            // 等级

            // 查询粉丝等级

            UserInviteLevelEnum level = null;

            UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(uid);

            UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(workerId);

            if (vipLevel != null) {

                if (vipLevel.getLevel() == UserVIPLevel.LEVEL_3) {

                    level = UserInviteLevelEnum.actived;

@@ -523,8 +523,9 @@
            

            

            // 判断是否存在脱离关系队员

            if (vipLevel != null) {

                UserInviteSeparate separate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, uid);

            if (vipLevel != null && state) {

                Long bossId = threeSale.getBoss().getId();

                UserInviteSeparate separate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, bossId);

                if (separate != null && separate.getEndTime() != null) {

                    try {

                        JSONObject contentJson1 = new JSONObject();

@@ -909,4 +910,15 @@
    

    

    

    @RequestMapping(value = "remvoeBreak")

    public void remvoeBreak(String callback, AcceptData acceptData,Long inviteId, Long uid, Long tid, PrintWriter out) {

        if (uid == null || inviteId == null || tid == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("传输参数不完整"));

            return;

        }

        threeSaleSerivce.remvoeBreak(inviteId, uid, tid);

		
        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功"));

    }

	
}


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

@@ -725,10 +725,13 @@
        json.put("nickName", userInfo.getNickName());

        json.put("portrait", userInfo.getPortrait());

        json.put("ruleLink", userVipConfigService.getValueByKey("help_link_vip_h5"));

        json.put("tearcherTip", "导师按钮：弹框内容");

        json.put("saveMoney", saveMoney);

        json.put("earnMoney", earnMoney);

        

        json.put("tearcherTip", "我是你的导师，为你在省赚过程中解难答疑，对你一对一辅导，倾听你的需求总结并反馈给板栗快省官方运营团队，快来添加我吧。");

        json.put("tearcherWX", userVipConfigService.getValueByKey("tearcher_weixin_num"));

        json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));

		
        // 已完成

        json.put("doneZiGou", doneZiGou);

        json.put("doneShare", doneShare);


 fanli/src/main/java/com/yeshi/fanli/job/UpdateThreeSaleJob.java

@@ -10,15 +10,11 @@
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.util.Constant;



@Component

public class UpdateThreeSaleJob {





    @Resource

    private UserVIPInfoService userVIPInfoService;



    @Resource

    private UserInviteSeparateService userInviteSeparateService;

@@ -35,9 +31,9 @@
            if (list == null || list.size() == 0)

                break;

            

            for (UserInviteSeparate separate: list) {

            for (UserInviteSeparate record: list) {

                try {

                    userVIPInfoService.inviteSeparate(separate.getWorkerId(), separate.getBossId());

                    userInviteSeparateService.inviteSeparate(record);

                } catch (Exception e) {

                    LogHelper.errorDetailInfo(e);

                }


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

@@ -165,7 +165,7 @@
    </update>

    

    <update id="inviteSeparate">

        update yeshi_ec_threeSale t set t.state = 0,t.expire = 1,

        update yeshi_ec_threeSale t set t.state = 0,t.expire = 2,

            t.updateTime = <![CDATA[UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) * 1000]]>

        where t.worker_id=#{workerId} AND t.boss_id = #{bossId}

    </update>


 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml

@@ -1120,6 +1120,6 @@
    <select id="getMinSettleTimeAndUid" resultMap="BaseResultMap">
        SELECT d.`co_uid`,MAX(d.`co_settle_time`) AS  co_settle_time FROM `yeshi_ec_common_order` d
        WHERE d.`co_settle_time` IS NOT NULL AND d.`co_payment` > 1
        GROUP BY d.`co_uid`;`
        GROUP BY d.`co_uid`
    </select>
</mapper>

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInviteSeparateMapper.xml

@@ -56,7 +56,7 @@
  

  <update id="updateStateByWorkerIdAndBossId">

      UPDATE yeshi_ec_user_invite_separate SET uis_state = #{state}

      WHERE uis_worker_id = #{workerId} AND uis_boss_id = #{bossId}

      WHERE uis_worker_id = #{workerId} AND uis_boss_id = #{bossId} AND uis_state = 0

  </update>

  

  <select id="selectByWorkerIdAndBossId" resultMap="BaseResultMap">


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

@@ -670,5 +670,47 @@


        return deepList;

    }

	
	


    @Override

    public void remvoeBreak(Long id, Long uid, Long tid) {

        ThreeSale threeSale = threeSaleMapper.selectByPrimaryKey(id);

        if (threeSale == null) {

            return;

        }

		
        Long workerId = threeSale.getWorker().getId();

        if (tid.longValue() != workerId.longValue()) {

            return;

        }

		
        Integer expire = threeSale.getExpire();

        if (expire == ThreeSale.EXPIRE_NORMAL) {

            return;

        }

		
        int upExpire = expire;

        Long bossId = threeSale.getBoss().getId();

        if (bossId.longValue() == uid.longValue()) { // 直接粉丝

            if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL4) {

                upExpire =ThreeSale.EXPIRE_BREAK_VIP_DEL34;

            } else {

                upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL3;

            }

        } else { // 间接粉丝

            if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL3) {

                upExpire =ThreeSale.EXPIRE_BREAK_VIP_DEL34;

            } else {

                upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL4;

            }

        }

		
        ThreeSale update = new ThreeSale();

        update.setId(id);

        update.setExpire(upExpire);

        update.setUpdateTime(java.lang.System.currentTimeMillis());

        threeSaleMapper.updateByPrimaryKeySelective(update);

    }



}


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

@@ -5,14 +5,24 @@


import javax.annotation.Resource;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.DateUtil;



import com.yeshi.fanli.dao.mybatis.user.UserInviteSeparateMapper;

import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.TimeUtil;



@Service

public class UserInviteSeparateServiceImpl implements UserInviteSeparateService {

@@ -23,7 +33,21 @@
    @Resource

    private UserVipConfigService userVipConfigService;

    

    @Lazy

    @Resource

    private ThreeSaleSerivce threeSaleSerivce;

    

    @Lazy

    @Resource

    private UserVIPPreInfoService userVIPPreInfoService;

	
    @Lazy

    @Resource

    private UserInfoService userInfoService;

	
    @Lazy

    @Resource

    private UserOtherMsgNotificationService userOtherMsgNotificationService;



    @Override

    public void insertSelective(UserInviteSeparate record) {

@@ -51,8 +75,6 @@
        userInviteSeparateMapper.insertSelective(inviteSeparate);

    }

    

	
	
    @Override

    public void updateInvalidByBossId(Long uid) {

        userInviteSeparateMapper.updateInvalidByBossId(uid);

@@ -75,5 +97,52 @@
    

    

    

    @Override

    @Transactional(rollbackFor = Exception.class)

    public void inviteSeparate(UserInviteSeparate record) {

        if (record == null)

            return;



        Long workerId = record.getWorkerId();

        Long bossId = record.getBossId();

		
        ThreeSale threeSale = threeSaleSerivce.getMyBoss(workerId);

        if (threeSale == null) {

            // 成功脱离 不发消息

            userInviteSeparateMapper.updateStateByWorkerIdAndBossId(workerId, bossId, UserInviteSeparate.STATE_SUCCESS);

            return;

        } 
		
        boolean separate = false;

        UserVIPPreInfo info = userVIPPreInfoService.getVipByProcess(bossId, UserVIPPreInfo.PROCESS_1);

        if (info == null) {

            separate = true;

        } else if (info.getCreateTime().getTime() >= record.getEndTime().getTime()) {

            separate = true;	 
        }

		


        if (!separate) { 
            // 未脱离

            userInviteSeparateMapper.updateStateByWorkerIdAndBossId(workerId, bossId, UserInviteSeparate.STATE_INVALID);

        } else { 
            // 脱离关系

            userInviteSeparateMapper.updateStateByWorkerIdAndBossId(workerId, bossId, UserInviteSeparate.STATE_SUCCESS);



            // 脱离邀请关系

            threeSaleSerivce.inviteSeparate(workerId, bossId);



            int limitDays = Integer.parseInt(userVipConfigService.getValueByKey("invite_separate_limit_days"));

			
            // 消息 TODO

            UserInfo userInfo = userInfoService.selectByPKey(workerId);

            MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();

            msgboss.setContent1(userInfo.getNickName() + workerId + "于"+ TimeUtil.formatDateDot(record.getCreateTime()) + "成功升级成为会员 ");

            msgboss.setContent2("很遗憾，你未能在" + limitDays + "天升级为会员 ");

            msgboss.setContent3("已与其脱离邀请关系");

            userOtherMsgNotificationService.teamSplitCallBoss(bossId, "如有疑问请联系我的-人工客服", msgboss);

        }

    }

	
    

}


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

@@ -5,8 +5,8 @@


import javax.annotation.Resource;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.user.UserInviteValidNumMapper;

import com.yeshi.fanli.dao.mybatis.user.UserInviteValidRecordMapper;

@@ -14,7 +14,6 @@
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

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

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

import com.yeshi.fanli.util.Constant;

@@ -42,12 +41,14 @@
     *  直接粉丝 +1

     * @param uid

     */

    @Transactional(rollbackFor = Exception.class)

    private void addNumFirst(Long uid) {

        UserInviteValidNum inviteValid = userInviteValidNumMapper.selectForUpdate(uid);

        if (inviteValid != null) {

            userInviteValidNumMapper.addNumFirst(uid, 1);

        } else {

            inviteValid = new UserInviteValidNum();

            inviteValid.setId(uid);

            inviteValid.setNumFirst(1);

            inviteValid.setNumSecond(0);

            inviteValid.setUpdateTime(new Date());

@@ -59,12 +60,14 @@
     *  间接粉丝 +1

     * @param uid

     */

    @Transactional(rollbackFor = Exception.class)

    private void addNumSecond(Long uid) {

        UserInviteValidNum inviteValid = userInviteValidNumMapper.selectForUpdate(uid);

        if (inviteValid != null) {

            userInviteValidNumMapper.addNumSecond(uid, 1);

        } else {

            inviteValid = new UserInviteValidNum();

            inviteValid.setId(uid);

            inviteValid.setNumFirst(0);

            inviteValid.setNumSecond(1);

            inviteValid.setUpdateTime(new Date());

@@ -73,6 +76,7 @@
    }

    

    @Override

    @Transactional(rollbackFor = Exception.class)

    public void addValidTeamNum(Long uid, BigDecimal payment, Date payDate) {

        if (uid == null || payment == null || payDate == null) {

            return;

@@ -123,13 +127,14 @@
                return;

            }

            

            // 间接关系

            Long bossIdSuper = threeSaleSuper.getBoss().getId();

            String uniqueKeySuper = StringUtil.Md5(bossIdSuper + "#" + bossId + "#" + UserInviteValidRecord.TYPE_TWO);

            String uniqueKeySuper = StringUtil.Md5(bossIdSuper + "#" + uid + "#" + UserInviteValidRecord.TYPE_TWO);

            UserInviteValidRecord recordSuper = userInviteValidRecordMapper.selectByUniqueKey(uniqueKeySuper);

            if (recordSuper == null) {

                recordSuper = new UserInviteValidRecord();

                recordSuper.setUid(bossIdSuper);

                recordSuper.setWorkerId(bossId);

                recordSuper.setWorkerId(uid);

                recordSuper.setType(UserInviteValidRecord.TYPE_TWO);

                recordSuper.setUniqueKey(uniqueKeySuper);

                recordSuper.setCreateTime(new Date());

@@ -142,15 +147,5 @@
            LogHelper.error(e);

        }

    }

	
	
	
	
	
	
	
	
	
	
     

}


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

@@ -13,14 +13,11 @@


import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPInfoMapper;

import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;

import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;

import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;

import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;

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

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

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

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

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

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

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

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

@@ -45,7 +42,6 @@
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;



@Service

public class UserVIPInfoServiceImpl implements UserVIPInfoService {

@@ -166,60 +162,6 @@
        return userVIPInfoMapper.countQuery(key, state);

    }



    @Override

    @Transactional(rollbackFor = Exception.class)

    public void inviteSeparate(Long workerId, Long bossId) {

        if (workerId == null || bossId == null)

            return;



        // 查询记录

        UserInviteSeparate userInviteSeparate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, bossId);

        if (userInviteSeparate == null)

            return;



        // 是否存在邀请关系

        ThreeSale threeSale = threeSaleSerivce.getMyBoss(workerId);

        if (threeSale == null)

            return;

        Long bossIdExist = threeSale.getBoss().getId();

        if (bossIdExist == null || bossId.longValue() != bossIdExist.longValue())

            return;



        // 上级会员情况

        boolean separate = false;

        UserVIPInfo userVIPInfo = userVIPInfoMapper.selectByPrimaryKey(bossId);

        if (userVIPInfo != null && userVIPInfo.getState() != null

                && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) {

            if (userInviteSeparate.getEndTime().getTime() < userVIPInfo.getSuccessTime().getTime()) {

                separate = true; // 结束时间已经超过

            }

        } else {

            separate = true; // 上级非会员

        }



        if (!separate) {

            // 未脱离

            userInviteSeparateService.updateStateByWorkerIdAndBossId(workerId, bossId,

                    UserInviteSeparate.STATE_INVALID);

        } else {

            // 脱离关系

            userInviteSeparateService.updateStateByWorkerIdAndBossId(workerId, bossId,

                    UserInviteSeparate.STATE_SUCCESS);



            // 脱离邀请关系

            threeSaleSerivce.inviteSeparate(workerId, bossId);



            int limitDays = Integer.parseInt(userVipConfigService.getValueByKey("invite_separate_limit_days"));

            // 消息

            UserInfo userInfo = userInfoService.selectByPKey(workerId);

            MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();

            msgboss.setContent1(userInfo.getNickName() + workerId + "于"

                    + TimeUtil.formatDateDot(userInviteSeparate.getCreateTime()) + "成功升级成为超级会员 ");

            msgboss.setContent2("很遗憾，你未能在" + limitDays + "天升级为超级会员 ");

            msgboss.setContent3("已与其脱离邀请关系");

            userOtherMsgNotificationService.teamSplitCallBoss(bossId, "如有疑问请联系我的-人工客服", msgboss);

        }

    }



    @Transactional(rollbackFor = Exception.class)

    @Override


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

@@ -110,6 +110,12 @@
    }



    @Override

    public UserVIPPreInfo getVipByProcess(Long uid, int process){

        return userVIPPreInfoMapper.selectByUidAndProcess(uid, process);

    }

	


    @Override

    public UserVIPPreInfo getProcessInfo(Long uid, Date time) {

        List<UserVIPPreInfo> infoList = userVIPPreInfoMapper.listByUid(uid);

        if (infoList == null || infoList.size() == 0)

@@ -265,13 +271,15 @@
                    IntegralDetail detail = new IntegralDetail();

                    detail.setTitle("升级VIP福利");

                    detail.setUid(uid);

                    detail.setMoney(Constant.VIP_COLDCOIN_NUM);

                    detail.setMoney(Integer.parseInt(goldcoin));

                    detail.setCreateTime(new Date());

                    detail.setUniqueKey("VIP-3-" + uid);

                    integralDetailService.insertSelective(detail);

                    

                    // 添加金币

                    userInfoExtraService.addGoldCoinByUid(uid, Integer.parseInt(goldcoin));

					
                    //TODO 消息

                }

                

                // 是否存在下级脱离期限 -更新不脱离

@@ -384,6 +392,9 @@
                                UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);

                    }

                }

				
                // TODO 发券消息

				
            } catch (Exception e) {

                e.printStackTrace();

                LogHelper.error(e);


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInviteSeparateService.java

@@ -38,4 +38,10 @@


    public void addPreSeparateRecord(Long workerId, Long bossId);



    /**

     * 脱离邀请关系

     * @param record

     */

    public void inviteSeparate(UserInviteSeparate record);



}


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

@@ -373,4 +373,13 @@
     */

    public long countSecondTeamByUndeleted(Long uid);



	
    /**

     * 删除脱离队员

     * @param id

     * @param uid

     * @param tid

     */

    public void remvoeBreak(Long id, Long uid, Long tid);



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPInfoService.java

@@ -72,12 +72,6 @@


    public long countQuery(String key, Integer state);



    /**

     * 超级会员与上级关系脱离

     * @param workerId

     * @param bossId

     */

    public void inviteSeparate(Long workerId, Long bossId);



    /**

     * 超级会员申请通过


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPPreInfoService.java

@@ -58,4 +58,14 @@
    

    public UserVIPPreInfo selectByUidAndProcess(Long uid,int process);



	
    /**

     * 查询进度根据不同阶段

     * @param uid

     * @param process

     * @return

     * @throws UserVIPPreInfoException

     */

    public UserVIPPreInfo getVipByProcess(Long uid, int process);



}


 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -172,34 +172,9 @@
    // 新人定义： 自完成注册起10天内；

    public static final int TLJ_NEW_USER_DEFINE = 10;



    // vip奖励券券5张

    public static final int VIP_COUPON_REWARD_NUM = 15;

    // vip赠送免单券5张

    public static final int VIP_COUPON_GIVEFREE_NUM = 5;

    // vip赠送金币

    public static final int VIP_COLDCOIN_NUM = 1800;

    // 订单实付款

    public static final BigDecimal VIP_ORDER_PAY = new BigDecimal("1");

    

//    // vip-一阶段分享订单数据

//    public static final int VIP_PROCESS_1_ZIGOU = 60;

//    public static final int VIP_PROCESS_1_SHARE = 120;

//    public static final int VIP_PROCESS_1_TEAM = 8;

//    public static final int VIP_PROCESS_1_TEAM_SECOND = 16;

//	
//    // vip-二阶段分享订单数据

//    public static final int VIP_PROCESS_2_ZIGOU = 120;

//    public static final int VIP_PROCESS_2_SHARE = 240;

//    public static final int VIP_PROCESS_2_TEAM = 16;

//    public static final int VIP_PROCESS_2_TEAM_SECOND = 32;

//	
//	
//    // vip-三阶段分享订单数据

//    public static final int VIP_PROCESS_3_ZIGOU = 240;

//    public static final int VIP_PROCESS_3_SHARE = 480;

//    public static final int VIP_PROCESS_3_TEAM = 32;

//    public static final int VIP_PROCESS_3_TEAM_SECOND = 64;

//	 
        

    // 订单列表显> 时间 TODO

    public static final String ORDER_SHOW_BRACE_TIME = "2019-12-14";