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/RecommendSpecialServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSpecialServiceImpl.java
index 9836a34..06ae626 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSpecialServiceImpl.java
@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.admin.RecommendSpecialAdmin;
import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;
-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.RecommendSpecialService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
import com.yeshi.fanli.util.Constant;
@@ -36,7 +36,7 @@
private SuperRecommendSpecialService superRecommendSpecialService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
public void addRecommendSpecial(RecommendSpecial special) {
special.setCreatetime(java.lang.System.currentTimeMillis());
@@ -54,7 +54,7 @@
String platform, String packages, String key) {
final int strat = index * Constant.PAGE_SIZE;
platform = Utils.getMap().get(platform);
- com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);
+ BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
List<RecommendSpecial> recommendSpecialList=null;
List<SuperRecommendSpecial> superRecommendSpecialList=null;
Map<Long,RecommendSpecialAdmin> recommendSpecialAdminMap=new HashMap<Long, RecommendSpecialAdmin>();
@@ -93,14 +93,14 @@
}
superRecommendSpecialList = superRecommendSpecialService.getSuperRecommendSpecials(rsIdList);
}
- Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();
+ Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();
Long rsId=null;
- List<System> systemList=null;
+ List<BusinessSystem> systemList=null;
for (SuperRecommendSpecial srs : superRecommendSpecialList) {
rsId = srs.getRecommendSpecial().getId();
systemList = superMap.get(rsId);
if(systemList==null){
- systemList=new ArrayList<System>();
+ systemList=new ArrayList<BusinessSystem>();
}
systemList.add(srs.getSystem());
superMap.put(rsId,systemList);
@@ -112,7 +112,7 @@
if(rsa==null){
rsa=new RecommendSpecialAdmin();
}
- List<System> list = superMap.get(id);
+ List<BusinessSystem> list = superMap.get(id);
if(list != null){
rsa.getSystemList().addAll(superMap.get(id));
}
@@ -197,7 +197,7 @@
public int getCount(String platform, String packages, final String key) {
platform = Utils.getMap().get(platform);
- final System system = systemService.getSystem(platform, packages);
+ final BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
return (Integer) recommendSpecialDao.excute(new HibernateCallback<Integer>() {
public Integer doInHibernate(Session session)
--
Gitblit v1.8.0