admin
2019-06-24 480fa41fa7ee8b3b3a38f46f28c2b8403299b44d
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -444,22 +444,41 @@
               searchfilter.setMaterialId("6707");
            taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
                  totalSales);
            JSONObject result = taoKeGoodsService.searchWuLiao(searchfilter);
            long count = result.optLong("count");
            JSONArray resultArray = result.getJSONArray("result");
            TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter);
            long count = searchResult.getPageEntity().getTotalCount();
            JSONObject result = new JSONObject();
            BigDecimal rate = hongBaoManageService.getFanLiRate();
            List<TaoBaoGoodsBrief> resultGoodsList = searchResult.getTaoBaoGoodsBriefs();
            // 查询是否超过了最大的商品数
            if (resultArray == null || resultArray.size() < 20) {
            if ((resultGoodsList == null || resultGoodsList.size() < 20)
                  && !StringUtil.isNullOrEmpty(goodsSubClass.getKey())) {
               if (resultGoodsList == null)
                  resultGoodsList = new ArrayList<>();
               // 需要根据关键字查询
               searchfilter.setCateIds(null);
               searchfilter.setPage((int) (count % 20 == 0 ? count / 20 - 1 : count / 20));
               searchfilter.setPageSize(20);
               searchfilter.setKey(goodsSubClass.getKey());
               result = taoKeGoodsService.searchWuLiao(searchfilter);
               if (resultArray != null)
                  result.optJSONArray("result").addAll(0, resultArray);
               result.put("count", result.optLong("count") + count);
               TaoBaoSearchResult searchResult2 = TaoKeApiUtil.searchWuLiao(searchfilter);
               if (searchResult2 != null) {
                  List<TaoBaoGoodsBrief> resultListTemp = searchResult2.getTaoBaoGoodsBriefs();
                  if (resultListTemp != null)
                     resultGoodsList.addAll(resultListTemp);
               }
            }
            JSONArray array = new JSONArray();
            Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
                  .excludeFieldsWithoutExposeAnnotation().create();
            if (resultGoodsList != null)
               for (TaoBaoGoodsBrief goods : resultGoodsList) {
                  array.add(gson2.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null)));
               }
            result.put("result", array);
            result.put("count", result.optLong("count") + count);
            out.print(JsonUtil.loadTrueResult(result));
            return;
         } else {