后台编辑

yujian

2020-01-17 bf0a347104579e5f7a2ed6e660ebb9f17f76ffc0

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

@@ -28,7 +29,7 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -136,8 +137,8 @@
    */



   @RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)

   public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, String callback,

         PrintWriter out) {

   public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, Integer goodsType, 
         String callback, PrintWriter out) {

      long begin = java.lang.System.currentTimeMillis();

      if (StringUtil.isNullOrEmpty(id)) {

         out.print(JsonUtil.loadFalseResult(1, "请上传id"));

@@ -181,14 +182,14 @@


         if (uid != null && !"".equals(uid.trim())) {

            CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),

                  Long.parseLong(id));

                  Long.parseLong(id), goodsType);

            data.put("collection", collectionGoods != null ? true : false);

         }

         taoBaoGoodsBriefExtra.setAuctionUrl(null);

         data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));

         String info = configService.get("detail_prompt");

         String info = configService.get(ConfigKeyEnum.detailPrompt.getKey());

         data.put("info", info);

         String onlyInfo = configService.get("only_info");

         String onlyInfo = configService.get(ConfigKeyEnum.onlyInfo.getKey());

         data.put("only", onlyInfo);

         int showType = taoBaoGoodsBriefExtra.getShowType();

         String price = "";

@@ -203,7 +204,7 @@
         data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());

         data.put("shareContent", "¥" + price + "元");

         data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());

         String html = configService.get("downAPP");

         String html = configService.get(ConfigKeyEnum.downAPP.getKey());

         data.put("downAPP", html);

         String shareSinaContent = configService.get("shareSinaContent");

         data.put("shareSina",