帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

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

@@ -10,17 +10,21 @@
import java.util.regex.Pattern;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;



import org.springframework.core.task.TaskExecutor;

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.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.douyin.DouYinGoods;

import com.yeshi.fanli.dto.jd.JDFilter;

import com.yeshi.fanli.dto.jd.JDSearchFilter;

import com.yeshi.fanli.dto.jd.JDSearchResult;

@@ -35,22 +39,30 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.TokenRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.brand.BrandInfoService;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

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

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

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

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

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

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.user.HistorySearchService;

import com.yeshi.fanli.service.inter.user.TokenRecordService;

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.DouYinUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.cache.IntegralGetCacheManager;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

@@ -61,8 +73,10 @@
import com.yeshi.fanli.util.taobao.SearchFilterUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.brand.BrandInfoVO;

import com.yeshi.fanli.vo.brand.TaoBaoShopVO;

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

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -107,6 +121,20 @@
   @Resource(name = "taskExecutor")

   private TaskExecutor executor;



   @Resource

   private TokenRecordService tokenRecordService;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private IntegralGetCacheManager integralGetCacheManager;

	
	
   @Resource

   private BrandInfoService brandInfoService;

	


   /**

    * 粘贴板信息推荐

    * 

@@ -116,13 +144,24 @@
    * @param out

    */

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

   public void getRecommendInfo(AcceptData acceptData, String text, PrintWriter out) {

   public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) {

      if (StringUtil.isNullOrEmpty(text)) {

         out.print(JsonUtil.loadFalseResult("值为空"));

         return;

      }

      // 去除前后空格

      text = text.trim();



      try {

         TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);

         out.print(JsonUtil.loadTrueResult(tokenVO));

         return;

      } catch (TokenRecordException e) {

         if (e.getCode() == 1001) { // 需要用户登录

            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

            return;

         }

      }



      TaoBaoGoodsBrief tb = null;

      String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";

@@ -147,12 +186,14 @@
            return;

         }



         if (analysisTaoToken(text, out)) {

         if (analysisTaoToken(acceptData, text, out)) {

            return;

         }



         if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text))) {

            out.print(JsonUtil.loadFalseResult("不支持推荐"));

            return;

         }

         JSONObject root = new JSONObject();



         root.put("type", 2);

         JSONObject data = new JSONObject();

         data.put("title", text);

@@ -161,6 +202,7 @@
         return;

      }



      int type = 3;

      CommonGoods commonGoods = null;

      text = matcher.group();



@@ -186,7 +228,8 @@
         }

         tb = TaoBaoUtil.isAlimama(id);

         if (tb == null) {

            tb = TaoBaoUtil.parsePhoneTmAndTb(id);

            type = 4;

            tb = getTaoBaoGoodsBriefFromGoodsId(id);

         }

      } else if (text.contains("http://zmnxbc.com")) { // 手机端天猫APP分享

         tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);

