admin
2019-03-14 a12dc05a50bec52ba8d5e3bba0d3f4c0ab17ac51
详情接口修改
4个文件已修改
34 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -145,6 +145,7 @@
            data.put("baichuan", false);// 不需要采用阿里百川的方式加载webview
            data.put("goodsDetail", false);// 不需要拦截商品详情
        }
        out.print(JsonUtil.loadTrueResult(data));
    }
    /**
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
@@ -194,7 +194,7 @@
     * @param out
     */
    @RequestMapping(value = "isGoodsExtend")
    public void isGoodsExtend(String goodsId, String goodsType, PrintWriter out) {
    public void isGoodsExtend(AcceptData acceptData,String goodsId, String goodsType, PrintWriter out) {
        if (StringUtil.isNullOrEmpty(goodsId)) {
            out.print(JsonUtil.loadFalseResult(1, "未参与推广"));
            return;
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -105,6 +105,7 @@
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -674,7 +675,7 @@
                clientTBPid = tbPidService.getIOSDefault();
            }
        }
        TaoBaoGoodsBrief tb = null;
        try {
            TaoKeAppInfo app = new TaoKeAppInfo();
@@ -1783,7 +1784,6 @@
            }
        } else {
            // 用户已经登录
            TBPid tbPid = null;
            if (acceptData.getPlatform().equalsIgnoreCase("android")) {
@@ -1895,6 +1895,7 @@
        TaoBaoGoodsBrief tb = null;
        if (goodsList.size() > 0) {
            tb = goodsList.get(0);
        }
        if (tb == null) {
@@ -1974,6 +1975,12 @@
                hongBao = "¥" + quanPrice.toString();
            }
            String token = "";
            if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
                token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
                tb.setCouponLinkTaoToken(token);
            }
            // 服务端转链
            if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
                couponInfo.put("couponUrl", tb.getCouponLink());
@@ -1985,6 +1992,8 @@
            couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
            couponInfo.put("couponTime", "使用期限:" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
                    + tb.getCouponEffectiveEndTime().replace("-", "."));
            // 券的口令
            couponInfo.put("couponToken", token);
            goods.put("couponInfo", couponInfo);
            if (tb.getBiz30day() >= 1000) {
@@ -2041,10 +2050,14 @@
        data.put("storageState", storageState);
        data.put("shareUrl", shareUrl);
        data.put("goods", goods);
        data.put("shareUsers", listShareUser);
        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() + ""));
        // 取消分享活动
        // if (!StringUtil.isNullOrEmpty(uid)
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -693,7 +693,10 @@
        tg.setBiz30day(tb.getBiz30day());
        tg.setSalesCount(TaoBaoUtil.getSaleCount(tb.getBiz30day()));
        tg.setTitle(tb.getTitle());
        tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));
        if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
            tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrlWhite()));
        else
            tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));
        tg.setZkPrice(tb.getZkPrice());
        tg.setAuctionUrl(tb.getAuctionUrl());
        tg.setReservePrice(tb.getReservePrice());
@@ -1757,12 +1760,11 @@
            TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
            goods.setAuctionId(item.optLong("itemId"));
            goods.setTitle(item.optString("title"));
            if (item.optJSONArray("images") != null && item.optJSONArray("images").size() > 0)
            {
                String picture=item.optJSONArray("images").optString(0);
                goods.setPictUrl(picture.startsWith("http")?picture:"https:"+picture);
            if (item.optJSONArray("images") != null && item.optJSONArray("images").size() > 0) {
                String picture = item.optJSONArray("images").optString(0);
                goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);
            }
                goods.setSellerId(seller.optLong("shopId"));
            goods.setSellerId(seller.optLong("shopId"));
            goods.setShopTitle(seller.optString("shopName"));
            return goods;
        }