yangzian 4 роки тому
батько
коміт
7b05949631

+ 3 - 7
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/dockapi/marketing.java

@@ -10,7 +10,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.bytedance.advertise.entity.AiBytedanceAdvertiserStrategy;
-import org.jeecg.modules.bytedance.advertise.entity.ByteDanceAdvertisePlan;
 import org.jeecg.modules.bytedance.advertise.vo.AdConvertQueryVo;
 import org.jeecg.modules.bytedance.advertise.vo.AdGroupSearchVo;
 import org.jeecg.modules.bytedance.advertise.vo.ByteDanceSearchVo;
@@ -352,7 +351,7 @@ public class marketing {
         //直达链接(点击唤起APP)
         params.put("open_url", strategy.getAdOpenUrl());
         //搜索快投功能,允许值:HAS_OPEN:启用,DISABLED:不启用
-        params.put("feed_delivery_search", "搜索快投");
+        //params.put("feed_delivery_search", "");
         //用户定向
         //允许值: "CITY"省市, "COUNTY"区县, "BUSINESS_DISTRICT"商圈,"NONE"不限
         params.put("district", strategy.getAdScheduleType());
@@ -371,7 +370,7 @@ public class marketing {
         //平台
         //params.put("platform", byteDanceAdvertisePlan.getPlatform());
         //最低安卓版本
-        params.put("android_osv", "安卓版本");
+        params.put("android_osv", strategy.getAdAndroidOsv());
         //网络
         //params.put("ac", byteDanceAdvertisePlan.getAc());
         //过滤已安装  当推广目标为安卓应用下载时可填 0表示不限,1表示过滤,2表示定向。默认为不限
@@ -382,7 +381,7 @@ public class marketing {
         params.put("auto_extend_enabled", strategy.getAdAutoExtendEnabled());
         //预算与出价
         //投放场景 允许值: 常规投放"SMART_BID_CUSTOM", 放量投放"SMART_BID_CONSERVATIVE"
-        params.put("smart_bid_type", "投放场景");
+        params.put("smart_bid_type", strategy.getAdSmartBidType());
         //预算类型 "BUDGET_MODE_DAY"日预算, "BUDGET_MODE_TOTAL"总预算
         params.put("budget_mode", strategy.getAdBudgetMode());
         //预算 出价方式为CPC、CPM、CPV时,不少于100元;出价方式为OCPM、OCPC时,不少于300元
@@ -804,9 +803,6 @@ public class marketing {
      * @author: zianY
      */
     public static Result updateAdvertiserPlan(CtopOauthToken token, String planId,String modifyTime,AiBytedanceAdvertiserStrategy strategy) {
-
-
-
         JSONObject params = new JSONObject();
         //广告主ID
         params.put("advertiser_id", strategy.getAccountId());

+ 12 - 7
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/entity/UpdAdStaOrCpaOrBudget.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.bytedance.advertise.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,20 +13,23 @@ import java.util.Map;
  * 2021/4/22
  **/
 @Data
+@ApiModel(description = "修改出价,预算-vo")
 public class UpdAdStaOrCpaOrBudget implements Serializable {
 
     private String id;
-    // 1-修改出价 2-修改预算
+    @ApiModelProperty(value = "1-修改出价 2-修改预算")
     private String type;
-    //广告主id
+    @ApiModelProperty(value = "广告主id")
     private String accountId;
-    List<Map<String,Object>> data;
-
-    //private List<UpdPriceVo> data;
-
-
 
+    List<Map<String,Object>> list;
 
+    @ApiModelProperty(value = "计划id")
+    private String adId;
+    @ApiModelProperty(value = "出价")
+    private String bid;
+    @ApiModelProperty(value = "预算")
+    private String budget;
 
 
 }

+ 10 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -117,9 +118,14 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
     public Result updStaOrCpaOrBudgetById(UpdAdStaOrCpaOrBudget updAdStaOrCpaOrBudget) {
         Result updResult = new Result();
         CtopOauthToken token = tokenService.getOauthTokenByAccountId(updAdStaOrCpaOrBudget.getAccountId());
-        List<Map<String,Object>> priceList = updAdStaOrCpaOrBudget.getData();
+        List<Map<String,Object>> priceList = updAdStaOrCpaOrBudget.getList();
+        Map<String,Object> mapPrice = new HashMap<>();
         //1-修改出价
         if (BytedanceConstant.UPDTYPE_BID.equals(updAdStaOrCpaOrBudget.getType())) {
+            mapPrice.put("ad_id",updAdStaOrCpaOrBudget.getAdId());
+            mapPrice.put("bid",updAdStaOrCpaOrBudget.getBid());
+            priceList.add(mapPrice);
+
             // api 更新计划出价
             updResult = marketing.updatePlanBid(token,updAdStaOrCpaOrBudget.getAccountId(),priceList);
             if (!"200".equals(updResult.getCode())){
@@ -132,6 +138,9 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         }
         //2-修改预算
         if (BytedanceConstant.UPDTYPE_BUDGET.equals(updAdStaOrCpaOrBudget.getType())) {
+            mapPrice.put("ad_id",updAdStaOrCpaOrBudget.getAdId());
+            mapPrice.put("budget",updAdStaOrCpaOrBudget.getBudget());
+            priceList.add(mapPrice);
             // api 修改计划 预算
             updResult = marketing.updatePlanBudget(token,updAdStaOrCpaOrBudget.getAccountId(),priceList);
             if (!"200".equals(updResult.getCode())){

+ 4 - 31
jeecg-boot-module-system/src/main/java/org/jeecg/modules/bytedance/advertise/controller/AiBytedanceAdvertiserStrategyController.java

@@ -3,8 +3,7 @@ package org.jeecg.modules.bytedance.advertise.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -174,7 +173,7 @@ public class AiBytedanceAdvertiserStrategyController {
 
 	@ApiOperation(value="头条智能投放账户配置信息-修改状态(0开-1关)", notes="头条智能投放账户配置信息-修改状态(0开-1关)")
 	@PutMapping(value = "/updStaById")
-	public Result updStaById(@RequestParam("id") String id, @RequestParam("state") String state) {
+	public Result updStaById(@RequestParam("id")String id,  @ApiParam("状态(0开-1关)") @RequestParam("state") String state) {
 		try {
 			return aiBytedanceAdvertiserStrategyService.updStaById(id,state);
 		}catch (Exception e){
@@ -188,9 +187,9 @@ public class AiBytedanceAdvertiserStrategyController {
 	@PutMapping(value = "/updStaOrCpaOrBudgetById")
 	public Result updStaOrCpaOrBudgetById(UpdAdStaOrCpaOrBudget updAdStaOrCpaOrBudget) {
 		try {
-			if (updAdStaOrCpaOrBudget.getData().size() > 100){
+			/*if (updAdStaOrCpaOrBudget.getData().size() > 100){
 				return Result.error("批量修改数量不能超过闭区间[1~100]");
-			}
+			}*/
 			return aiBytedanceAdvertiserStrategyService.updStaOrCpaOrBudgetById(updAdStaOrCpaOrBudget);
 		}catch (Exception e){
 			log.error("修改出价-预算失败",e.getMessage());
@@ -253,32 +252,6 @@ public class AiBytedanceAdvertiserStrategyController {
 	}
 
 
-	@ApiOperation(value="头条智能投放账户配置-新建账户配置", notes="头条智能投放账户配置-新建账户配置")
-	@PostMapping(value = "/createADCreative")
-	public Result createADCreative(@RequestBody AiBytedanceAdvertiserStrategy aiBytedanceAdvertiserStrategy) {
-		try {
-			return aiBytedanceAdvertiserStrategyService.createADCreative(aiBytedanceAdvertiserStrategy);
-		}catch (Exception e){
-			log.error("创建失败",e.getMessage());
-			return Result.error("请求失败,请联系开发人员!");
-		}
-	}
-
-
-	@ApiOperation(value="头条智能投放账户配置-修改账户配置", notes="头条智能投放账户配置-修改账户配置")
-	@PostMapping(value = "/updateADCreative")
-	public Result updateADCreative(AiBytedanceAdvertiserStrategy aiBytedanceAdvertiserStrategy,
-								   @RequestParam("groupModifyTime") String groupModifyTime,
-								   @RequestParam("planModifyTime") String planModifyTime) {
-		try {
-			return aiBytedanceAdvertiserStrategyService.updateADCreative(aiBytedanceAdvertiserStrategy,groupModifyTime,planModifyTime);
-		}catch (Exception e){
-			log.error("修改失败",e.getMessage());
-			return Result.error("请求失败,请联系开发人员!");
-		}
-	}
-
-
 
 	@ApiOperation(value="查询广告计划可用转化目标", notes="查询广告计划可用转化目标")
 	@PostMapping(value = "/getToolConvert")