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/client/v1/CommonContentController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
index 5a0364e..2631579 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -19,11 +19,11 @@
 import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
 import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -66,7 +66,7 @@
 			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
 			return;
 		}
-		List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
+		List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key),acceptData.getSystem());
 		out.print(JsonUtil.loadTrueResult(new Gson().toJson(list)));
 	}
 
@@ -92,7 +92,7 @@
 		}
 
 		CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
-				cid, page, 10);
+				cid, page, 10,acceptData.getSystem());
 
 		// 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
 		List<SwiperPicture> bannerList = new ArrayList<>();
@@ -103,7 +103,7 @@
 
 		JSONArray array = new JSONArray();
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
-		BigDecimal pro = hongBaoManageService.getFanLiRate();
+		BigDecimal pro = hongBaoManageService.getFanLiRate(acceptData.getSystem());
 		if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
 			pro = new BigDecimal(100);
 		List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();

--
Gitblit v1.8.0