Browse Source

[营销分析][添加][卡营销列表]

release_toaliyun_real
luozukai 7 years ago
parent
commit
f9ea4813b7
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java

+ 8
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -1470,7 +1470,7 @@ public class WxChartServiceImpl implements WxChartDataService {
WxCoupon wxCoupon = new WxCoupon(); WxCoupon wxCoupon = new WxCoupon();


//默认时间本月第一天,截止到当天 //默认时间本月第一天,截止到当天
if(paramsMap.get("startdate") == null){
if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.add(Calendar.MONTH, 0); c.add(Calendar.MONTH, 0);
c.set(Calendar.DAY_OF_MONTH,1); c.set(Calendar.DAY_OF_MONTH,1);
@@ -1479,7 +1479,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Date startTime = DateUtils.stringToDate(startdate); Date startTime = DateUtils.stringToDate(startdate);
wxCoupon.setStartdate(startTime); wxCoupon.setStartdate(startTime);
} }
if(paramsMap.get("enddate") == null){
if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
}else{ }else{
Date endTime = DateUtils.stringToDate(enddate); Date endTime = DateUtils.stringToDate(enddate);
@@ -1512,7 +1512,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Map<String,Object> result = new HashedMap(); Map<String,Object> result = new HashedMap();


//默认时间本月第一天,截止到当天 //默认时间本月第一天,截止到当天
if(paramsMap.get("startdate") == null){
if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.add(Calendar.MONTH, 0); c.add(Calendar.MONTH, 0);
c.set(Calendar.DAY_OF_MONTH,1); c.set(Calendar.DAY_OF_MONTH,1);
@@ -1521,7 +1521,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Date startTime = DateUtils.stringToDate(startdate); Date startTime = DateUtils.stringToDate(startdate);
wxCoupon.setStartdate(startTime); wxCoupon.setStartdate(startTime);
} }
if(paramsMap.get("enddate") == null){
if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
}else{ }else{
Date endTime = DateUtils.stringToDate(enddate); Date endTime = DateUtils.stringToDate(enddate);
@@ -1566,7 +1566,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Map<String,Object> result = new HashedMap(); Map<String,Object> result = new HashedMap();


//默认时间本月第一天,截止到当天 //默认时间本月第一天,截止到当天
if(paramsMap.get("startdate") == null){
if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.add(Calendar.MONTH, 0); c.add(Calendar.MONTH, 0);
c.set(Calendar.DAY_OF_MONTH,1); c.set(Calendar.DAY_OF_MONTH,1);
@@ -1575,7 +1575,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Date startTime = DateUtils.stringToDate(startdate); Date startTime = DateUtils.stringToDate(startdate);
wxCoupon.setStartdate(startTime); wxCoupon.setStartdate(startTime);
} }
if(paramsMap.get("enddate") == null){
if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
}else{ }else{
Date endTime = DateUtils.stringToDate(enddate); Date endTime = DateUtils.stringToDate(enddate);
@@ -1615,7 +1615,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
Date startTime = new Date(); Date startTime = new Date();
Date endTime = startTime; Date endTime = startTime;
if (paramsMap.get("startdate") == null) {
if (paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))) {
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.add(Calendar.MONTH, 0); c.add(Calendar.MONTH, 0);
c.set(Calendar.DAY_OF_MONTH, 1); c.set(Calendar.DAY_OF_MONTH, 1);
@@ -1625,7 +1625,7 @@ public class WxChartServiceImpl implements WxChartDataService {
startTime = DateUtils.stringToDate(startdate + " 00:00:00"); startTime = DateUtils.stringToDate(startdate + " 00:00:00");
params.put("startdate", startTime); params.put("startdate", startTime);
} }
if (paramsMap.get("enddate") == null) {
if (paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))) {
params.put("enddate", endTime); params.put("enddate", endTime);
} else { } else {
endTime = DateUtils.stringToDate(enddate + " 23:59:59"); endTime = DateUtils.stringToDate(enddate + " 23:59:59");


Loading…
Cancel
Save