搜索词

yujian

2019-07-17 20d1a38a0f8049873f1fbbaef96c22e971ea9d77

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

@@ -70,7 +70,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;

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

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

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

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

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.tlj.ReduceHongBao;

import com.yeshi.fanli.vo.tlj.SpreadHongBao;

@@ -160,13 +160,13 @@
    */

   @RequestMapping(value = "getDetail", method = RequestMethod.POST)

   public void getDetail(AcceptData acceptData, Long id, Integer goodsType, Long uid, String from, PrintWriter out) {

      if (id == null || goodsType == null) {

         out.print(JsonUtil.loadFalseResult(1, "商品id和商品平台不能为空"));

      if (id == null) {

         out.print(JsonUtil.loadFalseResult(1, "商品id不能为空"));

         return;

      }



		
      // 淘宝商品

      if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {

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

         getTaoBaoGoodsDetial(acceptData, id, uid, from, out);

         return;

      }

@@ -347,10 +347,10 @@
      

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(tb, null, fanLiRate, shareRate);

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);

      

      // 店铺信息

      TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());

      TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(id, goods.getSellerId());

      if (shop != null) {

         String shopLink = shop.getShopLink();

         if (StringUtil.isNullOrEmpty(shopLink)) {

@@ -451,11 +451,11 @@


         SpreadHongBao spreadHongBao = new SpreadHongBao();

         if (isNewUser) {

            spreadHongBao.setMoney("¥1");

            spreadHongBao.setMoney("1");

         } else {

            moneyType = 2;

            fanliValid = false;

            spreadHongBao.setMoney("¥" + spreadMoney.toString());

            spreadHongBao.setMoney(spreadMoney.toString());

            

            ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();

            textStyleVO1.setContent("分享");

@@ -512,7 +512,7 @@
         ReduceHongBao reduceHongBao = new ReduceHongBao();

         reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());

         reduceHongBao.setMoney(tljHongBao);

         reduceHongBao.setName("付款立减 ¥" + tljHongBao);

         reduceHongBao.setName("付款立减 ");

         reduceHongBao.setTip("当日领取，当日内使用，过期失效");

         reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());

         

@@ -537,10 +537,10 @@
      

      // 分享路径

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

      ShareInfoVO shareInfoVO = new ShareInfoVO();

      ShareVO shareInfoVO = new ShareVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -665,10 +665,10 @@
      // 分享路径

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

            Constant.systemCommonConfig.getAppShareInfoUrl());

      ShareInfoVO shareInfoVO = new ShareInfoVO();

      ShareVO shareInfoVO = new ShareVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -777,10 +777,10 @@
      }

      // 分享路径

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

      ShareInfoVO shareInfoVO = new ShareInfoVO();

      ShareVO shareInfoVO = new ShareVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));