|
@@ -10,6 +10,7 @@ import org.jeecg.common.util.DateUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
+import java.math.BigDecimal;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -58,10 +59,10 @@ public class NewMonitorServiceImpl implements NewMonitorService {
|
|
String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
|
|
String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
|
|
String groupCreatTime = obj.get("groupCreatTime") == null ? null : (String) obj.get("groupCreatTime");
|
|
String groupCreatTime = obj.get("groupCreatTime") == null ? null : (String) obj.get("groupCreatTime");
|
|
if (unitId != null && afterTime != null) {
|
|
if (unitId != null && afterTime != null) {
|
|
- String groupCharge = newMonitorMapper.getGroupCharge(unitId, afterTime);
|
|
|
|
|
|
+ BigDecimal groupCharge = newMonitorMapper.getGroupCharge(unitId, afterTime);
|
|
//大于500为有效广告组
|
|
//大于500为有效广告组
|
|
String effective = "0";
|
|
String effective = "0";
|
|
- if (groupCharge != null && Long.parseLong(groupCharge) > 500) {
|
|
|
|
|
|
+ if (groupCharge != null && groupCharge.compareTo(new BigDecimal(500)) ==1 ) {
|
|
//有效
|
|
//有效
|
|
effective = "1";
|
|
effective = "1";
|
|
}
|
|
}
|
|
@@ -102,10 +103,10 @@ public class NewMonitorServiceImpl implements NewMonitorService {
|
|
String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
|
|
String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
|
|
String campaignCreatTime = obj.get("campaignCreatTime") == null ? null : (String) obj.get("campaignCreatTime");
|
|
String campaignCreatTime = obj.get("campaignCreatTime") == null ? null : (String) obj.get("campaignCreatTime");
|
|
if (campaignId != null && afterTime != null) {
|
|
if (campaignId != null && afterTime != null) {
|
|
- String campaignCharge = newMonitorMapper.getCampaignCharge(campaignId, afterTime);
|
|
|
|
|
|
+ BigDecimal campaignCharge = newMonitorMapper.getCampaignCharge(campaignId, afterTime);
|
|
//大于500为有效广告计划
|
|
//大于500为有效广告计划
|
|
String effective = "0";
|
|
String effective = "0";
|
|
- if (campaignCharge != null && Long.parseLong(campaignCharge) > 500) {
|
|
|
|
|
|
+ if (campaignCharge != null && campaignCharge.compareTo(new BigDecimal(500)) ==1) {
|
|
//有效
|
|
//有效
|
|
effective = "1";
|
|
effective = "1";
|
|
}
|
|
}
|
|
@@ -144,10 +145,10 @@ public class NewMonitorServiceImpl implements NewMonitorService {
|
|
String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
|
|
String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
|
|
String campaignCreatTime = obj.get("campaignCreatTime") == null ? null : (String) obj.get("campaignCreatTime");
|
|
String campaignCreatTime = obj.get("campaignCreatTime") == null ? null : (String) obj.get("campaignCreatTime");
|
|
if (campaignId != null && afterTime != null) {
|
|
if (campaignId != null && afterTime != null) {
|
|
- String campaignCharge = newMonitorMapper.getCampaignChargeTouTiao(campaignId, afterTime);
|
|
|
|
|
|
+ BigDecimal campaignCharge = newMonitorMapper.getCampaignChargeTouTiao(campaignId, afterTime);
|
|
//大于500为有效广告计划
|
|
//大于500为有效广告计划
|
|
String effective = "0";
|
|
String effective = "0";
|
|
- if (campaignCharge != null && Long.parseLong(campaignCharge) > 500) {
|
|
|
|
|
|
+ if (campaignCharge != null && campaignCharge.compareTo(new BigDecimal(500)) ==1) {
|
|
//有效
|
|
//有效
|
|
effective = "1";
|
|
effective = "1";
|
|
}
|
|
}
|