@@ -197,23 +240,72 @@
         id = map.get("id").replace("}", "");

         tb = TaoBaoUtil.isAlimama(id);

         if (tb == null) {

            tb = TaoBaoUtil.parsePhoneTmAndTb(id);

            type = 4;

            tb = getTaoBaoGoodsBriefFromGoodsId(id);

         }

      } else if (text.contains("v.douyin.com")) { // 抖音

         analysisDouYin(acceptData, text, out);

         return;

      } else {

         tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);



         if (tb == null) {

            String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);

            if (!StringUtil.isNullOrEmpty(goodsId)) {

               tb = getTaoBaoGoodsBriefFromGoodsId(goodsId);

               if (tb != null)

                  type = 4;

            }

         }



         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);

				
            // 微信链接

            if (StringUtil.isNullOrEmpty(jdId)) {

               jdId = JDUtil.getJDGoodsIdByWeiXin(text);

            }

				
            // 领券短连接

            if (StringUtil.isNullOrEmpty(jdId) && text.contains("u.jd.com")) {

               jdId = JDUtil.getJDGoodsIdByUJD(text);

            }

				
            if (!StringUtil.isNullOrEmpty(jdId)) {

               JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

               if (goods != null)

                  commonGoods = CommonGoodsFactory.create(goods);

               if (goods != null) {

                  // 高级接口 -- 信息更完整

                  JDGoods jdGoods = JDApiUtil.queryGoodsDetail(Long.parseLong(jdId));

                  if (jdGoods != null) {

                     commonGoods = CommonGoodsFactory.create(jdGoods);

                  } else {

                     commonGoods = CommonGoodsFactory.create(goods);

                  }

               } else {

                  type = 4;

                  goods = JDUtil.getSimpleGoodsInfo(jdId);

                  if (goods != null) {

                     commonGoods = new CommonGoods();

                     commonGoods.setTitle(goods.getSkuName());

                     commonGoods.setPicture(goods.getPicUrl());

                  }

               }

            } else {

               String pddId = PinDuoDuoUtil.getPDDGoodsId(text);

               if (!StringUtil.isNullOrEmpty(pddId)) {

                  PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));

                  if (goods != null)

                  if (goods != null) {

                     commonGoods = CommonGoodsFactory.create(goods);

                  } else {

                     type = 4;

                     goods = PinDuoDuoUtil.getPDDGoodsInfo(pddId);

                     if (goods != null) {

                        commonGoods = new CommonGoods();

                        commonGoods.setTitle(goods.getGoodsName());

                        commonGoods.setPicture(goods.getGoodsThumbnailUrl());

                     }

                  }

               }

            }

         }

@@ -221,6 +313,63 @@


      if (tb == null && commonGoods == null) {

         out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

         return;

      }



      if (type == 4) {

         if (!VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {

            out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

            return;

         }



         JSONObject data = new JSONObject();

         if (tb != null) {

            commonGoods = new CommonGoods();

            commonGoods.setTitle(tb.getTitle());

            commonGoods.setPicture(tb.getPictUrl());

         }



         if (StringUtil.isNullOrEmpty(commonGoods.getTitle())

               || StringUtil.isNullOrEmpty(commonGoods.getPicture())) {

            out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

            return;

         }



         JSONObject goodsJSON = new JSONObject();

         goodsJSON.put("title", commonGoods.getTitle());

         goodsJSON.put("pictUrl", commonGoods.getPicture());



         data.put("type", type);

         data.put("desc", "该商品无推广信息");

         data.put("goods", goodsJSON);

         out.print(JsonUtil.loadTrueResult(data));

         return;

      }



      JSONObject data = new JSONObject();

      if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

         if (tb != null) {

            TaoBaoGoodsBrief goodsBrief = null;

            try {

               goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            }

            if (goodsBrief == null) {

               out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

               return;

            }

            commonGoods = CommonGoodsFactory.create(goodsBrief);

         }



         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

         data.put("type", type);

         data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

               new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

         out.print(JsonUtil.loadTrueResult(data));

         return;

      }



@@ -233,7 +382,6 @@
         commonGoods.setPicture(tb.getPictUrl());

      }



      JSONObject data = new JSONObject();

      JSONObject taoBaoGoodsJSON = new JSONObject();

      taoBaoGoodsJSON.put("title", commonGoods.getTitle());

      taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");

