Browse Source

Merge branch 'V2.0.1' into test

zhaoxian 3 years ago
parent
commit
48936de6ea

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -446,7 +446,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             } else if ("dayBudget".equals(cindicatorCode)) {
                 if ("cost".equals(indicatorCode)) {
                     //倍数计算, 转化成本 高于or低于当前倍数时,预警
-                    threshold = new BigDecimal(String.valueOf(byteDancePlan.getBudget())).multiply(new BigDecimal(threshold)).toString();
+                    othreshold = byteDancePlan.getBudget().multiply(new BigDecimal(threshold)).toString();
                 }
             } else {
                 othreshold = threshold;
@@ -540,7 +540,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                         alreadyOperatedList.add(obj);
                     } else {
                         message = "fail";
-                        log.error("(头条)规则引擎修改出价失败,accountId={},unitId={}", accountId, planId);
+                        log.error("(头条)规则引擎修改出价失败,accountId={},planId={}", accountId, planId);
                     }
                     recordEntity = getOperationRecordEntity(accountId, ruleGroup, maxValue, minValue, operate, null, planId, operationThreshold, oldBid.toString(), newBid.toString(), message, "头条");
                     //修改预算
@@ -567,7 +567,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                         alreadyOperatedList.add(obj);
                     } else {
                         message = "fail";
-                        log.error("(头条)规则引擎修改预算失败,accountId={},unitId={}", accountId, planId);
+                        log.error("(头条)规则引擎修改预算失败,accountId={},planId={}", accountId, planId);
                     }
                     recordEntity = getOperationRecordEntity(accountId, ruleGroup, maxValue, minValue, operate, null, planId, operationThreshold, oldBudget.toString(), newBudget.toString(), message, "头条");
                     //修改投放时间
@@ -579,7 +579,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                         alreadyOperatedList.add(obj);
                     } else {
                         message = "fail";
-                        log.error("规则引擎修改投放时间段失败,accountId={},unitId={}", accountId, planId);
+                        log.error("规则引擎修改投放时间段失败,accountId={},planId={}", accountId, planId);
                     }
                     recordEntity = getOperationRecordEntity(accountId, ruleGroup, maxValue, minValue, operate, null, planId, operationThreshold, byteDancePlan.getScheduleTime(), operationThreshold, message, "头条");
                 }