yujian
2019-12-13 32da899ed6fc27994cdfdb731a0ff450c7a24af4
邀请统计
3个文件已修改
20 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackWinInviteService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -420,19 +420,19 @@
     *  该用户邀请进度
     * 
     * @param acceptData
     * @param uid  下线UID
     * @param tid  下线UID
     * @param out
     */
    @RequestMapping(value = "getInviteProgress")
    public void getInviteProgress(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
        if (uid == null || uid <= 0) {
    public void getInviteProgress(AcceptData acceptData, Long uid, Long tid, String callback, PrintWriter out) {
        if (uid == null || uid <= 0 || tid == null || tid <= 0) {
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "传递参数缺失"));
            return;
        }
        
        JSONObject data = new JSONObject();
        data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid));
        data.put("num", threeSaleSerivce.getTeamOrderNumByWorkerId(uid));
        data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid, tid));
        data.put("num", threeSaleSerivce.getTeamOrderNumByWorkerId(tid));
        if (!StringUtil.isNullOrEmpty(callback)) {
            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
        } else {
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -336,13 +336,13 @@
    
    @Override
    public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid) {
    public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid, Long tid) {
        List<RedPackWinProgressVO> listVO = new ArrayList<RedPackWinProgressVO>();
        ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(uid);
        ThreeSale threeSale = threeSaleSerivce.getNearRelationByBossIdAndWorkerId(uid, tid);
        if (threeSale == null || threeSale.getSucceedTime() == null)
            return listVO;
        
        UserInfo userInfo = userInfoService.selectByPKey(uid);
        UserInfo userInfo = userInfoService.selectByPKey(tid);
        if (userInfo == null) 
            return listVO;
        
@@ -350,7 +350,7 @@
        listVO.add(new RedPackWinProgressVO("确立邀请", TimeUtil.formatDate(threeSale.getSucceedTime())));
        
        // 奖励记录
        List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(threeSale.getBoss().getId(), uid);
        List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(uid, tid);
        if (listWin == null || listWin.size() == 0) 
            return listVO;
        
fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackWinInviteService.java
@@ -53,7 +53,7 @@
     * @param uid
     * @return
     */
    public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid);
    public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid, Long tid);
    /**