Преглед на файлове

Merge remote-tracking branch 'origin/master'

songyh преди 4 години
родител
ревизия
e395d1e623

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

@@ -923,17 +923,12 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         Map<String,Object> mapPrice = new HashMap<>();
         //1-修改出价
         if (BytedanceConstant.UPDTYPE_BID.equals(updAdStaOrCpaOrBudget.getType())) {
-            if (Check.isNull(updAdStaOrCpaOrBudget.getBId())){
-                return Result.errorMsg("出价不能为空,请重新输入。");
-            }
             aiBytedanceAdvertiserStrategyMapper.updCpaById(updAdStaOrCpaOrBudget.getId(),updAdStaOrCpaOrBudget.getBId());
         }
         //2-修改预算
         if (BytedanceConstant.UPDTYPE_BUDGET.equals(updAdStaOrCpaOrBudget.getType())) {
-            if (Check.isNull(updAdStaOrCpaOrBudget.getBudget())) {
-                return Result.errorMsg("预算不能为空,请重新输入。");
-            }
             aiBytedanceAdvertiserStrategyMapper.updBudgetById(updAdStaOrCpaOrBudget.getId(), updAdStaOrCpaOrBudget.getBudget());
+
         }
         return Result.successMsg("修改"+(BytedanceConstant.UPDTYPE_BID.equals(updAdStaOrCpaOrBudget.getType()) ? "出价" : "预算")+"成功。", updResult.getResult());
     }
@@ -1140,7 +1135,11 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         aiBytedanceAdvertiserStrategy.setCreativeInventoryType(org.apache.commons.lang3.StringUtils.join(aiBytedanceAdvertiserStrategy.getCreativeInventoryTypes(), ","));
         //创意标签
         aiBytedanceAdvertiserStrategy.setCreativeAdKeywords(org.apache.commons.lang3.StringUtils.join(aiBytedanceAdvertiserStrategy.getAdKeywords(), ","));
-        aiBytedanceAdvertiserStrategy.setCreativeAdKeywords(org.apache.commons.lang3.StringUtils.join(aiBytedanceAdvertiserStrategy.getAdKeywords(), ","));
+        aiBytedanceAdvertiserStrategy.setCreateTime(new Date());
+
+        //同一账户下 只能有一条信息 为开启
+        //关闭 账户下 其他数据信息(不包含本条id信息) 状态为 关闭
+        aiBytedanceAdvertiserStrategyMapper.updStaByAccountId(String.valueOf(aiBytedanceAdvertiserStrategy.getAccountId()),"1",null);
         //状态(0开 1关)
         aiBytedanceAdvertiserStrategy.setStatus(0);
 

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

@@ -236,6 +236,9 @@ public class AiBytedanceAdvertiserStrategyController {
 			/*if (updAdStaOrCpaOrBudget.getData().size() > 100){
 				return Result.error("批量修改数量不能超过闭区间[1~100]");
 			}*/
+			if (Check.isNull(updAdStaOrCpaOrBudget.getBId()) && Check.isNull(updAdStaOrCpaOrBudget.getBudget())){
+				return Result.errorMsg("价格不能为空,请重新输入。");
+			}
 			return aiBytedanceAdvertiserStrategyService.updStaOrCpaOrBudgetById(updAdStaOrCpaOrBudget);
 		}catch (Exception e){
 			log.error("修改出价-预算失败",e.getMessage());