From 0912f56a392bdf48315747c64ec0c18bf0aa29a6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 六月 2021 19:07:11 +0800
Subject: [PATCH] 礼金红包兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 200 +++++++++++++++++++++++++------------------------
1 files changed, 102 insertions(+), 98 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 25a4470..f0fbcda 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -754,107 +754,111 @@
List<TaoBaoGoodsBrief> goodsBriefList = new ArrayList<>();
int count = 0;
- if (goodsId != null) {
- try {
- TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(goodsId);
- goods.setCreatetime(null);
- goodsBriefList.add(goods);
- count = 1;
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
- } else {
- SearchFilter sf = new SearchFilter();
- sf.setKey(SearchFilterUtil.filterSearchContent(key));
- sf.setPage(page);
- sf.setPageSize(Constant.PAGE_SIZE);
-
- if (order != null) {
- if (order == 1) { // 閿�閲忛珮鍒颁綆
- sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
- } else if (order == 2) { // 浠锋牸楂樺埌浣�
- sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW);
- } else if (order == 3) { // 浠锋牸浣庡埌楂�
- sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH);
- } else if (order == 4) { // 杩斿埄姣旈珮鍒颁綆
- sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);
- }
- }
-
- if (!StringUtil.isNullOrEmpty(filter)) {
- JSONObject jsonfilter = JSONObject.fromObject(filter);
- Boolean coupon = jsonfilter.optBoolean("coupon");
- if (coupon != null && coupon) {
- sf.setQuan(1); // 鏈夊埜
- }
-
- Boolean tmall = jsonfilter.optBoolean("tmall");
- if (tmall != null && tmall) {
- sf.setTmall(true); // 澶╃尗
- }
-
- String minPrice = jsonfilter.optString("minPrice");
- if (!StringUtil.isNullOrEmpty(minPrice)) {
- sf.setStartPrice(new BigDecimal(minPrice));
- }
-
- String maxPrice = jsonfilter.optString("maxPrice");
- if (!StringUtil.isNullOrEmpty(maxPrice)) {
- sf.setEndPrice(new BigDecimal(maxPrice));
- }
- }
-
- // 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetailV2> daTaoKeList = null;
- if (page == 1) {
- daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);
- }
-
- String specialId = null;
- if (uid != null) {
- specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid);
- }
-
- // 娣樺疂api鎼滅储鍟嗗搧
- TaoBaoSearchResult result = taoBaoGoodsCacheUtil.getSearchResult(sf); // TaoBaoUtil.search(sf, specialId, null);
- if (result == null) {
- result = TaoBaoUtil.search(sf, specialId, null);
- taoBaoGoodsCacheUtil.saveSearchResult(sf, result);
- }
- TaoBaoSearchResult finalResult = result;
- // 鎼滅储缁撴灉缂撳瓨鍒皉edis
- if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
- ThreadUtil.run(new Runnable() {
- @Override
- public void run() {
- // 鏇存柊鍒扮珐瀛�
- for (TaoBaoGoodsBrief goods : finalResult.getTaoBaoGoodsBriefs())
- taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);
- }
- });
- }
-
- List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null;
- if (result != null) {
- taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
- }
- if (taoBaoGoodsBriefs == null) {
- taoBaoGoodsBriefs = new ArrayList<>();
- }
-
- if (daTaoKeList != null && daTaoKeList.size() > 0) {
+ try {
+ if (goodsId != null) {
try {
- Collections.reverse(daTaoKeList);
- for (DaTaoKeDetailV2 detail : daTaoKeList) {
- taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
- }
- } catch (Exception e) {
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(goodsId);
+ goods.setCreatetime(null);
+ goodsBriefList.add(goods);
+ count = 1;
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
}
- }
+ } else {
+ SearchFilter sf = new SearchFilter();
+ sf.setKey(SearchFilterUtil.filterSearchContent(key));
+ sf.setPage(page);
+ sf.setPageSize(Constant.PAGE_SIZE);
- count = result.getTaoBaoHead().getDocsfound();
- if (taoBaoGoodsBriefs != null)
- goodsBriefList.addAll(taoBaoGoodsBriefs);
+ if (order != null) {
+ if (order == 1) { // 閿�閲忛珮鍒颁綆
+ sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
+ } else if (order == 2) { // 浠锋牸楂樺埌浣�
+ sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW);
+ } else if (order == 3) { // 浠锋牸浣庡埌楂�
+ sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH);
+ } else if (order == 4) { // 杩斿埄姣旈珮鍒颁綆
+ sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);
+ }
+ }
+
+ if (!StringUtil.isNullOrEmpty(filter)) {
+ JSONObject jsonfilter = JSONObject.fromObject(filter);
+ Boolean coupon = jsonfilter.optBoolean("coupon");
+ if (coupon != null && coupon) {
+ sf.setQuan(1); // 鏈夊埜
+ }
+
+ Boolean tmall = jsonfilter.optBoolean("tmall");
+ if (tmall != null && tmall) {
+ sf.setTmall(true); // 澶╃尗
+ }
+
+ String minPrice = jsonfilter.optString("minPrice");
+ if (!StringUtil.isNullOrEmpty(minPrice)) {
+ sf.setStartPrice(new BigDecimal(minPrice));
+ }
+
+ String maxPrice = jsonfilter.optString("maxPrice");
+ if (!StringUtil.isNullOrEmpty(maxPrice)) {
+ sf.setEndPrice(new BigDecimal(maxPrice));
+ }
+ }
+
+ // 鎼滅储澶ф窐瀹�
+ List<DaTaoKeDetailV2> daTaoKeList = null;
+ if (page == 1) {
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);
+ }
+
+ String specialId = null;
+ if (uid != null) {
+ specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid);
+ }
+
+ // 娣樺疂api鎼滅储鍟嗗搧
+ TaoBaoSearchResult result = taoBaoGoodsCacheUtil.getSearchResult(sf); // TaoBaoUtil.search(sf, specialId, null);
+ if (result == null) {
+ result = TaoBaoUtil.search(sf, specialId, null);
+ taoBaoGoodsCacheUtil.saveSearchResult(sf, result);
+ }
+ TaoBaoSearchResult finalResult = result;
+ // 鎼滅储缁撴灉缂撳瓨鍒皉edis
+ if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 鏇存柊鍒扮珐瀛�
+ for (TaoBaoGoodsBrief goods : finalResult.getTaoBaoGoodsBriefs())
+ taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);
+ }
+ });
+ }
+
+ List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null;
+ if (result != null) {
+ taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
+ }
+ if (taoBaoGoodsBriefs == null) {
+ taoBaoGoodsBriefs = new ArrayList<>();
+ }
+
+ if (daTaoKeList != null && daTaoKeList.size() > 0) {
+ try {
+ Collections.reverse(daTaoKeList);
+ for (DaTaoKeDetailV2 detail : daTaoKeList) {
+ taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
+ }
+ } catch (Exception e) {
+ }
+ }
+
+ count = result.getTaoBaoHead().getDocsfound();
+ if (taoBaoGoodsBriefs != null)
+ goodsBriefList.addAll(taoBaoGoodsBriefs);
+ }
+ } catch (Exception e) {
+
}
GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
--
Gitblit v1.8.0