瀏覽代碼

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-cloud

yumeng 3 年之前
父節點
當前提交
f4242e9910

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupServiceImpl.java

@@ -444,8 +444,8 @@ public class KuaiShouGroupServiceImpl extends ServiceImpl<KuaiShouGroupMapper, K
                             if (!Check.isNullMap(ocpxMap)) {
                                 Long ocpxBid = ocpxMap.get(ocpxActionType);
                                 if (Check.isNull(ocpxBid)) {
-                                    if (ocpxActionType == 2 && dayBudget != 0 && dayBudget <= 500 * 1000) {
-                                        // 转化目标为2行为数,并且预算小于等于500且不是不限,则允许启动
+                                    if (ocpxActionType == 2 && dayBudget != 0 && dayBudget <= 100 * 1000) {
+                                        // 转化目标为2行为数,并且预算小于等于100且不是不限,则允许启动
                                         typeFalg = true;
                                     } else {
                                         //通过key未获取值,说明不包含该目标,进行关停
@@ -459,8 +459,8 @@ public class KuaiShouGroupServiceImpl extends ServiceImpl<KuaiShouGroupMapper, K
                                         msgBid = "转化出价:" + cpaBid + " > 项目出价:" + ocpxBid;
                                     }
                                 }
-                            } else if (ocpxActionType == 2 && (dayBudget == 0 || dayBudget > 500 * 1000)) {
-                                // 转化目标为2行为数,并且预算大于500 或者不限,则关停
+                            } else if (ocpxActionType == 2 && (dayBudget == 0 || dayBudget > 100 * 1000)) {
+                                // 转化目标为2行为数,并且预算大于100 或者不限,则关停
                                 typeFalg = false;
                                 msgType = "组转化目标:" + msg + ",日预算为:" + dayBudget;
                             }

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1345,8 +1345,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         if (!Check.isNullMap(ocpxMap)) {
                             Long ocpxBid = ocpxMap.get(ocpxActionType);
                             if (Check.isNull(ocpxBid)) {
-                                if (ocpxActionType == 2 && dayBudget != 0 && dayBudget <= 500 * 1000) {
-                                    // 转化目标为2行为数,并且预算小于等于500且不是不限,则允许启动
+                                if (ocpxActionType == 2 && dayBudget != 0 && dayBudget <= 100 * 1000) {
+                                    // 转化目标为2行为数,并且预算小于等于100且不是不限,则允许启动
                                     typeFalg = true;
                                 } else {
                                     //通过key未获取值,说明不包含该目标,进行关停
@@ -1360,8 +1360,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                                     msgBid = "转化出价:" + cpaBid + " > 项目出价:" + ocpxBid;
                                 }
                             }
-                        } else if (ocpxActionType == 2 && (dayBudget == 0 || dayBudget > 500 * 1000)) {
-                            // 转化目标为2行为数,并且预算大于500 或者不限,则关停
+                        } else if (ocpxActionType == 2 && (dayBudget == 0 || dayBudget > 100 * 1000)) {
+                            // 转化目标为2行为数,并且预算大于100 或者不限,则关停
                             typeFalg = false;
                             msgType = "组转化目标:" + msg + ",日预算为:" + dayBudget;
                         }