整合controller

Signed-off-by: jiapeng.dong <jiapeng.dong@cloudcross.com>

src/main/java/com/cloudcross/ssp/service/IAdvBalanceService.java

@@ -18,14 +18,14 @@ public interface IAdvBalanceService extends IGenericService<AdvBalance> {
 	/**
 	 * 根据代理商id查找它的当前余额
 	 */
-	Float findBalanceByAgentId(Long agentId);
+	Double findBalanceByAgentId(Long agentId);
 	
 	/**
 	 * 根据代理商id更新它的当前余额
 	 * @param balance
 	 * @return
 	 */
-	boolean updateBalanceByAgentId(Long agentId, Float balance);
+	boolean updateBalanceByAgentId(Long agentId, Double balance);
 	
 	/**
 	 * 删掉当前的广告主充值记录

src/main/java/com/cloudcross/ssp/service/IAuditService.java

@@ -5,7 +5,7 @@ package com.cloudcross.ssp.service;
 import java.util.List;
 import java.util.Map;
 
-import com.cloudcross.ssp.back.model.Audit;
+import com.cloudcross.ssp.model.Audit;
 import com.cloudcross.ssp.base.service.IGenericService;
 
 

src/main/java/com/cloudcross/ssp/service/IClientAccountService.java

@@ -5,7 +5,7 @@ package com.cloudcross.ssp.service;
 import java.util.HashMap;
 import java.util.List;
 
-import com.cloudcross.ssp.back.model.ClientAccount;
+import com.cloudcross.ssp.model.ClientAccount;
 import com.cloudcross.ssp.base.service.IGenericService;
 
 

src/main/java/com/cloudcross/ssp/service/impl/AdvBalanceService.java

@@ -114,7 +114,7 @@ public class AdvBalanceService implements IAdvBalanceService{
 	}
 	
 	@Override
-	public Float findBalanceByAgentId(Long agentId) {
+	public Double findBalanceByAgentId(Long agentId) {
 		return myBatisDao.get("advBalanceSqlMapper.findBalanceByAgentId.back", agentId);
 	}
 	
@@ -124,4 +124,10 @@ public class AdvBalanceService implements IAdvBalanceService{
 		return true;
 	}
 
+	@Override
+	public boolean updateBalanceByAgentId(Long agentId, Double balance) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }

src/main/java/com/cloudcross/ssp/service/impl/AuditService.java

@@ -10,8 +10,8 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.cloudcross.ssp.back.model.Audit;
-import com.cloudcross.ssp.back.service.IAuditService;
+import com.cloudcross.ssp.model.Audit;
+import com.cloudcross.ssp.service.IAuditService;
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.MapBuilder;
 import com.cloudcross.ssp.common.utils.Pager;

src/main/java/com/cloudcross/ssp/service/impl/ClientAccountService.java

@@ -10,8 +10,8 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.cloudcross.ssp.back.model.ClientAccount;
-import com.cloudcross.ssp.back.service.IClientAccountService;
+import com.cloudcross.ssp.model.ClientAccount;
+import com.cloudcross.ssp.service.IClientAccountService;
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.Pager;
 import com.cloudcross.ssp.common.utils.SqlHelper;

src/main/java/com/cloudcross/ssp/web/back/main/AuthorityController.java

@@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Account;
-import com.cloudcross.ssp.back.model.Resources;
-import com.cloudcross.ssp.back.model.UserLogin;
-import com.cloudcross.ssp.back.service.IAccountService;
-import com.cloudcross.ssp.back.service.IResourcesService;
-import com.cloudcross.ssp.back.service.IUserLoginService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.Resources;
+import com.cloudcross.ssp.model.UserLogin;
+import com.cloudcross.ssp.service.IAccountService;
+import com.cloudcross.ssp.service.IResourcesService;
+import com.cloudcross.ssp.service.IUserLoginService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.consts.Status;

src/main/java/com/cloudcross/ssp/web/back/main/ClientAccountController.java

@@ -20,18 +20,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Account;
-import com.cloudcross.ssp.back.model.AdvAgent;
-import com.cloudcross.ssp.back.model.ClientAccount;
-import com.cloudcross.ssp.back.model.Operator;
-import com.cloudcross.ssp.back.model.RoleAccount;
-import com.cloudcross.ssp.back.model.UserLogin;
-import com.cloudcross.ssp.back.service.IAccountService;
-import com.cloudcross.ssp.back.service.IAdvAgentService;
-import com.cloudcross.ssp.back.service.IClientAccountService;
-import com.cloudcross.ssp.back.service.IOperatorService;
-import com.cloudcross.ssp.back.service.IRolesService;
-import com.cloudcross.ssp.back.service.IUserLoginService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AdvAgent;
+import com.cloudcross.ssp.model.ClientAccount;
+import com.cloudcross.ssp.model.Operator;
+import com.cloudcross.ssp.model.RoleAccount;
+import com.cloudcross.ssp.model.UserLogin;
+import com.cloudcross.ssp.service.IAccountService;
+import com.cloudcross.ssp.service.IAdvAgentService;
+import com.cloudcross.ssp.service.IClientAccountService;
+import com.cloudcross.ssp.service.IOperatorService;
+import com.cloudcross.ssp.service.IRolesService;
+import com.cloudcross.ssp.service.IUserLoginService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.consts.Status;
@@ -352,7 +352,7 @@ public class ClientAccountController extends SimpleController{
 				if (account.getOperatorId()!=0 && account.getSysType()==2) {
 					List<Long> l = new ArrayList<Long>();
 					l.add(account.getOperatorId());
-					operatorService.updateStatus(l, Status.enable.value);
+					operatorService.updateStatusBack(l, Status.enable.value);
 				}
 			}
 		}
@@ -382,7 +382,7 @@ public class ClientAccountController extends SimpleController{
 				if (account.getOperatorId()!=0 && account.getSysType()==2) {
 					List<Long> l = new ArrayList<Long>();
 					l.add(account.getOperatorId());
-					operatorService.updateStatus(l, Status.disable.value);
+					operatorService.updateStatusBack(l, Status.disable.value);
 				}
 			}
 		}

src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditBannerController.java

@@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.AuditBanner;
-import com.cloudcross.ssp.back.service.IAuditBannerService;
+import com.cloudcross.ssp.model.AuditBanner;
+import com.cloudcross.ssp.service.IAuditBannerService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.consts.Status;

src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditController.java

@@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Audit;
-import com.cloudcross.ssp.back.service.IAuditService;
+import com.cloudcross.ssp.model.Audit;
+import com.cloudcross.ssp.service.IAuditService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;

src/main/java/com/cloudcross/ssp/web/back/main/finance/FinanceManagementController.java

@@ -20,13 +20,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Account;
-import com.cloudcross.ssp.back.model.AdvAgent;
-import com.cloudcross.ssp.back.model.AdvBalance;
-import com.cloudcross.ssp.back.model.OperatorBalance;
-import com.cloudcross.ssp.back.service.IAdvAgentService;
-import com.cloudcross.ssp.back.service.IAdvBalanceService;
-import com.cloudcross.ssp.back.service.IOperatorBalanceService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AdvAgent;
+import com.cloudcross.ssp.model.AdvBalance;
+import com.cloudcross.ssp.model.OperatorBalance;
+import com.cloudcross.ssp.service.IAdvAgentService;
+import com.cloudcross.ssp.service.IAdvBalanceService;
+import com.cloudcross.ssp.service.IOperatorBalanceService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.LangUtil;
@@ -148,10 +148,11 @@ public class FinanceManagementController extends SimpleController {
 		Pager pager = null;
 		pager = new Pager();
 		//统计充值记录总数
-		totalRow = advBalanceService.countByParams(paramMap);
+		//totalRow = advBalanceService.countByParams(paramMap);
+		totalRow = advBalanceService.countByParamsBack(paramMap);
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
-		List<AdvBalance> advBalanceList = advBalanceService.findByParams(paramMap, pager);
+		List<AdvBalance> advBalanceList = advBalanceService.findByParamsBack(paramMap, pager);
 		
 		model.addAttribute("pager", pager);
 		model.addAttribute("advBalanceList", advBalanceList);
@@ -174,18 +175,18 @@ public class FinanceManagementController extends SimpleController {
 		Long agentId = Long.parseLong((String)paramMap.get("agentId"));
 		
 		//得到从前端传递过来的充值金额
-		Float money = new Float((String)paramMap.get("money"));
+		Double money = new Double((String)paramMap.get("money"));
 		
 		//得到该代理商的当前余额
-		Float balance = advBalanceService.findBalanceByAgentId(agentId);
+		Double balance = advBalanceService.findBalanceByAgentId(agentId);
 		
 		//如果得到的余额为空则将余额变为0
 		if(null == balance) {
-			balance = 0f;
+			balance = 0d;
 		}
 		
 		//充值完后的余额
-		balance = new Float(balance + money); 
+		balance = new Double(balance + money); 
 		
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmSS");
 		AdvBalance advBalance = new AdvBalance();
@@ -220,11 +221,11 @@ public class FinanceManagementController extends SimpleController {
 			return "false";
 		} else {
 			//得到该广告主代理商当前的余额
-			Float balance = advBalanceService.findBalanceByAgentId(advBalance.getAgentId());
+			Double balance = advBalanceService.findBalanceByAgentId(advBalance.getAgentId());
 			//得到这个要撤销的充值金额
-			Float money = advBalance.getCharge();
+			Double money = advBalance.getCharge();
 			//撤销完后的余额
-			balance = new Float(balance - money);
+			balance = new Double(balance - money);
 			//更新当前代理商的账户余额
 			advBalanceService.updateBalanceByAgentId(advBalance.getAgentId(), balance);
 			//将这条充值记录删除掉