券链接处理

yujian

2019-07-29 afb7872d507a8558f734403d17936a62339cf318

券链接处理

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -448,8 +448,7 @@
                    Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                    for (JDGoods goods : goodsList) {

                        GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                                shareRate);

                        GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate,    shareRate);

                        array.add(gson.toJson(goodsDetailVO));

                    }

                }


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

@@ -370,73 +370,6 @@
    }

    

    

	
    @RequestMapping(value = "getTotalOrderNum")

    public void getTotalOrderNum(AcceptData acceptData, Long uid, PrintWriter out) {

        if (uid == null) {

            out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

            return;

        }



        UserInfo user = userInfoService.selectByPKey(uid);

        if (user == null) {

            out.print(JsonUtil.loadFalseResult(1, "用户不存在"));

            return;

        }



        UserInfo userInfo = UserUtil.filterForClientUser(user);



        // 1.5.0 版本之后返回新的等级

        String version = acceptData.getVersion();

        if (version != null && version.trim().length() > 0) {

            int versionCode = Integer.parseInt(version);

            String platform = acceptData.getPlatform();



            AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");

            if (versionInfo != null) {

                int versionCode150 = versionInfo.getVersionCode();

                if (versionCode >= versionCode150) {

                    UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId());

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

                        String picture = userInfoExtra.getUserRank().getPicture();

                        String icon = userInfoExtra.getUserRank().getIcon();



                        userInfo.setRankIcon(icon);

                        userInfo.setRankNamePicture(picture);

                    }

                }

            }

        }



        /* 总订单统计 */

        Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null, null);

        int self = 0; // 返利订单

        if (countOrder.get("totalSelf") != null) {

            self = countOrder.get("totalSelf").intValue();

        }



        int shared = 0;  // 分享订单

        if (countOrder.get("totalShared") != null) {

            shared = countOrder.get("totalShared").intValue();

        }



        int invite = 0;  // 邀请订单

        if (countOrder.get("totalInvite") != null) {

            invite = countOrder.get("totalInvite").intValue();

        }

        int total = self + shared + invite;



        JSONObject data = new JSONObject();

        data.put("total", total);

        data.put("self", self);

        data.put("shared", shared);

        data.put("invite", invite);

        data.put("userInfo", userInfo);

        out.print(JsonUtil.loadTrueResult(data));

    }



	
	
    /**

     * 统计各个平台数据

     * @param acceptData


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

@@ -76,13 +76,8 @@
            return;

        }

        

        if (type == null) {

            out.print(JsonUtil.loadFalseResult(1, "请传入类型"));

            return;

        }

		
        List<CommonContentNav> list = null;

        if (type == Constant.SOURCE_TYPE_TAOBAO) {

        if (type == null || type == Constant.SOURCE_TYPE_TAOBAO) {

            list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));

        } else if (type == Constant.SOURCE_TYPE_JD) {

            // 暂无分类

@@ -118,12 +113,7 @@
            return;

        }



        if (type == null) {

            out.print(JsonUtil.loadFalseResult(1, "请传入类型"));

            return;

        }

		
        if (type == Constant.SOURCE_TYPE_TAOBAO) {

        if (type == null || type == Constant.SOURCE_TYPE_TAOBAO) {

            getListTB(acceptData, key, page, cid, out);

            return;

        }

@@ -199,7 +189,7 @@
                Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                for (JDGoods goods : goodsList) {

                    array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate, shareRate)));

                    array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate)));

                }

            }

        }

@@ -238,7 +228,7 @@
                Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                for (PDDGoodsDetail goods : goodsList) {

                    array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate, shareRate)));

                    array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate)));

                }

            }

        }


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

@@ -75,6 +75,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.taobao.TaoLiJinUtil;

import com.yeshi.fanli.vo.goods.CouponInfoVO;

import com.yeshi.fanli.vo.goods.GoodsDetailExtraVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.MoneyInfoVO;

@@ -396,9 +397,8 @@
            extraVO.setIsNative(true);

        } 



        // 商品链接

        String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

                Constant.systemCommonConfig.getShareGoodsPagePath(), id + "");

        String h5Url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),

                Constant.systemCommonConfig.getShareGoodsPagePath(), "", id + "");

        try {

            extraVO.setH5Url(HttpUtil.getShortLink(h5Url));

        } catch (Exception e) {

@@ -519,9 +519,7 @@
        }

        

        // 分享路径

        String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());

        ShareVO shareInfoVO = new ShareVO();

        shareInfoVO.setUrl(shareUrl);

        shareInfoVO.setHelpLink(helpLink);

        extraVO.setShare(shareInfoVO);



@@ -585,8 +583,16 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, null, fanLiRate, shareRate);

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, fanLiRate, shareRate);



        CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

        if (couponInfo != null) {

            // 券链接处理

            String materialId = "https://item.jd.com/" + id + ".html";

            String url = JDApiUtil.convertShortLink(materialId, couponInfo.getLink(), JDApiUtil.POSITION_COUPON+"", null);

            couponInfo.setLink(url);

        }

		
        ShopInfoVO shopInfo = goodsDetail.getShopInfo();

        if (shopInfo != null) {

            if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null

@@ -649,8 +655,8 @@
        }



        // 商品链接

        String h5Url = String.format("http://%s%s?id=%s&appType=flq&goodsType=%s", configService.getH5Host(),

                Constant.systemCommonConfig.getShareGoodsPagePath(), jdGoods.getSkuId() + "", Constant.SOURCE_TYPE_JD);

        String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

                Constant.systemCommonConfig.getShareGoodsPagePathJD(), "", id + "");

        try {

            extraVO.setH5Url(HttpUtil.getShortLink(h5Url));

        } catch (Exception e) {

@@ -664,11 +670,7 @@
            helpLink = configService.get("no_rebate_help_link");

        }



        // 分享路径

        String shareUrl = String.format("%s?id=" + jdGoods.getSkuId(),

                Constant.systemCommonConfig.getAppShareInfoUrl());

        ShareVO shareInfoVO = new ShareVO();

        shareInfoVO.setUrl(shareUrl);

        shareInfoVO.setHelpLink(helpLink);

        extraVO.setShare(shareInfoVO);



@@ -717,8 +719,13 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, null, fanLiRate, shareRate);



        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, fanLiRate, shareRate);

        CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

        if (couponInfo != null) {

            String url = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_COUPON + "", null);

            couponInfo.setLink(url);

        }

		
        ShopInfoVO shopInfo = goodsDetail.getShopInfo();

        if (shopInfo != null) {

            if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null

@@ -782,9 +789,9 @@
            extraVO.setIsNative(true);

        }



        // 商品链接

        String h5Url = String.format("http://%s%s?id=%s&appType=flq&goodsType=%s", configService.getH5Host(),

                Constant.systemCommonConfig.getShareGoodsPagePath(), id + "", Constant.SOURCE_TYPE_PDD);

        // 分享路径

        String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),

                Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "",    id + "");

        try {

            extraVO.setH5Url(HttpUtil.getShortLink(h5Url));

        } catch (Exception e) {

@@ -798,10 +805,8 @@
        if (StringUtil.isNullOrEmpty(helpLink)) {

            helpLink = configService.get("no_rebate_help_link");

        }

        // 分享路径

        String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());

		
        ShareVO shareInfoVO = new ShareVO();

        shareInfoVO.setUrl(shareUrl);

        shareInfoVO.setHelpLink(helpLink);

        extraVO.setShare(shareInfoVO);



@@ -853,7 +858,7 @@
            List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();

            

            for (JDGoods goods: list) {

                listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate, shareRate));

                listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate));

            }

            

            // 取偶数个数据

@@ -893,7 +898,7 @@
                        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                        BigDecimal shareRate = hongBaoManageService.getShareRate();

                        for (PDDGoodsDetail goods : goodsList) {

                            listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate, shareRate));

                            listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate));

                        }

                    }

                }

@@ -1024,7 +1029,7 @@
        if (couponInfo != null) {

            couponUrl = couponInfo.getLink();

        }

        String jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", id + "");

        String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + "");

        

        JSONObject data = new JSONObject();

        data.put("native", true);


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

@@ -116,8 +116,7 @@
                Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                for (JDGoods goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                            shareRate);

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate,    shareRate);

                    array.add(gson.toJson(goodsDetailVO));

                }

            }


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

@@ -110,8 +110,7 @@
                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,

                            shareRate);

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

                    array.add(gson.toJson(goodsDetailVO));

                }

            }


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

@@ -16,8 +16,6 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.jd.JDFilter;

import com.yeshi.fanli.dto.jd.JDSearchFilter;

import com.yeshi.fanli.dto.jd.JDSearchResult;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

@@ -38,9 +36,11 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.jd.JDGoodsService;

import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

@@ -50,9 +50,6 @@
import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

@@ -106,6 +103,12 @@
    @Resource

    private SwiperPictureService swiperPictureService;

    

    @Resource

    private JDGoodsService jdGoodsService;

	
    @Resource

    private PDDGoodsService pddGoodsService;

	 
    

    /**

     * 新版推荐专题管理(1.5.3)

@@ -313,7 +316,7 @@
        }

        

        if (goodsType == Constant.SOURCE_TYPE_PDD) {

            searchPDDGoods(acceptData, page, out);

            getIndexPDDGoods(acceptData, page, out);

            return;

        }

        out.print(JsonUtil.loadFalseResult("商品类型错误"));

@@ -475,21 +478,7 @@
     * @param out

     */

    private void getIndexJDGoods(AcceptData acceptData, int page, PrintWriter out) {

        JDSearchResult result = null;

        String way = configService.get("jd_api_search_key");

        if ("1".equals(way)) {

            JDFilter filterAPI = new JDFilter();

            filterAPI.setPageIndex(page);

            filterAPI.setPageSize(20);

            result = JDApiUtil.queryByKey(filterAPI);

        } else {

            // 网页爬取

            JDSearchFilter jdfilter = new JDSearchFilter();

            jdfilter.setPageNo(page);

            jdfilter.setPageSize(Constant.PAGE_SIZE);

            result = JDUtil.searchByKey(jdfilter);

        }



        JDSearchResult result = jdGoodsService.getIndexJDGoods(page);

        long count = 0;

        JSONObject data = new JSONObject();

        JSONArray array = new JSONArray();

@@ -506,8 +495,7 @@
                Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                for (JDGoods goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                            shareRate);

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);

                    array.add(gson.toJson(goodsDetailVO));

                }

            }

