唯品会订单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;

@@ -16,21 +13,23 @@
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;

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;

@@ -39,10 +38,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

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

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

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;

@@ -50,6 +47,7 @@
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

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;

@@ -62,10 +60,8 @@
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.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;

@@ -76,9 +72,11 @@
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;

@@ -150,6 +148,9 @@
   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   /**

    * 粘贴板信息推荐

    * 

@@ -199,15 +200,13 @@


                  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("id", result.getFirstGoods().getGoodsId() + "");

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

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

                        view = new JumpDetailContentVO();

@@ -285,7 +284,7 @@
                              data.put("goods",

                                    gson.toJson(

                                          GoodsDetailVOFactory.convertCommonGoods(goods,

                                                hongBaoManageService.getShowComputeRate(

                                                orderHongBaoMoneyComputeService.getShowComputeRate(

                                                      acceptData.getPlatform(),

                                                      acceptData.getVersion()))));

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

@@ -299,7 +298,7 @@
                           data.put("goods",

                                 gson.toJson(

                                       GoodsDetailVOFactory.convertCommonGoods(goods,

                                             hongBaoManageService.getShowComputeRate(

                                             orderHongBaoMoneyComputeService.getShowComputeRate(

                                                   acceptData.getPlatform(),

                                                   acceptData.getVersion()))));

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

@@ -436,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;

      }

@@ -506,8 +505,21 @@
         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(acceptData, searchkey, page, filter, order, out);



   }



   /**

@@ -603,7 +615,7 @@
      }



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

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

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

            acceptData.getVersion());



      for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

@@ -811,7 +823,7 @@
         if (goodsList != null && goodsList.size() > 0) {

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

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

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

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

                  acceptData.getVersion());

            for (JDGoods goods : goodsList) {

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

@@ -893,7 +905,7 @@
         Gson gson = JsonUtil.getApiCommonGson();

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

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

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

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

                  acceptData.getVersion());



            for (PDDGoodsDetail goods : goodsList) {

@@ -907,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));

   }



}