bug修改

admin

2019-03-22 3c5bf6b869f25fb86f8650c40c312501f9fa049f

bug修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

@@ -1808,7 +1809,7 @@


            String token = "";

            if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {

                 token = redisManager.getCommonTaoToken(tb.getAuctionId());

                token = redisManager.getCommonTaoToken(tb.getAuctionId());

                if (StringUtil.isNullOrEmpty(token)) {

                    token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());

                    redisManager.saveCommonTaoToken(tb.getAuctionId(), token);

@@ -1891,8 +1892,13 @@
        data.put("couponUsers", listCouponUser);

        data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);

        // 商品链接

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

                Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));

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

                Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");

        try {

            data.put("h5Url", HttpUtil.getShortLink(h5Url));

        } catch (Exception e) {

            data.put("h5Url", h5Url);

        }



        // 取消分享活动

        // if (!StringUtil.isNullOrEmpty(uid)

@@ -2021,40 +2027,43 @@
        });



        List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();

//删除推荐

//

//        try {

//            List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);

//

//            if (listRecommend != null && listRecommend.size() > 1) {

//                for (QualityFactory quality : listRecommend) {

//

//                    TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

//                    if (taoBaoGoodsBrief == null) {

//                        continue;

//                    }

//

//                    int biz30day = taoBaoGoodsBrief.getBiz30day();

//                    if (biz30day >= 10000) {

//                        double sales = biz30day;

//                        String salesCountMidea = String.format("%.1f", sales / 10000);

//                        taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

//                    } else {

//                        taoBaoGoodsBrief.setSalesCount(biz30day + "");

//                    }

//

//                    // 改变图片尺寸

//                    String pictUrl = taoBaoGoodsBrief.getPictUrl();

//                    if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {

//                        taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

//                    }

//

//                    listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

//                }

//            }

//        } catch (Exception e2) {

//            e2.printStackTrace();

//        }

        // 删除推荐

        //

        // try {

        // List<QualityFactory> listRecommend =

        // qualityGoodsService.recommendByAuctionId(id);

        //

        // if (listRecommend != null && listRecommend.size() > 1) {

        // for (QualityFactory quality : listRecommend) {

        //

        // TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

        // if (taoBaoGoodsBrief == null) {

        // continue;

        // }

        //

        // int biz30day = taoBaoGoodsBrief.getBiz30day();

        // if (biz30day >= 10000) {

        // double sales = biz30day;

        // String salesCountMidea = String.format("%.1f", sales / 10000);

        // taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

        // } else {

        // taoBaoGoodsBrief.setSalesCount(biz30day + "");

        // }

        //

        // // 改变图片尺寸

        // String pictUrl = taoBaoGoodsBrief.getPictUrl();

        // if (!StringUtil.isNullOrEmpty(pictUrl) &&

        // !pictUrl.contains("320x320")) {

        // taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

        // }

        //

        // listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

        // proportion.toString(), null));

        // }

        // }

        // } catch (Exception e2) {

        // e2.printStackTrace();

        // }



        // 取偶数个数据

        if (listExtra.size() % 2 != 0) {


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -1717,6 +1717,12 @@
                goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);

            }

            goods.setSellerId(seller.optLong("shopId"));

            String shopType = seller.optString("shopType");

            if ("B".equalsIgnoreCase(shopType)) {

                goods.setUserType(1);

            } else

                goods.setUserType(0);



            goods.setShopTitle(seller.optString("shopName"));

            return goods;

        }