Merge remote-tracking branch 'origin/div' into div

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

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

@@ -205,8 +205,7 @@


         data.put("clickUrl", url);

         data.put("token", taoBaoLink.getTaoToken());

         data.put("rule",

               "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

         data.put("rule", configService.get("share_single_goods_rule"));

         data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



         String shareText = "";

@@ -931,15 +930,26 @@
               if (goodsPicture.getGoodState() == 1) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               } else {

                  TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();

                  try {

                     TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());

                  } catch (TaobaoGoodsDownException e) {

                     out.print(JsonUtil.loadFalseResult("该商品已下架"));

                     return;

                  }

               } 
					
               TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();

               if (goods.getState() != null && goods.getState() == 1) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					
               if (!goods.isCoupon()) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					
               try {

                  TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());

               } catch (TaobaoGoodsDownException e) {

                  out.print(JsonUtil.loadFalseResult("该商品已下架"));

                  return;

               }

					
            }



            // 分享文字