diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 7d6a097b0..30db65686 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -116,42 +116,42 @@ public class WxMerchantTradeDailyController extends BaseController { // wxMerchantTradeDaily.setMerchantId(merchant.getId()); PageInfo pageInfo = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum,pageSize); - List tradeDailyList = pageInfo.getList(); - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - SimpleDateFormat sdMonth = new SimpleDateFormat("yyyy-MM"); - - String startTime; - String endTime; - //month为空取查询区间开始时间 结束时间 - if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ - startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate()); - endTime = sd.format(new Date()); - }else { - startTime = wxMerchantTradeDaily.getMonth()+"-01"; - endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); - - //如果是本月,截止到当天 - if (sdMonth.format(new Date()).equals(wxMerchantTradeDaily.getMonth())) { - endTime = sd.format(new Date()); - } - } - List days = DateUtils.getTjTimeList(startTime, endTime,"0"); - - Map resultMap = getMap(days); - - for (WxMerchantTradeDaily wx:tradeDailyList) { - resultMap.put(sd.format(wx.getCreateDate()),wx); - } +// List tradeDailyList = pageInfo.getList(); +// SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); +// SimpleDateFormat sdMonth = new SimpleDateFormat("yyyy-MM"); +// +// String startTime; +// String endTime; +// //month为空取查询区间开始时间 结束时间 +// if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ +// startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate()); +// endTime = sd.format(new Date()); +// }else { +// startTime = wxMerchantTradeDaily.getMonth()+"-01"; +// endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); +// +// //如果是本月,截止到当天 +// if (sdMonth.format(new Date()).equals(wxMerchantTradeDaily.getMonth())) { +// endTime = sd.format(new Date()); +// } +// } +// List days = DateUtils.getTjTimeList(startTime, endTime,"0"); +// +// Map resultMap = getMap(days); +// +// for (WxMerchantTradeDaily wx:tradeDailyList) { +// resultMap.put(sd.format(wx.getCreateDate()),wx); +// } - List resultList = mapToList(resultMap); - //判断第1条是否是当天 - if(CollectionUtils.isNotEmpty(resultList)){ - if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){ - resultList.get(0).setIsToday(1); - } - } +// List resultList = mapToList(resultMap); +// //判断第1条是否是当天 +// if(CollectionUtils.isNotEmpty(resultList)){ +// if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){ +// resultList.get(0).setIsToday(1); +// } +// } - pageInfo.setList(resultList); +// pageInfo.setList(resultList); // for (WxMerchantTradeDaily w:resultList) { // System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index cb0a9f63e..63095b48a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -112,66 +112,7 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily.setMerchantId(merchant.getId()); PageInfo pageInfo = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum,pageSize); - List tradeDailyList = pageInfo.getList(); - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - SimpleDateFormat sdMonth = new SimpleDateFormat("yyyy-MM"); - - String startTime; - String endTime; - //month为空取查询区间开始时间 结束时间 - if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ - startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate()); - endTime = sd.format(new Date()); - }else { - startTime = wxMerchantTradeDaily.getMonth()+"-01"; - endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); - - //如果是本月,截止到当天 - if (sdMonth.format(new Date()).equals(wxMerchantTradeDaily.getMonth())) { - endTime = sd.format(new Date()); - } - } - List days = DateUtils.getTjTimeList(startTime, endTime,"0"); - - Map resultMap = getMap(days); - - for (WxMerchantTradeDaily wx:tradeDailyList) { - resultMap.put(sd.format(wx.getCreateDate()),wx); - } - - List resultList = mapToList(resultMap); - //判断第1条是否是当天 - if(CollectionUtils.isNotEmpty(resultList)){ - if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){ - resultList.get(0).setIsToday(1); - } - } - pageInfo.setList(resultList); - -// for (WxMerchantTradeDaily w:resultList) { -// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); -// System.out.println("---------"); -// } return new ResultData(pageInfo); } - public List mapToList(Map map){ - List result = new ArrayList<>(); - for (String k:map.keySet()) { - result.add(map.get(k)); - } - return result; - } - - public Map getMap(List days) throws Exception{ - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - Map map = new LinkedMap(); - for (int i = days.size()-1; i >=0 ; i--) { - WxMerchantTradeDaily w = new WxMerchantTradeDaily(); - w.setCreateDate(sd.parse(days.get(i))); - map.put(days.get(i),w); - } - return map; - } - }