From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerServiceImpl.java
index 3a5e517..d928049 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerServiceImpl.java
@@ -17,8 +17,8 @@
 import com.yeshi.fanli.dao.goods.SuperRecommendBannerDao;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
 import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
-import com.yeshi.fanli.entity.system.System;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
 import com.yeshi.fanli.util.Constant;
 
@@ -30,10 +30,12 @@
 	private SuperRecommendBannerDao superRecommendBannerDao;
 	
 	@Resource
-	private SystemService systemService;
+	private BusinessSystemService businessSystemService;
+	
+	
 	@Cacheable(value={"bannerCache"}, key="#root.methodName+#system.id")
 	public List<SuperRecommendBanner> getSuperRecommendBannersBySystem(
-			final System system) {
+			final BusinessSystem system) {
 		List<SuperRecommendBanner> list = superRecommendBannerDao.list(
 				"from SuperRecommendBanner srb where srb.system.id=? order by srb.recommendBanner.orderby",
 				new Serializable[] { system.getId() });
@@ -78,7 +80,7 @@
 
 			public Integer doInHibernate(Session session)
 					throws HibernateException {
-				System system = systemService.getSystem(platform, packageName);
+				BusinessSystem system = businessSystemService.getBusinessSystem(platform, packageName);
 				Transaction transaction = session.beginTransaction();
 				Query query = session.createQuery("delete SuperRecommendBanner srb "
 							+ " where srb.recommendBanner.id=? and srb.system.id=?");
@@ -92,7 +94,7 @@
 	}
 
 	public void addSuperRecommendBanner(long rbid, String platform,String packageName) {
-		System system = systemService.getSystem(platform,packageName);
+		BusinessSystem system = businessSystemService.getBusinessSystem(platform,packageName);
 		SuperRecommendBanner superRecommendBanner = new SuperRecommendBanner();
 		RecommendBanner recommendBanner = new RecommendBanner();
 		recommendBanner.setId(rbid);

--
Gitblit v1.8.0