唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

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

@@ -5,9 +5,6 @@
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;

@@ -17,45 +14,56 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

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.jd.JDFilter;

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

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

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.dto.pdd.PDDSearchFilter;

import com.yeshi.fanli.dto.suning.SuningCommodityInfo;

import com.yeshi.fanli.dto.suning.SuningGoodsInfo;

import com.yeshi.fanli.dto.suning.SuningQueryModel;

import com.yeshi.fanli.dto.vip.VIPSearchFilter;

import com.yeshi.fanli.dto.vip.VIPSearchResult;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

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

import com.yeshi.fanli.entity.jd.JDGoods;

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

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

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

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

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

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

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.common.JumpDetailV2Service;

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.integral.IntegralGetService;

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

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

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

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.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

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.service.manger.ClipboardAnalysisManager;

import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;

import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

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;

@@ -64,12 +72,17 @@
import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;

import com.yeshi.fanli.util.suning.SuningApiUtil;

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.util.vipshop.VipShopApiUtil;

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

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

import com.yeshi.fanli.vo.common.JumpDetailContentVO;

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

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

import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -109,7 +122,7 @@
   private TaoBaoShopService taoBaoShopService;



   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

@@ -122,6 +135,21 @@


   @Resource

   private IntegralGetCacheManager integralGetCacheManager;



   @Resource

   private BrandInfoService brandInfoService;



   @Resource

   private JDGoodsLinkParseManager jdGoodsLinkParseManager;



   @Resource

   private ClipboardAnalysisManager clipboardAnalysisManager;



   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   /**

    * 粘贴板信息推荐

@@ -139,212 +167,199 @@
      }

      // 去除前后空格

      text = text.trim();



      try {

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

         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\\&%_\\./-~-]*)?";



      Pattern p = Pattern.compile(URL_REGEX);

      Matcher matcher = p.matcher(text);

      if (!matcher.find()) {// 不包含链接

         if (text.length() > 256) {

            out.print(JsonUtil.loadFalseResult("值过长"));

            return;

         }

         String pattern = "^[A-Za-z0-9-]+$";

         if (Pattern.matches(pattern, text.replace(" ", ""))) {// 删除空格

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

            return;

         }



         LogHelper.test("根据粘贴板推荐:" + text);



         if (text.length() > 80) {

            out.print(JsonUtil.loadFalseResult("值过长"));

            return;

         }



         if (analysisTaoToken(text, out)) {

            return;

         }



         JSONObject root = new JSONObject();



         root.put("type", 2);

         JSONObject data = new JSONObject();

         data.put("title", text);

         root.put("data", data);

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

         return;

      }



      CommonGoods commonGoods = null;

      text = matcher.group();



      if (text.startsWith("https://a.m.taobao.com/i"))// 淘宝账号未登录状态

      {

         text = text.substring("https://a.m.taobao.com/i".length(), text.indexOf(".htm"));

         if (NumberUtil.isNumeric(text)) {

            tb = TaoBaoUtil.isAlimama(text);

         }

      } else if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 聚划算

         int index = text.indexOf("item_id");

         if (index < 0) {

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

            return;

         }

         text = text.substring(index);

         int last = text.indexOf("&");

         String id = "";

         if (last > 0)

            id = text.substring(text.indexOf("=") + 1, text.indexOf("&"));

         else {

            id = text.substring(text.indexOf("=" + 1));

         }

         tb = TaoBaoUtil.isAlimama(id);

         if (tb == null) {

            tb = TaoBaoUtil.parsePhoneTmAndTb(id);

         }

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

         tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);

      } else if (text.contains("h5.m.taobao") || text.contains("detail.m.tmall") || text.contains("item.taobao")

            || text.contains("detail.tmall")) { // 手机页面和电脑页面

         Map<String, String> map = Utils.parseURL(text);

         String id = "";

         id = map.get("id").replace("}", "");

         tb = TaoBaoUtil.isAlimama(id);

         if (tb == null) {

            tb = TaoBaoUtil.parsePhoneTmAndTb(id);

         }

      } else {

         tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);

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

         {

            String jdId = JDUtil.getJDGoodsId(text);

            if (!StringUtil.isNullOrEmpty(jdId)) {

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

               if (goods != null)

                  commonGoods = CommonGoodsFactory.create(goods);

            } else {

               String pddId = PinDuoDuoUtil.getPDDGoodsId(text);

               if (!StringUtil.isNullOrEmpty(pddId)) {

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

                  if (goods != null)

                     commonGoods = CommonGoodsFactory.create(goods);

               }

            }

         }

      }



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

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

         return;

      }

      String originalText = text;



      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", 3);

         data.put("goods",

               gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));

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

         return;

      }

      clipboardAnalysisManager.parse(acceptData.getPlatform(), acceptData.getVersion(), originalText, uid,

            new IClipboardAnalysisResult() {



      if (tb != null) {

         commonGoods = new CommonGoods();

         commonGoods.setPrice(tb.getZkPrice());

         commonGoods.setTitle(tb.getTitle());

         commonGoods.setGoodsId(tb.getAuctionId());

         commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

         commonGoods.setPicture(tb.getPictUrl());

      }

               @Override

               public void onResult(GoodsDocParseResultVO result) {

                  if (uid == null) {

                     out.print(JsonUtil.loadFalseResult("无推荐"));

                     return;

                  }



      JSONObject taoBaoGoodsJSON = new JSONObject();

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

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

      taoBaoGoodsJSON.put("id", commonGoods.getGoodsId());

      taoBaoGoodsJSON.put("goodsType", commonGoods.getGoodsType());

      if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {

         taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + commonGoods.getGoodsId());

      } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {

         taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", commonGoods.getGoodsId() + ""));

      } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {

         taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + commonGoods.getGoodsId());

      }

      data.put("goods", taoBaoGoodsJSON);

      List<String> picList = new ArrayList<>();

      picList.add(commonGoods.getPicture());

      data.put("imgs", picList);

      JSONObject root = new JSONObject();

      root.put("type", 1);

      root.put("data", data);

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

   }

                  JSONObject root = new JSONObject();

                  root.put("type", 20);

                  JSONObject data = new JSONObject();

                  data.put("text", originalText);

                  //

                  int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

                  int version = Integer.parseInt(acceptData.getVersion());

                  JumpDetailContentVO convert = new JumpDetailContentVO();

                  convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));

                  JSONObject convertParams = new JSONObject();

                  convertParams.put("url", configService.get(ConfigKeyEnum.convertDocWebLink.getKey()));

                  convertParams.put("clipboard", false);

                  convert.setParams(convertParams);



   private boolean analysisTaoToken(String text, PrintWriter out) {

      String token = StringUtil.picUpTaoToken(text);

      if (!StringUtil.isNullOrEmpty(token)) {

         Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);

         if (auctionId != null) {

            TaoBaoGoodsBrief tb = null;

            try {

               tb = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            }

                  JumpDetailContentVO view = null;

                  JumpDetailContentVO guessLike = null;



            if (tb != null) {

               JSONObject data = new JSONObject();

               JSONObject taoBaoGoodsJSON = new JSONObject();

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

               taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());

               taoBaoGoodsJSON.put("id", tb.getAuctionId());

               taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);

               taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());

               data.put("goods", taoBaoGoodsJSON);

               if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {

                  if (tb.getImgList() == null)

                     tb.setImgList(new ArrayList<>());

                  tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));

                  Gson gson = JsonUtil.getApiCommonGson();

                  data.put("title", "智能搜索");



                  int state = 0;

                  if (result.getFirstGoods() != null && result.getFirstGoods().getGoodsId() != null) {

                     state = 2;

                     data.put("stateDesc", "选择搜券或转链");

                     JSONObject params = new JSONObject();

                     params.put("id", result.getFirstGoods().getGoodsId() + "");

                     params.put("from", "转链");

                     if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {

                        view = new JumpDetailContentVO();

                        view.setJumpDetail(

                              jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version));

                        view.setParams(params);

                     } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_JD) {

                        view = new JumpDetailContentVO();

                        view.setJumpDetail(

                              jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version));

                        view.setParams(params);

                     } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_PDD) {

                        view = new JumpDetailContentVO();

                        view.setJumpDetail(

                              jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version));

                        view.setParams(params);

                     }



                  } else if (!StringUtil.isNullOrEmpty(result.getFirstLink())) {

                     state = 2;

                     data.put("stateDesc", "选择搜券或转链");

                     view = new JumpDetailContentVO();

                     view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));

                     JSONObject params = new JSONObject();

                     params.put("url", result.getFirstLink());

                     view.setParams(params);

                  } else {

                     data.put("stateDesc", "去试试转链");

                     state = 1;

                  }

                  data.put("state", state);

                  if (convert != null)

                     data.put("convert", gson.toJson(convert));

                  if (view != null)

                     data.put("view", gson.toJson(view));



                  if (guessLike != null)

                     data.put("guessLike", gson.toJson(guessLike));



                  root.put("data", data);

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

                  return;

               }

               data.put("imgs", tb.getImgList());

               JSONObject root = new JSONObject();

               root.put("type", 1);

               root.put("data", data);

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

               return true;

            }

         }

      }

      return false;



               @Override

               public void onResult(String result) {

                  JSONObject root = new JSONObject();

                  root.put("type", 2);

                  JSONObject data = new JSONObject();

                  data.put("title", result);

                  root.put("data", data);

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

                  return;

               }



               @Override

               public void onResult(CommonGoods goods) {

                  if (goods.getGoodsId() != null) {

                     if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {// 1.6.5版本后返回商品详情

                        if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {

                           TaoBaoGoodsBrief goodsBrief = null;

                           try {

                              goodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getGoodsId());

                           } catch (TaobaoGoodsDownException e) {

                              e.printStackTrace();

                           }



                           if (goodsBrief != null) {

                              goods = CommonGoodsFactory.create(goodsBrief);

                              Gson gson = JsonUtil

                                    .getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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

                                    .create();

                              data.put("type", 3);

                              data.put("goods",

                                    gson.toJson(

                                          GoodsDetailVOFactory.convertCommonGoods(goods,

                                                orderHongBaoMoneyComputeService.getShowComputeRate(

                                                      acceptData.getPlatform(),

                                                      acceptData.getVersion()))));

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

                              return;

                           }

                        } else {

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

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

                                 .create();

                           data.put("type", 3);

                           data.put("goods",

                                 gson.toJson(

                                       GoodsDetailVOFactory.convertCommonGoods(goods,

                                             orderHongBaoMoneyComputeService.getShowComputeRate(

                                                   acceptData.getPlatform(),

                                                   acceptData.getVersion()))));

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

                           return;

                        }

                     } else {

                        // 低于1.6.5版本

                        JSONObject taoBaoGoodsJSON = new JSONObject();

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

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

                        taoBaoGoodsJSON.put("id", goods.getGoodsId());

                        taoBaoGoodsJSON.put("goodsType", goods.getGoodsType());

                        if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {

                           taoBaoGoodsJSON.put("url",

                                 "http://item.taobao.com/item.htm?id=" + goods.getGoodsId());

                        } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD) {

                           taoBaoGoodsJSON.put("url",

                                 String.format("https://item.jd.com/%s.html", goods.getGoodsId() + ""));

                        } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {

                           taoBaoGoodsJSON.put("url",

                                 "http://yangkeduo.com/goods.html?goods_id=" + goods.getGoodsId());

                        }

                        data.put("goods", taoBaoGoodsJSON);

                        List<String> picList = new ArrayList<>();

                        picList.add(goods.getPicture());

                        data.put("imgs", picList);

                        JSONObject root = new JSONObject();

                        root.put("type", 1);

                        root.put("data", data);

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

                        return;

                     }

                  }



                  JSONObject goodsJSON = new JSONObject();

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

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



                  data.put("type", 4);

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

                  data.put("goods", goodsJSON);

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

                  return;

               }



               @Override

               public void onResult(TokenVO tokenVO) {

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

                  return;

               }



               @Override

               public void none() {

                  out.print(JsonUtil.loadFalseResult("无推荐"));

               }



               @Override

               public void needLogin(String msg) {

                  out.print(JsonUtil.loadFalseResult(1001, msg));

               }

            });

   }



   /**

@@ -355,10 +370,11 @@
    * @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);

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

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

      } catch (TokenRecordException e) {

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

@@ -419,7 +435,7 @@
   public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,

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



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

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

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

         return;

      }

@@ -479,18 +495,31 @@


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

      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;

      }



      /*-------- 唯品会商品 ------*/

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

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

         return;

      }



      /*-------- 苏宁商品 ------*/

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

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

         return;

      }



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

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

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



   }



   /**

@@ -504,7 +533,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);

@@ -546,15 +576,15 @@
      }



      // 搜索大淘客

      List<DaTaoKeDetail> daTaoKeList = null;

      List<DaTaoKeDetailV2> daTaoKeList = null;

      if (page == 1) {

         daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);

         daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);

      }



      // 淘宝api搜索商品

      TaoBaoSearchResult result = TaoBaoUtil.search(sf);



      // 搜索是否在营销主商品库

      // 搜索结果缓存到redis

      if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {

         ThreadUtil.run(new Runnable() {

            @Override

@@ -577,7 +607,7 @@
      if (daTaoKeList != null && daTaoKeList.size() > 0) {

         try {

            Collections.reverse(daTaoKeList);

            for (DaTaoKeDetail detail : daTaoKeList) {

            for (DaTaoKeDetailV2 detail : daTaoKeList) {

               taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));

            }

         } catch (Exception e) {

@@ -585,10 +615,11 @@
      }



      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());



      for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

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

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

      }



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

@@ -598,14 +629,41 @@
      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_0_5(platform, version))

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

            BrandInfoVO brandInfoVO = null;

            try {

               brandInfoVO = brandInfoService.listByAlikeName(key, acceptData.getPlatform(),

                     acceptData.getVersion());

            } catch (Exception e) {

            }

            if (brandInfoVO != null)

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

         } else {

            List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key, acceptData.getPlatform(),

                  acceptData.getVersion());

            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));

   }



@@ -620,10 +678,12 @@
    * @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;

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

      boolean hasCoupon = false;

      String way = configService.get(ConfigKeyEnum.jdApiSearchKey.getKey());

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

         JDFilter filterAPI = new JDFilter();

         filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key));

@@ -658,6 +718,7 @@
            JSONObject jsonfilter = JSONObject.fromObject(filter);

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

            if (coupon != null && coupon) {

               hasCoupon = true;

               filterAPI.setIsCoupon(1); // 有券

            }



@@ -713,6 +774,7 @@
            JSONObject jsonfilter = JSONObject.fromObject(filter);

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

            if (coupon != null && coupon) {

               hasCoupon = true;

               jdfilter.setHasCoupon(1); // 有券

            }



@@ -759,13 +821,19 @@


         List<JDGoods> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

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

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

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());

            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));

               }

            }

         }

      }

@@ -786,7 +854,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);

@@ -836,11 +905,11 @@
         Gson gson = JsonUtil.getApiCommonGson();

         List<PDDGoodsDetail> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            for (PDDGoodsDetail goods : goodsList) {

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

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

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

            }

         }

@@ -850,4 +919,187 @@
      data.put("count", count);

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

   }



   /**

    * 搜索唯品会商品

    * @Title: searchVIPGoods

    * @Description: 
    * @param acceptData

    * @param key

    * @param page

    * @param filter

    * @param order

    * @param out 
    * void 返回类型

    * @throws

    */

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

         PrintWriter out) {

      VIPSearchFilter searchFilter = new VIPSearchFilter();

      searchFilter.setKeyword(key);

      searchFilter.setPage(page);

      searchFilter.setPageSize(Constant.PAGE_SIZE);



      if (order != null) {

         int sort = order.intValue();

         switch (sort) {

         case 2: // 价格—desc

            searchFilter.setFieldName("price");

            searchFilter.setOrder(1);

            break;

         case 3: // 价格—asc

            searchFilter.setFieldName("price");

            searchFilter.setOrder(0);

            break;

         case 5: // 折扣—aec

            searchFilter.setFieldName("discount");

            searchFilter.setOrder(0);

            break;

         default: // 综合排序

            break;

         }

      }



      if (!StringUtil.isNullOrEmpty(filter)) {

         JSONObject jsonfilter = JSONObject.fromObject(filter);

         String minPrice = jsonfilter.optString("minPrice");

         if (!StringUtil.isNullOrEmpty(minPrice)) {

            searchFilter.setPriceStart(minPrice);

         }



         String maxPrice = jsonfilter.optString("maxPrice");

         if (!StringUtil.isNullOrEmpty(maxPrice)) {

            searchFilter.setPriceEnd(maxPrice);

         }

      }



      int count = 0;

      JSONObject data = new JSONObject();

      JSONArray array = new JSONArray();



      VIPSearchResult result = VipShopApiUtil.search(searchFilter);

      if (result != null) {

         count = result.getTotal();

         Gson gson = JsonUtil.getApiCommonGson();

         List<VIPGoodsInfo> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            for (VIPGoodsInfo goods : goodsList) {

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

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

            }

         }

      }



      data.put("result", array);

      data.put("count", count);

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

   }



   /**

    * 搜索唯品会商品

    * @Title: searchVIPGoods

    * @Description: 
    * @param acceptData

    * @param key

    * @param page

    * @param filter

    * @param order

    * @param out 
    * void 返回类型

    * @throws

    */

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

         PrintWriter out) {

      SuningQueryModel searchFilter = new SuningQueryModel();

      searchFilter.setKeyword(key);

      searchFilter.setPageIndex(page);

      searchFilter.setSize(10);



      if (order != null) {

         if (order == 1) { // 销量高到低

            searchFilter.setSortType(2);

         } else if (order == 2) { // 价格高到低

            searchFilter.setSortType(3);

         } else if (order == 3) { // 价格低到高

            searchFilter.setSortType(4);

         } else if (order == 4) { // 返利比高到低

            searchFilter.setSortType(5);

         }

      }



      if (!StringUtil.isNullOrEmpty(filter)) {

         JSONObject jsonfilter = JSONObject.fromObject(filter);

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

         if (coupon != null && coupon) {

            searchFilter.setCoupon(1); // 有券

         }



         Boolean snfwservice = jsonfilter.optBoolean("snfwservice");// 苏宁服务

         if (snfwservice != null && snfwservice) {

            searchFilter.setSnfwservice(1);

         }



         Boolean snhwg = jsonfilter.optBoolean("snhwg");// 苏宁国际

         if (snhwg != null && snhwg) {

            searchFilter.setSnhwg(1);

         }



         Boolean suningService = jsonfilter.optBoolean("suningService");// 苏宁自营

         if (suningService != null && suningService) {

            searchFilter.setSuningService(1);

         }



         Boolean pgSearch = jsonfilter.optBoolean("pgSearch");// 拼购

         if (pgSearch != null && pgSearch) {

            searchFilter.setPgSearch(1);

         }



         String minPrice = jsonfilter.optString("minPrice");

         if (!StringUtil.isNullOrEmpty(minPrice)) {

            searchFilter.setStartPrice(minPrice);

         }



         String maxPrice = jsonfilter.optString("maxPrice");

         if (!StringUtil.isNullOrEmpty(maxPrice)) {

            searchFilter.setEndPrice(maxPrice);

         }

      }



      JSONObject data = new JSONObject();

      JSONArray array = new JSONArray();



      List<SuningGoodsInfo> resultList = null;

      List<SuningGoodsInfo> list = SuningApiUtil.searchGoodsOld(searchFilter);

      if (list != null && list.size() > 0) {

         List<String> listId = new ArrayList<>();

         for (SuningGoodsInfo goodsInfo:  list) {

             SuningCommodityInfo info = goodsInfo.getCommodityInfo();

             if (info != null) {

                listId.add(info.getCommodityCode() + "-" + info.getSupplierCode());

             }

         }

         resultList = SuningApiUtil.getGoodsDetailList(listId);

      }

		
      if (resultList != null) {

         Gson gson = JsonUtil.getApiCommonGson();

         if (resultList != null && resultList.size() > 0) {

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            for (SuningGoodsInfo goods : resultList) {

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

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

            }

         }

      }



      data.put("result", array);

      data.put("count", 1000);

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

   }



}