@@ -253,11 +401,64 @@
      JSONObject root = new JSONObject();

      root.put("type", 1);

      root.put("data", data);



      out.print(JsonUtil.loadTrueResult(root));

   }



   private boolean analysisTaoToken(String text, PrintWriter out) {

   private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId) {

      TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);

      if (tb == null && NumberUtil.isNumeric(goodsId)) {// 是数字

         tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));

         if (tb != null) {

            tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));

         }

      }

      return tb;

   }



   /**

    * 解析抖音链接

    * 
    * @param acceptData

    * @param text

    * @param out

    * @return

    */

   private void analysisDouYin(AcceptData acceptData, String text, PrintWriter out) {

      String location = HttpUtil.getLocation(text);

      if (!StringUtil.isNullOrEmpty(location)) {

         if (location.contains("taobao.com")) { // 淘宝商品

            String realUrl = TaoBaoUtil.getRealUrl(location);

            if (!StringUtil.isNullOrEmpty(realUrl)) {

               getRecommendInfo(acceptData, realUrl, null, out);

               return;

            }

         } else if (location.contains("haohuo.jinritemai.com")) { // 抖音商品

            DouYinGoods goods = DouYinUtil.getGoodsInfo(location);

            JSONObject goodsJSON = new JSONObject();

            goodsJSON.put("title", goods.getName());

            goodsJSON.put("pictUrl", goods.getImg());



            JSONObject data = new JSONObject();

            data.put("type", 4);

            data.put("desc", "该商品无推广信息");

            data.put("goods", goodsJSON);

            out.print(JsonUtil.loadTrueResult(data));

            return;

         }

      }

      out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

      return;

   }



   /**

    * 解析淘口令

    * 
    * @param acceptData

    * @param text

    * @param out

    * @return

    */

   private boolean analysisTaoToken(AcceptData acceptData, String text, PrintWriter out) {

      String token = StringUtil.picUpTaoToken(text);

      if (!StringUtil.isNullOrEmpty(token)) {

         Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);

@@ -270,6 +471,32 @@
            }



            if (tb != null) {

               if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

                  TaoBaoGoodsBrief goodsBrief = null;

                  try {

                     goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());

                  } catch (TaobaoGoodsDownException e) {

                     e.printStackTrace();

                  }



                  if (goodsBrief == null) {

                     out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

                     return false;

                  }



                  BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                  BigDecimal shareRate = hongBaoManageService.getShareRate();

                  Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                        .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



                  JSONObject data = new JSONObject();

                  data.put("type", 3);

                  data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

                  out.print(JsonUtil.loadTrueResult(data));

                  return true;

               }



               JSONObject data = new JSONObject();

               JSONObject taoBaoGoodsJSON = new JSONObject();

               taoBaoGoodsJSON.put("title", tb.getTitle());

@@ -293,6 +520,25 @@
         }

      }

      return false;

   }



   /**

    * 口令领取

    * 
    * @param acceptData

    * @param kw

    * @param goodsType

    * @param out

    */

   @RequestSerializableByKey(key = "'tokenReceive-'+#uid")

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

   public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {

      try {

         String msg = tokenRecordService.receiveToken(token, uid, acceptData);

         out.print(JsonUtil.loadTrueResult(msg));

      } catch (TokenRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      }

   }



   /**

@@ -347,7 +593,8 @@
    */

   @RequestMapping(value = "searchGoods")

   public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,

         Integer order, PrintWriter out) {

         Integer order, Long uid, HttpSession session, PrintWriter out) {



      if (goodsType == null || goodsType < 1 || goodsType > 3) {

         out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数"));

         return;

@@ -363,6 +610,24 @@
         return;

      }

      final String searchkey = key.trim();



      if (uid != null) {

         if (page == 1) {

            integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis());

         } else if (page > 1) {

            Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice());

            if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 超过15s浏览

               integralGetCacheManager.clearSearchTime(acceptData.getDevice());

               ThreadUtil.run(new Runnable() {

                  @Override

                  public void run() {

                     // 增加金币

                     integralGetService.addSearchResultScan(uid, key);

                  }

               });

            }

         }

      }



      executor.execute(new Runnable() {

         @Override

@@ -390,18 +655,18 @@


      /*--------- 京东商品  -------*/

      if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) {

         searchJDGoods(searchkey, page, filter, order, out);

         searchJDGoods(acceptData, searchkey, page, filter, order, out);

         return;

      }



      /*-------- 拼多多商品  -------*/

      if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {

         searchPDDGoods(searchkey, page, filter, order, out);

         searchPDDGoods(acceptData, searchkey, page, filter, order, out);

         return;

      }



      /*-------- 淘宝商品  -------*/

      searchTaoBaoGoods(searchkey, page, filter, order, out);

      searchTaoBaoGoods(acceptData, searchkey, page, filter, order, out);

   }



   /**

@@ -415,7 +680,8 @@
    * @param endprice

    * @return

    */

   private void searchTaoBaoGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {

   private void searchTaoBaoGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

         PrintWriter out) {

      SearchFilter sf = new SearchFilter();

      sf.setKey(SearchFilterUtil.filterSearchContent(key));

      sf.setPage(page);

@@ -498,8 +764,10 @@
      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



      for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

         list.add(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate));

         list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

      }



      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

