diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java index 31b259e0..4cc53070 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Company.java @@ -128,5 +128,10 @@ public class Company extends BaseEntity implements Serializable { @Column(name = "talk_call_fee") private Double talkCallFee; + @ApiModelProperty("dmp投放费用") + @Column(name = "dmp_delivery_fee") + private Double dmpDeliveryFee; + + } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/vo/CompanyComboVO.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/vo/CompanyComboVO.java index 7b7572d4..150fedc8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/vo/CompanyComboVO.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/vo/CompanyComboVO.java @@ -3,6 +3,8 @@ package com.baiye.modules.system.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; import java.util.Date; /** @@ -36,6 +38,9 @@ public class CompanyComboVO { @ApiModelProperty("拓客去显号价格") private Double talkCallFee; + @ApiModelProperty("dmp投放费用") + private Double dmpDeliveryFee; + @ApiModelProperty("坐席号") private Integer seatNumber; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/CompanyComboDTO.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/CompanyComboDTO.java index f4ff47ff..567319bf 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/CompanyComboDTO.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/CompanyComboDTO.java @@ -5,7 +5,6 @@ import lombok.Data; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** @@ -43,4 +42,9 @@ public class CompanyComboDTO { @DecimalMin(value = "0.0") @DecimalMax(value = "999.0") private Double talkCallFee; + + @ApiModelProperty("dmp投放费用") + @DecimalMin(value = "0.0") + @DecimalMax(value = "999.0") + private Double dmpDeliveryFee; } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java index 94058399..a2294e68 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java @@ -226,5 +226,4 @@ public class CompanyServiceImpl implements CompanyService { } return PageUtil.toPage(comboVOList, page.getTotalElements()); } - } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java index 50ba26ea..2b025cc2 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java @@ -53,8 +53,6 @@ public class DeliveryBalanceTask { /** * 修改时间 为8点至21点 - * - * */ @Scheduled(cron = "0 0/30 8-21 * * ? ") @Transactional(rollbackFor = Exception.class) @@ -72,9 +70,8 @@ public class DeliveryBalanceTask { Long userId = list.get(DefaultNumberConstants.ZERO_NUMBER).getUserId(); Company companyByUserId = companyService.findCompanyByUserId(userId); if (ObjectUtil.isNotNull(companyByUserId) - && ObjectUtil.isNotNull(companyByUserId.getTemplateId()) // 判断价格 - && ObjectUtil.isNotNull(companyByUserId.getDeliveryCallFee())) { + && ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) { // 每次100000 数据 List> lists = Lists.partition (list, DefaultNumberConstants.ONE_HUNDRED_THOUSAND); @@ -82,7 +79,7 @@ public class DeliveryBalanceTask { for (List taskImeiList : lists) { // 大于100 进行兑换 if (taskImeiList.size() >= DefaultNumberConstants.ONE_HUNDRED) { - BigDecimal decimal = NumberUtil.mul(companyByUserId.getDeliveryCallFee(), BigDecimal.valueOf(taskImeiList.size())); + BigDecimal decimal = NumberUtil.mul(companyByUserId.getDmpDeliveryFee(), BigDecimal.valueOf(taskImeiList.size())); BigDecimal sub = NumberUtil.sub(companyByUserId.getUserBalance(), decimal); // 判断余额 if (sub.compareTo(BigDecimal.valueOf