@@ -525,9 +513,8 @@
     * @param page

     * @param out

     */

    private void searchPDDGoods(AcceptData acceptData, int page, PrintWriter out) {

        PDDGoodsResult result = PinDuoDuoApiUtil.getTopList(PinDuoDuoApiUtil.PID_FANLI, page-1, Constant.PAGE_SIZE, 1);

	
    private void getIndexPDDGoods(AcceptData acceptData, int page, PrintWriter out) {

        PDDGoodsResult result = pddGoodsService.getIndexPDDGoods(page);

        int count = 0;

        JSONArray array = new JSONArray();

        if (result != null) {

@@ -539,8 +526,7 @@
                BigDecimal shareRate = hongBaoManageService.getShareRate();



                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,

                            shareRate);

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

                    array.add(gson.toJson(goodsDetailVO));

                }

            }


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

@@ -592,8 +592,7 @@
                Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

                for (JDGoods goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                            shareRate);

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);

                    array.add(gson.toJson(goodsDetailVO));

                }

            }

@@ -669,7 +668,7 @@
                BigDecimal shareRate = hongBaoManageService.getShareRate();



                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate,

                            shareRate);

                    array.add(gson.toJson(goodsDetailVO));

                }


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -460,7 +460,7 @@
        }

        

        String materialId = "https://item.jd.com/" + id + ".html";

        String jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);

        String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);

        

        int priceType = 1;

        BigDecimal price = jdGoods.getPrice();;