From c338aa60df58bee9f4c25afedf94fe6930a119c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 七月 2020 19:01:56 +0800
Subject: [PATCH] SpringContext中的循环任务优化,添加业务监控

---
 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
index 9d98fc2..9186316 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
@@ -9,6 +9,8 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
 
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.SystemInfoUtil;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,9 +36,10 @@
 import com.yeshi.fanli.service.inter.brand.BrandInfoService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.HotSearchService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.factory.CommonGoodsFactory;
@@ -61,6 +64,9 @@
 
 	@Resource
 	private HongBaoManageService hongBaoManageService;
+	
+	@Resource
+	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
@@ -192,7 +198,7 @@
 				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 		data.put("type", type);
 		data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
-				hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
+				orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem()))));
 		out.print(JsonUtil.loadTrueResult(data));
 		return;
 	}
@@ -211,7 +217,7 @@
 			goodsType = Constant.SOURCE_TYPE_TAOBAO;
 		}
 
-		List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);
+		List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType,acceptData.getSystem());
 		if (list == null || list.size() == 0) {
 			out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
 			return;
@@ -224,7 +230,7 @@
 		JSONObject data = new JSONObject();
 		data.put("count", list.size());
 		data.put("hotSearchList", hotSearchList);
-		data.put("helpLink", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+		data.put("helpLink", configService.getValue(ConfigKeyEnum.newerGonglue.getKey(), SystemInfoUtil.getSystem(acceptData)));
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 
@@ -330,10 +336,10 @@
 	 */
 	private void searchJDGoods(WXMPAcceptData acceptData, String key, Integer page, String filter, Integer order,
 			PrintWriter out) {
-
+		SystemEnum system= SystemInfoUtil.getSystemByWXCXCAppId(acceptData.getAppId());
 		JDSearchResult result = null;
 		boolean hasCoupon = false;
-		String way = configService.get(ConfigKeyEnum.jdApiSearchKey.getKey());
+		String way = configService.getValue(ConfigKeyEnum.jdApiSearchKey.getKey(), system);
 		if ("1".equals(way)) {
 			JDFilter filterAPI = new JDFilter();
 			filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key));
@@ -473,8 +479,8 @@
 			if (goodsList != null && goodsList.size() > 0) {
 				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-				ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
-						acceptData.getVersion());
+				ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+						acceptData.getVersion(),acceptData.getSystem());
 				for (JDGoods goods : goodsList) {
 					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
 					if (hasCoupon) {
@@ -555,8 +561,8 @@
 			Gson gson = JsonUtil.getApiCommonGson();
 			List<PDDGoodsDetail> goodsList = result.getGoodsList();
 			if (goodsList != null && goodsList.size() > 0) {
-				ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
-						acceptData.getVersion());
+				ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+						acceptData.getVersion(),acceptData.getSystem());
 
 				for (PDDGoodsDetail goods : goodsList) {
 					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);

--
Gitblit v1.8.0