饿了么修改，会员自主申请bug修改

admin

2020-05-18 c37ba1bdbf2454184889d6ce7bfd80c7aa113424

饿了么修改，会员自主申请bug修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java

@@ -128,7 +128,7 @@


        BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());

        

        moneyBigDecial=MoneyBigDecimalUtil.div(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);

        moneyBigDecial=MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);



        List<UserTeamLevel> bossList = new ArrayList<>();

        if (levelList.size() > 1)


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java

@@ -82,6 +82,31 @@
        }

    }



    @RequestMapping(value = "getApplyInfo")

    public void getApplyInfo(AcceptData acceptData, String id, Long uid, String callback, PrintWriter out) {

        if (StringUtil.isNullOrEmpty(id)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请上传id"));

            return;

        }



        GiveVIPApplyInfo info = giveVIPApplyInfoService.selectByPrimaryKey(id);

        if (info == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("申请信息不存在"));

            return;

        }



        // 查询开通人是否为他的下级

        ThreeSaleDetail detail = threeSaleDetailService.getByBossUidAndWorkerUid(info.getSourceUid(),

                info.getTargetUid());

        if (detail == null && info.getTargetUid().longValue() != uid) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户不是您的粉丝"));

            return;

        }



        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(info)));



    }



    // 提交申请信息

    @RequestMapping(value = "uploadApplyInfo")

    public void uploadApplyInfo(AcceptData acceptData, GiveVIPApplyInfo info, String callback,

@@ -132,8 +157,9 @@
            if (imgList.size() > 0)

                info.setImgList(imgList);

            info.setState(GiveVIPApplyInfo.STATE_NOT_VERIFY);

            giveVIPApplyInfoService.updateGiveVIPApplyInfo(info);

			
        }

        giveVIPApplyInfoService.updateGiveVIPApplyInfo(info);

        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资料提交成功"));

    }



@@ -171,9 +197,9 @@


        Gson gson = gb.create();



        if (Constant.IS_TEST) {

            count = 100;

        }

        // if (Constant.IS_TEST) {

        // count = 100;

        // }



        JSONObject data = new JSONObject();

        data.put("list", gson.toJson(recordList));


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

@@ -190,7 +190,7 @@


    @Override

    public List<GiveVIPApplyInfo> listBySourceUid(Long uid, int page, int pageSize) {

        return giveVIPApplyInfoDao.listBySourceUid(uid, null, (page - 1) * pageSize, 1);

        return giveVIPApplyInfoDao.listBySourceUid(uid, null, (page - 1) * pageSize, pageSize);

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java

@@ -254,6 +254,10 @@
                    TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert(adzoneId,

                            activityid, relationId);

                    String link = dto.getShort_click_url();

                    if (StringUtil.isNullOrEmpty(link)) {

                        link = dto.getClick_url();

                    }



                    String token = TaoKeApiUtil.getTKToken("http://", "淘宝官方活动", link);

                    newText = newText.replace(st, TaoBaoUtil.filterTaoToken(token));

                }


 fanli/src/main/java/com/yeshi/fanli/util/factory/user/vip/GiveVIPApplyInfoRecordVOFactory.java

@@ -9,10 +9,9 @@
        GiveVIPApplyInfoRecordVO vo = new GiveVIPApplyInfoRecordVO();

        vo.setCreateTime(info.getCreateTime());

        vo.setLevel(info.getLevel());

        if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)



            vo.setLink(uploadInfoLink.replace("[ID]", info.getId()));

        else

            vo.setLink(vipLink);



        if (info.getState() == GiveVIPApplyInfo.STATE_REJECT)

            vo.setRejectReson(info.getRejectReson());

        vo.setState(info.getState());