@@ -509,14 +777,34 @@
      data.put("result", gson.toJson(list));

      data.put("count", result.getTaoBaoHead().getDocsfound());



      if (page == 1) {

         // 第一页返回店铺信息

         List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);

         if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null

               && listShop.get(0).getListGoodsVO().size() > 2) {

            data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));

      if (page == 1) { // 第一页返回店铺信息

         String platform = acceptData.getPlatform();

         String version = acceptData.getVersion();

         if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_1(platform, version))

               || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {

            BrandInfoVO brandInfoVO = brandInfoService.listByAlikeName(key);

            if (brandInfoVO != null)

               data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));

         } else {

            List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);

            if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null

                  && listShop.get(0).getListGoodsVO().size() > 2) {

               TaoBaoShopVO taoBaoShop = listShop.get(0);

               if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, version))

                  || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_1(platform, version))) {

                  BrandInfoVO brandInfoVO = new BrandInfoVO();

                  brandInfoVO.setId(taoBaoShop.getId());

                  brandInfoVO.setName(taoBaoShop.getShopName());

                  brandInfoVO.setIcon(taoBaoShop.getShopIcon());

                  brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO());

                  data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));

               } else {

                  data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));

               }

            }

         }

      }

		
      out.print(JsonUtil.loadTrueResult(data));

   }



@@ -531,9 +819,11 @@
    * @param endprice

    * @return

    */

   private void searchJDGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {

   private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

         PrintWriter out) {



      JDSearchResult result = null;

      boolean hasCoupon = false;

      String way = configService.get("jd_api_search_key");

      if ("1".equals(way)) {

         JDFilter filterAPI = new JDFilter();

@@ -569,6 +859,7 @@
            JSONObject jsonfilter = JSONObject.fromObject(filter);

            Boolean coupon = jsonfilter.optBoolean("coupon");

            if (coupon != null && coupon) {

               hasCoupon = true;

               filterAPI.setIsCoupon(1); // 有券

            }



@@ -624,6 +915,7 @@
            JSONObject jsonfilter = JSONObject.fromObject(filter);

            Boolean coupon = jsonfilter.optBoolean("coupon");

            if (coupon != null && coupon) {

               hasCoupon = true;

               jdfilter.setHasCoupon(1); // 有券

            }



@@ -674,9 +966,17 @@
            BigDecimal shareRate = hongBaoManageService.getShareRate();

            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);

               array.add(gson.toJson(goodsDetailVO));

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

               if (hasCoupon) {

                  if (goodsDetailVO.isHasCoupon()) {

                     array.add(gson.toJson(goodsDetailVO));

                  }

               } else {

                  array.add(gson.toJson(goodsDetailVO));

               }

            }

         }

      }

@@ -697,7 +997,8 @@
    * @param endprice

    * @return

    */

   private void searchPDDGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {

   private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

         PrintWriter out) {

      PDDSearchFilter pddfilter = new PDDSearchFilter();

      pddfilter.setKw(SearchFilterUtil.filterSearchContent(key));

      pddfilter.setPage(page);

@@ -749,9 +1050,10 @@
         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);

               array.add(gson.toJson(goodsDetailVO));

            }

         }