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/SuperRecommendBannerV2ServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerV2ServiceImpl.java
index e98aafc..807f69d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendBannerV2ServiceImpl.java
@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperRecommendBannerV2Dao;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
-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.SuperRecommendBannerV2Service;
import com.yeshi.fanli.util.Constant;
@@ -29,11 +29,11 @@
private SuperRecommendBannerV2Dao superRecommendBannerV2Dao;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Cacheable(value = "bannerCache", key = "'getSuperRecommendBannerV2sBySystem-'+#system.id")
public List<SuperRecommendBannerV2> getSuperRecommendBannerV2sBySystem(
- final System system) {
+ final BusinessSystem system) {
List<SuperRecommendBannerV2> list = superRecommendBannerV2Dao.list(
"from SuperRecommendBannerV2 srb where srb.system.id=? order by srb.recommendBanner.orderby",
new Serializable[] { system.getId() });
@@ -78,7 +78,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 SuperRecommendBannerV2 srb "
+ " where srb.recommendBanner.id=? and srb.system.id=?");
@@ -92,7 +92,7 @@
}
public void addSuperRecommendBanner(long rbid, String platform,String packageName) {
- System system = systemService.getSystem(platform,packageName);
+ BusinessSystem system = businessSystemService.getBusinessSystem(platform,packageName);
SuperRecommendBannerV2 superRecommendBanner = new SuperRecommendBannerV2();
RecommendBannerV2 recommendBanner = new RecommendBannerV2();
recommendBanner.setId(rbid);
--
Gitblit v1.8.0