فهرست منبع

Merge remote-tracking branch 'origin/test' into test

songyh 4 سال پیش
والد
کامیت
95d3dcad75

+ 2 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/entity/AiBytedanceAdvertiserStrategy.java

@@ -283,6 +283,8 @@ public class AiBytedanceAdvertiserStrategy{
 	private String creativeProductImageCode;
 	/**创意展现方式*/
 	private String creativeDisplayMode;
+	//允许客户端下载视频功能 0开启;1关闭
+	private Integer creativeDownloadStatus;
 	/**创意分类*/
 	private String creativeThirdIndustryId;
 

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

@@ -1003,12 +1003,13 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
 
             //指定预算
             if (updAdStaOrCpaOrBudget.getBudgetType().equals("2")){
-                if (Integer.valueOf(updAdStaOrCpaOrBudget.getBudget()) < updAdStaOrCpaOrBudget.getCost().multiply(new BigDecimal(1.05)).intValue()){
+                //  前者 < 后者
+                int a = new BigDecimal(updAdStaOrCpaOrBudget.getBudget()).compareTo(updAdStaOrCpaOrBudget.getCost().multiply(new BigDecimal(1.05)));
+                if (a == -1){
                     return Result.errorMsg("修改后预算金额不能低于当前已消费金额的105%");
                 }
             }
             aiBytedanceAdvertiserStrategyMapper.updBudgetById(updAdStaOrCpaOrBudget.getId(), updAdStaOrCpaOrBudget.getBudget(),updAdStaOrCpaOrBudget.getBudgetType());
-
         }
         return Result.successMsg("修改"+(BytedanceConstant.UPDTYPE_BID.equals(updAdStaOrCpaOrBudget.getType()) ? "出价" : "预算")+"成功。",null);
     }

+ 4 - 3
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/report/service/impl/BytedanceAdvertiserHourlyReportServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -262,9 +263,9 @@ public class BytedanceAdvertiserHourlyReportServiceImpl extends ServiceImpl<Byte
            double convetRate = 0;
            if (reportCostVo.getClick() != 0){
                //平均点击单价 = 花费 / 点击数
-               avgClick = reportCostVo.getCost() / reportCostVo.getClick();
-               //点击率 = 展示 / 点击
-               clickRate = reportCostVo.getShowNum() / reportCostVo.getClick();
+               avgClick = reportCostVo.getCost() / reportCostVo.getClick().doubleValue();
+               //点击率 = 点击数 / 展示
+               clickRate = reportCostVo.getClick().doubleValue() / reportCostVo.getShowNum().doubleValue();
                //转化率 = 转化数 / 点击数 * 100
                convetRate = Double.valueOf(reportCostVo.getConvertNum()) /  Double.valueOf(reportCostVo.getClick()) * 100;
            }