فهرست منبع

Merge remote-tracking branch 'origin/master'

yumeng 4 سال پیش
والد
کامیت
6a522c67e9

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouNewCreateCampaignServiceImpl.java

@@ -68,8 +68,8 @@ public class AiKuaishouNewCreateCampaignServiceImpl implements IAiKuaishouNewCre
 
         // 2.2 执行 素造的 视频拉取服务,时间过滤执行 yyyy-MM-dd HH:mm:ss
         // 时间差,单位为分钟
-        int timeStart = -10;
-        int timeEnd = -5;
+        int timeStart = -25;
+        int timeEnd = -20;
         Long now = System.currentTimeMillis();
         String startTime = DateUtils.formatDate(new Date(now + timeStart*60*1000),"yyyy-MM-dd HH:mm:ss");
         String endTime = DateUtils.formatDate(new Date(now + timeEnd*60*1000),"yyyy-MM-dd HH:mm:ss");

+ 16 - 12
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java

@@ -166,20 +166,24 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
             wrapper.eq("unit_id",unitDetail.getLong("unit_id"));
             KuaiShouGroup group = kuaiShouGroupService.getOne(wrapper);
             if(group!=null){
-                unit.setId(unitDetail.getLong("unit_id"));
-                unit.setAccountId(accountId);
-                unit.setPlanId(unitDetail.getLong("campaign_id"));
-                unit.setUnitId(unitDetail.getLong("unit_id"));
-                unit.setUnitName(unitDetail.getString("unit_name"));
-                unit.setCharge(unitDetail.getBigDecimal("charge"));
-                //未知优化目标数据存空
-                if(group.getOcpxActionType()!=0){
-                    unit.setConvertNum(handleConvertNum(group.getOcpxActionType(),unitDetail));
-                    if(null!=unit.getConvertNum()&&unit.getConvertNum()!=0){
-                        unit.setConvertCost(unitDetail.getBigDecimal("charge").divide(BigDecimal.valueOf(unit.getConvertNum()), 2, RoundingMode.HALF_UP));
+                Integer status = group.getStatus();
+                Integer putStatus = group.getPutStatus();
+                if((status == 20 || status == 19) && putStatus == 1){
+                    unit.setId(unitDetail.getLong("unit_id"));
+                    unit.setAccountId(accountId);
+                    unit.setPlanId(unitDetail.getLong("campaign_id"));
+                    unit.setUnitId(unitDetail.getLong("unit_id"));
+                    unit.setUnitName(unitDetail.getString("unit_name"));
+                    unit.setCharge(unitDetail.getBigDecimal("charge"));
+                    //未知优化目标数据存空
+                    if(group.getOcpxActionType()!=0){
+                        unit.setConvertNum(handleConvertNum(group.getOcpxActionType(),unitDetail));
+                        if(null!=unit.getConvertNum()&&unit.getConvertNum()!=0){
+                            unit.setConvertCost(unitDetail.getBigDecimal("charge").divide(BigDecimal.valueOf(unit.getConvertNum()), 2, RoundingMode.HALF_UP));
+                        }
                     }
+                    batch.add(unit);
                 }
-                batch.add(unit);
             }
 
         });