소스 검색

Merge branch 'test' into V2.0.1

yangzian 3 년 전
부모
커밋
b98552bf85

+ 1 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/entity/AiBytedanceAdvertiserStrategy.java

@@ -193,7 +193,7 @@ public class AiBytedanceAdvertiserStrategy{
 	/**预算类型*/
 	private String adBudgetMode;
 	/**计划预算*/
-	private Integer adBudget;
+	private BigDecimal adBudget;
 	/**投放时间类型*/
 	private String adScheduleType;
 	/**投放开始时间 */

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

@@ -1249,12 +1249,12 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             // 出价不为空 则 固定出价
             if (!Check.isNull(updAdStaOrCpaOrBudget.getAdCpaBid())){
                 // 出价 > 计划预算
-                a = updAdStaOrCpaOrBudget.getAdCpaBid().compareTo(new BigDecimal(strategyVo.getAdBudget()));
+                a = updAdStaOrCpaOrBudget.getAdCpaBid().compareTo(strategyVo.getAdBudget());
             //出价为空 则 随机出价 或者 阶梯出价
             // 最高出价 不能大于 计划预算
             }else {
                 // 最高出价 > 计划预算
-                a = updAdStaOrCpaOrBudget.getAdMaxBid().compareTo(new BigDecimal(strategyVo.getAdBudget()));
+                a = updAdStaOrCpaOrBudget.getAdMaxBid().compareTo(strategyVo.getAdBudget());
             }
             if (a == 1){
                 return Result.errorMsg("最高出价不能大于计划预算。");

+ 10 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/bytedance/advertise/controller/BytedanceReportController.java

@@ -169,8 +169,8 @@ public class BytedanceReportController {
 									@RequestParam("adId") String adId,
 									@RequestParam(value = "cpaBid",required = false) BigDecimal cpaBid,
 									@RequestParam(value = "adScheduleTime",required = false) String adScheduleTime,
-									//@RequestParam(value = "budgetMode",required = false) String budgetMode,
-									@RequestParam(value = "budget",required = false) Integer budget,
+									@RequestParam(value = "budgetMode",required = false) String budgetMode,
+									@RequestParam(value = "budget",required = false) BigDecimal budget,
 								 	@RequestParam(value = "downloadUrl",required = false) String downloadUrl) {
 		try {
 			CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
@@ -203,6 +203,14 @@ public class BytedanceReportController {
 				if (!resultUpd.isSuccess()){
 					return Result.errorMsg(resultUpd.getMessage());
 				}
+				ByteDanceAdvertisePlan byteDanceAdvertisePlan = new ByteDanceAdvertisePlan();
+				byteDanceAdvertisePlan.setId(Long.valueOf(adId));
+				byteDanceAdvertisePlan.setCpaBid(cpaBid);
+				byteDanceAdvertisePlan.setScheduleTime(adScheduleTime);
+				byteDanceAdvertisePlan.setBudgetMode(budgetMode);
+				byteDanceAdvertisePlan.setBudget(Check.isNull(budget) ? null : budget);
+				//更新 表 bid || 定向包id || 状态
+				byteDanceAdvertisePlanService.updatePlanOrPackage(byteDanceAdvertisePlan);
 			}
 
 			return Result.successMsg("修改出价成功。",null);