Browse Source

规则引擎,数据维度变更

zhaoxian 3 năm trước cách đây
mục cha
commit
f140965a6d

+ 19 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/RuleDataTargetKuaishou.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 快手预警指标数据
  */
@@ -59,5 +61,21 @@ public class RuleDataTargetKuaishou {
 	private Integer network;
 
 	private java.util.Date createTime;
-
+	/**
+	 * 出价
+	 */
+	private BigDecimal cpaBid;
+	/**
+	 * 深度转化目标出价
+	 */
+	private BigDecimal deepConversionBid;
+	/**
+	 * 深度转化目标 3: 付费,7: 次日留存,10: 完件, 11: 授信 ,0:无
+	 */
+	private Integer deepConversionType;
+	/**
+	 * 优化目标
+	 * 2:行为数;180:激活数;53:表单数;190: 付费;191:首日ROI;324:唤起应用;348:有效线索;383: 授信;384: 完件;394:订单提交;;396:注册
+	 */
+	private Integer ocpxActionType;
 }

+ 3 - 18
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/RuleDateUnitKuaishou.java

@@ -69,32 +69,17 @@ public class RuleDateUnitKuaishou {
      * 付费
      */
     private Long eventPay;
-    /**
-     * 深度转化目标出价
-     */
-    private BigDecimal deepConversionBid;
-    /**
-     * 深度转化目标 3: 付费,7: 次日留存,10: 完件, 11: 授信 ,0:无
-     */
-    private Integer deepConversionType;
+
     /**
      * 安卓版本  3:不限, 4: 4.x+, 5: 5.x+, 6: 6.x+, 7: 7.x+;
      */
     private Integer androidOsv;
-    /**
-     * 优化目标
-     * 2:行为数;180:激活数;53:表单数;190: 付费;191:首日ROI;324:唤起应用;348:有效线索;383: 授信;384: 完件;394:订单提交;;396:注册
-     */
-    private Integer ocpxActionType;
+
     /**
      * 付费单价
      */
     private BigDecimal payCost;
-    /**
-     * 出价
-     */
-    private BigDecimal cpaBid;
-
+    
     private Integer status;
 
     private java.util.Date createTime;

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

@@ -186,10 +186,10 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
                     unit.setUnitId(unitDetail.getLong("unit_id"));
                     unit.setUnitName(unitDetail.getString("unit_name"));
                     unit.setCharge(unitDetail.getBigDecimal("charge"));
-                    unit.setDeepConversionBid(new BigDecimal(group.getDeepConversionBid()).divide(new BigDecimal("1000")));
-                    unit.setDeepConversionType(group.getDeepConversionType());
-                    unit.setOcpxActionType(group.getOcpxActionType());
-                    unit.setCpaBid(new BigDecimal(group.getCpaBid()).divide(new BigDecimal("1000"), 2, RoundingMode.HALF_UP));
+//                    unit.setDeepConversionBid(new BigDecimal(group.getDeepConversionBid()).divide(new BigDecimal("1000")));
+//                    unit.setDeepConversionType(group.getDeepConversionType());
+//                    unit.setOcpxActionType(group.getOcpxActionType());
+//                    unit.setCpaBid(new BigDecimal(group.getCpaBid()).divide(new BigDecimal("1000"), 2, RoundingMode.HALF_UP));
                     //未知优化目标数据存空
                     if (group.getOcpxActionType() != 0) {
                         unit.setConvertNum(handleConvertNum(group.getOcpxActionType(), unitDetail));