Browse Source

修改对应的广告主、订单、活动、投放。

原志强 9 years ago
parent
commit
59df135049

+ 2 - 0
src/main/java/com/cloudcross/ssp/model/mapper/ad-group.sql.xml

@@ -256,6 +256,7 @@
 		insert into t_adgroup
 			(name,campaign_id,order_id,agent_id,advertiser_id,active_time,expire_time,totalbudget,mode,
 			price,
+			<if test="operatorId !=null">operator,</if>
 			<if test="dailyBudget !=null">dailybudget,</if>
 			<if test="maxImpression !=null">impression,</if>
 			<if test="maxClick !=null">	click,</if>
@@ -275,6 +276,7 @@
 		values
 			(#{adGroupName},#{campaignId},#{orderId},#{agentId},#{advertiserId},#{startDate},#{endDate},#{totalBudget},#{mode},
 			#{price},
+			<if test="operatorId !=null">#{operator},</if>
 			<if test="dailyBudget !=null">#{dailyBudget},</if>
 			<if test="maxImpression !=null">#{maxImpression},</if>
 			<if test="maxClick !=null">#{maxClick},</if>

+ 2 - 2
src/main/java/com/cloudcross/ssp/model/mapper/campaign.sql.xml

@@ -23,7 +23,7 @@
 	
 	<insert id="addCampaignadvertiser" parameterType="com.cloudcross.ssp.model.Campaign">
 		insert into t_campaign
-			(name,agent_id,advertiser_id,
+			(name,agent_id,advertiser_id,operator_id,
 			order_id,activate_time,expire_time,totalbudget,
 			<if test="dailyBudget !=null">dailybudget,</if>
 			<if test="impression!=null">impression,</if>
@@ -35,7 +35,7 @@
 			<if test="memo !=null">memo,</if>
 			 updated)
 		values
-			(#{name},#{agentId},#{advertiserId},
+			(#{name},#{agentId},#{advertiserId},#{operatorId},
 			#{orderId},#{activeTime},#{expireTime},#{totalBudget},
 			<if test="dailyBudget !=null">#{dailyBudget},</if>
 			<if test="impression!=null">#{impression},</if>

+ 2 - 3
src/main/java/com/cloudcross/ssp/model/mapper/order.sql.xml

@@ -11,7 +11,6 @@
 		t_order.comment as comment,
 		t_order.status as status,
 		t_order.updated as updated
-		
 	</sql>
 	
 	<select id="selectByParams"  parameterType="map" resultType="com.cloudcross.ssp.model.Order">
@@ -197,8 +196,8 @@
 	
 	
 	<insert id="addOrder" parameterType="com.cloudcross.ssp.model.Order">
-		insert into t_order(name,budget,comment,updated,advertiser_id,agent_id)
-		values(#{name},#{budget},#{comment},#{updated},#{advertiserId},#{agentId})
+		insert into t_order(name,budget,comment,updated,advertiser_id,agent_id,operator_id)
+		values(#{name},#{budget},#{comment},#{updated},#{advertiserId},#{agentId},#{operatorId})
 	</insert>
 	
 	<insert id="addOrderBack" parameterType="com.cloudcross.ssp.model.Order">

+ 3 - 0
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/AdvertiserController.java

@@ -195,6 +195,9 @@ public class AdvertiserController extends SimpleController {
 				//如果获取的当前执行操作的账号的operatorId不等于0,那么,对应的广告主也要插入不等于0的operatorId。
 				t.setOperatorId(account.getOperatorId());
 			}
+			else {
+				t.setOperatorId(new Long(0));
+			}
 			if (advertiserService.add(t)) {
 				//添加广告主后的资质审核消息
 				Message message = new Message();

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

@@ -242,7 +242,14 @@ public class OrderController extends SimpleController{
 	public String save(Model model,@ModelAttribute("form") Order t,HttpServletRequest request) {
 		model.addAttribute("advertiserId", t.getAdvertiserId());
 		model.addAttribute("agentId",t.getAgentId());
+		Account account = getLoginUser();
 		if(t.getId() == null) {
+			if (account.getOperatorId()!=0) {
+				t.setOperatorId(account.getOperatorId());
+			}else
+			{
+				t.setOperatorId(new Long(0));
+			}
 			if(orderService.add(t)){
 				//如果添加订单成功,向log数据库中插入记录!!
 				Log logAdd= new Log();

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

@@ -782,6 +782,17 @@ public class AdGroupController extends SimpleController {
 			
 		    
 	    if (adGroup.getId() == null) {	
+	    	try {
+	    		if (getLoginUser().getOperatorId()!=0) {
+					adGroup.setOperatorId(getLoginUser().getOperatorId());
+				}else{
+					adGroup.setOperatorId(new Long(0));
+				}
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+	    	
 			adGroupService.save(adGroup, paramMap);
 			/**
 			 * 新增投放成功后同时会新增地域定向,时段定向,wifi定向以及下面的场景

+ 12 - 1
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/CampaignController.java

@@ -207,7 +207,18 @@ public class CampaignController extends SimpleController {
 				// TODO Auto-generated catch block
 				e2.printStackTrace();
 			}	
-
+			try {
+				//如果登录用户的operatorId不是0,那么对应的插入operatorId
+				if (getLoginUser().getOperatorId()!=0) {
+					t.setOperatorId(getLoginUser().getOperatorId());
+				}
+				else {
+					t.setOperatorId(new Long(0));
+				}
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
 			if (campaignService.add(t)) {
 				//如果添加活动成功,向log数据库中插入记录
 				Log logAdd= new Log();