Browse Source

广告主端首页的更新

Signed-off-by: you.chen <you.chen@cloudcross.com>
you.chen 9 years ago
parent
commit
0b5a4785a6

+ 6 - 1
src/main/java/com/cloudcross/ssp/model/mapper/adv-balance.sql.xml

@@ -240,5 +240,10 @@
 	<delete id="deleteAdvBalanceByIdBack" parameterType="long">
 	<delete id="deleteAdvBalanceByIdBack" parameterType="long">
 		delete from t_adv_balance where id = #{id}
 		delete from t_adv_balance where id = #{id}
 	</delete>
 	</delete>
-
+	
+	<select id="findAgentBalance" parameterType="long" resultType="Double">
+		select balance from t_adv_balance where agent_id = 2 and advertiser_id = 0 
+		order by id desc 
+		limit 1
+	</select>
 </mapper>
 </mapper>

+ 0 - 8
src/main/java/com/cloudcross/ssp/model/mapper/advertiser.sql.xml

@@ -495,14 +495,6 @@
 			</foreach>
 			</foreach>
 	</update>
 	</update>
 	
 	
-	<select id="sumBalanceById" parameterType="map" resultType="double">
-		 select sum(ad.balance) from t_advertiser ad
-		 where status != -1
-		<if test="agentId != null">		    
-		  and ad.agent_id=#{agentId} 
-	   </if>  
-	</select>
-	
 	<!-- 导出Excel用 -->
 	<!-- 导出Excel用 -->
 	<select id="findDeliverEffectAnalysis" parameterType="map" resultType="com.cloudcross.ssp.model.Advertiser">
 	<select id="findDeliverEffectAnalysis" parameterType="map" resultType="com.cloudcross.ssp.model.Advertiser">
 		select 
 		select 

+ 7 - 0
src/main/java/com/cloudcross/ssp/service/IAdvBalanceService.java

@@ -43,4 +43,11 @@ public interface IAdvBalanceService extends IGenericService<AdvBalance> {
 	 
 	 
 	 public int countByParamsBack(Map<String, Object> paramMap);
 	 public int countByParamsBack(Map<String, Object> paramMap);
 	 public List<AdvBalance> findByParamsBack(Map<String, Object> paramMap,Pager pager);
 	 public List<AdvBalance> findByParamsBack(Map<String, Object> paramMap,Pager pager);
+	 
+	 /**
+	  * 查找代理商账号的余额
+	  * @param agentId
+	  * @return
+	  */
+	 Double findAgentBalance(Long agentId);
 }
 }

+ 0 - 2
src/main/java/com/cloudcross/ssp/service/IAdvertiserService.java

@@ -23,8 +23,6 @@ public interface IAdvertiserService extends IGenericService<Advertiser>{
 
 
 	public long findByName(String name);
 	public long findByName(String name);
 	
 	
-	Double sumBalanceById(Map<String, Object> paramMap);
-	
 	public List<Advertiser> findByAgentId(Long id);
 	public List<Advertiser> findByAgentId(Long id);
 	//向t_adgroup里面插入Supdated
 	//向t_adgroup里面插入Supdated
 	public boolean updateSupdated(List<Long> advertiserIdList, int status);
 	public boolean updateSupdated(List<Long> advertiserIdList, int status);

+ 6 - 1
src/main/java/com/cloudcross/ssp/service/impl/AdReportService.java

@@ -19,6 +19,7 @@ import com.cloudcross.ssp.model.Advertiser;
 import com.cloudcross.ssp.model.DeliverAnalysis;
 import com.cloudcross.ssp.model.DeliverAnalysis;
 import com.cloudcross.ssp.service.IAccountService;
 import com.cloudcross.ssp.service.IAccountService;
 import com.cloudcross.ssp.service.IAdReportService;
 import com.cloudcross.ssp.service.IAdReportService;
+import com.cloudcross.ssp.service.IAdvBalanceService;
 import com.cloudcross.ssp.service.IAdvertiserService;
 import com.cloudcross.ssp.service.IAdvertiserService;
 
 
 
 
@@ -30,6 +31,8 @@ public class AdReportService implements IAdReportService {
 	private IAdvertiserService advertiserService;
 	private IAdvertiserService advertiserService;
 	@Autowired
 	@Autowired
 	private IAccountService accountService;
 	private IAccountService accountService;
+	@Autowired
+	private IAdvBalanceService advBalanceService;
 	
 	
 	@Override
 	@Override
 	public DeliverAnalysis findById(Long id) {
 	public DeliverAnalysis findById(Long id) {
@@ -260,7 +263,9 @@ public class AdReportService implements IAdReportService {
 		
 		
 		if(null != agentId) {
 		if(null != agentId) {
 			paramMap.put("agentId", agentId);
 			paramMap.put("agentId", agentId);
-			Double balance = advertiserService.sumBalanceById(paramMap);
+			
+			//得到代理商账号的余额
+			Double balance = advBalanceService.findAgentBalance(agentId);
 			
 			
 			//如果找到的余额为空则余额为0
 			//如果找到的余额为空则余额为0
 			if(null == balance) {
 			if(null == balance) {

+ 5 - 0
src/main/java/com/cloudcross/ssp/service/impl/AdvBalanceService.java

@@ -129,5 +129,10 @@ public class AdvBalanceService implements IAdvBalanceService{
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
 		return false;
 		return false;
 	}
 	}
+	
+	@Override
+	public Double findAgentBalance(Long agentId) {
+		return myBatisDao.get("advBalanceSqlMapper.findAgentBalance", agentId);
+	}
 
 
 }
 }

+ 1 - 4
src/main/java/com/cloudcross/ssp/service/impl/AdvertiserService.java

@@ -226,10 +226,7 @@ public class AdvertiserService implements IAdvertiserService, ISelectorProvider{
 		return myBatisDao.getList("advertiserSqlMapper.selectByStatus", paramMap);
 		return myBatisDao.getList("advertiserSqlMapper.selectByStatus", paramMap);
 	}
 	}
 
 
-	@Override
-	public Double sumBalanceById(Map<String, Object> paramMap) {
-		return myBatisDao.get("advertiserSqlMapper.sumBalanceById",paramMap);
-	}
+	
 	@Override
 	@Override
 	public List<Advertiser> findByAgentId(Long id) {
 	public List<Advertiser> findByAgentId(Long id) {
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub