From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 152 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 102 insertions(+), 50 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index 4b37c91..dc46bab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -4,10 +4,8 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -21,12 +19,13 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.search.HotSearch;
-import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -35,23 +34,26 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
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.config.HotSearchService;
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.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.EhcacheUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
import net.sf.ehcache.Element;
import net.sf.json.JSONArray;
@@ -68,10 +70,10 @@
private ConfigService configService;
@Resource
- private SuperHotSearchService superHotSearchSerivce;
-
+ private HotSearchService hotSearchService;
+
@Resource
- private HistorySearchService historySearchService;
+ private HistorySearchService historySearchService;
@Resource
private HongBaoManageService manageService;
@@ -89,35 +91,35 @@
private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private TaoBaoShopService taoBaoShopService;
+ @Resource
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
+
+ /**
+ * 鐑棬鎼滅储
+ * @param acceptData
+ * @param goodsType
+ * @param out
+ */
@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
- public void getHotSearch(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
+ public void getHotSearch(AcceptData acceptData, Integer goodsType, PrintWriter out) {
+ // 榛樿娣樺疂
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce
- .getSuperHotSearchBySystemIdCache(system.getId());
- if (superHotSearchList == null || superHotSearchList.size() == 0) {
+
+ List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);
+ if (list == null || list.size() == 0) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
return;
}
- List<HotSearch> hotSearchList = new ArrayList<HotSearch>();
- for (SuperHotSearch superHotSearch : superHotSearchList) {
- HotSearch hotSearch = superHotSearch.getHotSearch();
- if (hotSearch != null)
- hotSearchList.add(hotSearch);
- }
-
+
JSONObject data = new JSONObject();
- data.put("count", hotSearchList.size());
- data.put("hotSearchList", hotSearchList);
- String result = JsonUtil.loadTrueResult(data);
- out.print(result);
- return;
+ data.put("count", list.size());
+ data.put("hotSearchList", list);
+ out.print(JsonUtil.loadTrueResult(data));
}
@RequestMapping("specialSearch")
@@ -412,15 +414,20 @@
historySearchService.addHistorySearch(kw, bid);
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
- }
+ // BusinessSystem system =
+ // businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ // acceptData.getPackages());
+ // if (system == null) {
+ // out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+ // return;
+ // }
if (!StringUtil.isNullOrEmpty(kw) && (kw.startsWith("http://") || kw.startsWith("https://"))) {
- out.print(JsonUtil.loadFalseResult("鏃犳硶鎼滅储閾炬帴"));
+ JSONObject data = new JSONObject();
+ data.put("result", new JSONArray());
+ data.put("count", 0);
+ data.put("nav", new JSONArray());
+ out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -456,7 +463,9 @@
data = searchGoods(kw, page, filter, order, startprice, endprice);
} else {
// 鎺ㄨ崘锛氱簿閫夊簱
- data = searchQualityGoods(kw, page, filter, order, startprice, endprice);
+ // data = searchQualityGoods(kw, page, filter, order, startprice,
+ // endprice);
+ data = searchDaTaoKeGoods(kw, page, filter, order, startprice, endprice);
}
// 鑾峰彇鎺ㄨ崘璇�
@@ -466,6 +475,12 @@
listRecommendWords = TaoBaoUtil.getSuguestSearch(kw);
if (listRecommendWords == null || listRecommendWords.size() == 0) {
listRecommendWords = new ArrayList<String>();
+ }
+
+ List<TaoBaoShopVO> listShop =taoBaoShopService.getShopByKey(kw);
+ if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null
+ && listShop.get(0).getListGoods().size() > 2) {
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));
}
}
@@ -606,9 +621,9 @@
}
// 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetail> daTaoKeList = null;
+ List<DaTaoKeDetailV2> daTaoKeList = null;
if (page == 1)
- daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(kw);
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(kw);
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
if (result == null) {
@@ -660,8 +675,8 @@
try {
if (daTaoKeList != null && daTaoKeList.size() > 0) {
Collections.reverse(daTaoKeList);
- for (DaTaoKeDetail detail : daTaoKeList) {
- taoBaoGoodsBriefs.add(0,TaoBaoUtil.convert(detail));
+ for (DaTaoKeDetailV2 detail : daTaoKeList) {
+ taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
}
}
} catch (Exception e) {
@@ -773,7 +788,7 @@
provinceId = array.optJSONObject(i).optInt("id");
} else if ("tkRate1".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -789,7 +804,7 @@
}
} else if ("tkRate2".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -805,7 +820,7 @@
}
} else if ("tkRate3".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -821,7 +836,7 @@
}
} else if ("tkRate4".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -837,7 +852,7 @@
}
} else if ("tkRate5".equalsIgnoreCase(ty)) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
JSONArray tkRatearray = JSONArray.fromObject(value);
if (tkRatearray != null) {
@@ -930,6 +945,43 @@
return data;
}
+ private JSONObject searchDaTaoKeGoods(String key, int page, String filter, String order, String startprice,
+ String endprice) {
+ page = page + 1;
+ int sort = DaTaoKeApiUtil.SORT_DEFAULT;
+ if ("5".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_COMMISSION;
+ } else if ("1".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_SALES;
+ } else if ("2".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_PRICE_HIGH_TO_LOW;
+ } else if ("3".equalsIgnoreCase(order)) {
+ sort = DaTaoKeApiUtil.SORT_PRICE_LOW_TO_HIGH;
+ }
+
+ List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
+ BigDecimal proportion = manageService.getFanLiRate();
+
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, null, null, page, 20, sort);
+ if (result != null && result.getGoodsList() != null)
+ for (DaTaoKeDetailV2 goods : result.getGoodsList()) {
+ listExtra.add(
+ TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(goods), proportion.toString(), null));
+ }
+
+ List<TaoBaoSearchNav> navList = new ArrayList<>();
+ Gson gson = new GsonBuilder().create();
+ Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().create();
+
+ JSONObject data = new JSONObject();
+ data.put("nav", gson.toJson(navList));
+ data.put("result", gson2.toJson(listExtra));
+ data.put("count", result.getTotalCount());
+
+ return data;
+ }
+
/**
* 璁剧疆鏌ヨ浣ｉ噾姣斾緥鑼冨洿
*
@@ -938,7 +990,7 @@
*/
public void setSearchTkRate(int i, SearchFilter sf) {
// 鑾峰彇瀵瑰簲鍙傛暟
- String value = configService.get("tkRate_range");
+ String value = configService.get(ConfigKeyEnum.tkRateRange.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
--
Gitblit v1.8.0