From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 03 七月 2020 17:52:07 +0800 Subject: [PATCH] 多APP优化 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 51 ++++++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 27 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 4f393ac..3ac16c5 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 @@ -10,6 +10,7 @@ import javax.annotation.Resource; +import com.yeshi.fanli.entity.SystemEnum; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,6 +26,7 @@ import com.yeshi.fanli.entity.bus.recommend.Honest; import com.yeshi.fanli.entity.bus.search.HotSearch; 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; @@ -33,17 +35,16 @@ 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.HotSearchService; -import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; 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; @@ -82,9 +83,6 @@ private TaoBaoUnionConfigService taoBaoUnionConfigService; @Resource - private TaoKeGoodsService taoKeGoodsService; - - @Resource private QualityGoodsService qualityGoodsService; @Resource @@ -94,7 +92,7 @@ private TaoBaoShopService taoBaoShopService; @Resource - private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService; + private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service; /** @@ -458,9 +456,8 @@ JSONObject data = null; if (!recommend) { - // 娣樺疂鎺ュ彛璇锋眰 - data = searchGoods(kw, page, filter, order, startprice, endprice); + data = searchGoods(kw, page, filter, order, startprice, endprice,acceptData.getSystem()); } else { // 鎺ㄨ崘锛氱簿閫夊簱 // data = searchQualityGoods(kw, page, filter, order, startprice, @@ -503,7 +500,7 @@ * @return */ private JSONObject searchGoods(String kw, int page, String filter, String order, String startprice, - String endprice) { + String endprice,SystemEnum system) { page = page + 1; SearchFilter sf = new SearchFilter(); @@ -606,24 +603,24 @@ int id = array.optJSONObject(i).optInt("id"); sf.setProvinceId(id); } else if ("tkRate1".equalsIgnoreCase(ty)) { - setSearchTkRate(0, sf); + setSearchTkRate(0, sf,system); } else if ("tkRate2".equalsIgnoreCase(ty)) { - setSearchTkRate(1, sf); + setSearchTkRate(1, sf,system); } else if ("tkRate3".equalsIgnoreCase(ty)) { - setSearchTkRate(2, sf); + setSearchTkRate(2, sf,system); } else if ("tkRate4".equalsIgnoreCase(ty)) { - setSearchTkRate(3, sf); + setSearchTkRate(3, sf,system); } else if ("tkRate5".equalsIgnoreCase(ty)) { - setSearchTkRate(4, sf); + setSearchTkRate(4, sf,system); } } sf.setParams(params); } // 鎼滅储澶ф窐瀹� - 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) { @@ -675,7 +672,7 @@ try { if (daTaoKeList != null && daTaoKeList.size() > 0) { Collections.reverse(daTaoKeList); - for (DaTaoKeDetail detail : daTaoKeList) { + for (DaTaoKeDetailV2 detail : daTaoKeList) { taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail)); } } @@ -730,7 +727,7 @@ /** * 鎵ц鎼滅储绮鹃�夊簱 * - * @param kw + * @param key * @param page * @param filter * @param order @@ -739,7 +736,7 @@ * @return */ private JSONObject searchQualityGoods(String key, int page, String filter, String order, String startprice, - String endprice) { + String endprice, SystemEnum system) { Integer hasQuan = null; Integer userType = null; @@ -788,7 +785,7 @@ provinceId = array.optJSONObject(i).optInt("id"); } else if ("tkRate1".equalsIgnoreCase(ty)) { // 鑾峰彇瀵瑰簲鍙傛暟 - String value = configService.get("tkRate_range"); + String value = configService.getValue(ConfigKeyEnum.tkRateRange.getKey(),system); if (!StringUtil.isNullOrEmpty(value)) { JSONArray tkRatearray = JSONArray.fromObject(value); if (tkRatearray != null) { @@ -804,7 +801,7 @@ } } else if ("tkRate2".equalsIgnoreCase(ty)) { // 鑾峰彇瀵瑰簲鍙傛暟 - String value = configService.get("tkRate_range"); + String value = configService.getValue(ConfigKeyEnum.tkRateRange.getKey(),system); if (!StringUtil.isNullOrEmpty(value)) { JSONArray tkRatearray = JSONArray.fromObject(value); if (tkRatearray != null) { @@ -820,7 +817,7 @@ } } else if ("tkRate3".equalsIgnoreCase(ty)) { // 鑾峰彇瀵瑰簲鍙傛暟 - String value = configService.get("tkRate_range"); + String value = configService.getValue(ConfigKeyEnum.tkRateRange.getKey(),system); if (!StringUtil.isNullOrEmpty(value)) { JSONArray tkRatearray = JSONArray.fromObject(value); if (tkRatearray != null) { @@ -836,7 +833,7 @@ } } else if ("tkRate4".equalsIgnoreCase(ty)) { // 鑾峰彇瀵瑰簲鍙傛暟 - String value = configService.get("tkRate_range"); + String value = configService.getValue(ConfigKeyEnum.tkRateRange.getKey(),system); if (!StringUtil.isNullOrEmpty(value)) { JSONArray tkRatearray = JSONArray.fromObject(value); if (tkRatearray != null) { @@ -852,7 +849,7 @@ } } else if ("tkRate5".equalsIgnoreCase(ty)) { // 鑾峰彇瀵瑰簲鍙傛暟 - String value = configService.get("tkRate_range"); + String value = configService.getValue(ConfigKeyEnum.tkRateRange.getKey(),system); if (!StringUtil.isNullOrEmpty(value)) { JSONArray tkRatearray = JSONArray.fromObject(value); if (tkRatearray != null) { @@ -988,9 +985,9 @@ * @param i * @param sf */ - public void setSearchTkRate(int i, SearchFilter sf) { + public void setSearchTkRate(int i, SearchFilter sf,SystemEnum system) { // 鑾峰彇瀵瑰簲鍙傛暟 - String value = configService.get("tkRate_range"); + String value = configService.getValue(ConfigKeyEnum.tkRateRange.getKey(),system); if (!StringUtil.isNullOrEmpty(value)) { -- Gitblit v1.8.0