Browse Source

创建订单,活动,投放时预算的控制不能大于上一级的预算

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

+ 10 - 0
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/OrderController.java

@@ -141,6 +141,11 @@ public class OrderController extends SimpleController{
 		model.addAttribute("advertiserId", advertiserId);
 		Account account = getLoginUser();
 		model.addAttribute("agentId", account.getAgentId());
+		
+		//得到该广告主的余额
+		Float balance = advertiserService.findById(advertiserId).getBalance();
+		model.addAttribute("balance", balance);
+		
 		return page("create");
 	}
 	
@@ -301,6 +306,11 @@ public class OrderController extends SimpleController{
 	public String edit(Model model, @PathVariable Long id) {
 		Order order = orderService.findById(id);	
 		model.addAttribute("order", order);
+		
+		//得到该广告主的余额
+		Float balance = advertiserService.findById(order.getAdvertiserId()).getBalance();
+		model.addAttribute("balance", balance);
+		
 		return page("edit");
 	}
 	

+ 4 - 4
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/AdGroupController.java

@@ -442,7 +442,7 @@ public class AdGroupController extends SimpleController {
 		model.addAttribute("advertiserId", advertiserId);	
 		model.addAttribute("orderId", orderId);
 		model.addAttribute("agentId", agentId);
-		model.addAttribute("budget", order.getBudget());
+		model.addAttribute("budget", campaign.getTotalBudget());
 		
 		
 		//找到所有的场景,并且显示出来
@@ -456,9 +456,9 @@ public class AdGroupController extends SimpleController {
 		Long id = Long.valueOf(paramMap.get("id").toString());//投放id
 		AdGroup adGroup = adGroupService.findById(id);
 		
-		//找到这个投放对应的订单,然后保存订单预算
-		Order order = orderService.findById(adGroup.getOrderId());
-		model.addAttribute("budget", order.getBudget());
+		//找到这个投放对应的活动,然后保存活动预算
+		Campaign campaign = campaignService.findById(adGroup.getCampaignId());
+		model.addAttribute("budget", campaign.getTotalBudget());
 		
 		//找到所有的场景,并且显示出来
 		List<Place> placeList = placeService.findAll();

+ 9 - 2
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/CampaignController.java

@@ -164,6 +164,10 @@ public class CampaignController extends SimpleController {
 		//加上登录代理商Id
 		Account account = getLoginUser();
 		model.addAttribute("agentId", account.getAgentId());
+		
+		//得到该订单的总预算
+		Float totalBudget = orderService.findById(orderId).getBudget();
+		model.addAttribute("totalBudget", totalBudget);
 		return page("create");
 	}
 	
@@ -330,13 +334,16 @@ public class CampaignController extends SimpleController {
 	public String edit(Model model, @RequestParam Long id,@RequestParam Long advertiserId) {
 		// 根据id从数据库中查询活动对象。
 		//campaignGroup活动和advertiser广告主暂时未加入
-
 		Campaign campaign = campaignService.findById(id);
 		Long orderId = campaign.getOrderId();
 		model.addAttribute("advertiserId", advertiserId);
 		model.addAttribute("orderId", orderId);
 		model.addAttribute("campaign", campaign);
-		System.out.println("qqqqqqqqqqqq" + campaign + "orderId" + orderId);
+		
+		//得到该订单的总预算
+		Float totalBudget = orderService.findById(orderId).getBudget();
+		model.addAttribute("totalBudget", totalBudget);
+		
 		return page("edit");
 	}