From f2b7faee3eb8ebf5c191dfcf0e5e86590af3f11e Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 14 May 2019 10:56:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E5=8D=95][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=A7=A3=E5=8D=95api]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 31 ++++++++++--------- .../WxMerchantTradeDailyController.java | 7 +++-- 2 files changed, 22 insertions(+), 16 deletions(-) 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 c057216ac..6acd3d655 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -138,26 +138,29 @@ public class WxMerchantTradeDailyController extends BaseController { }) public ResultData list(WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum,Integer pageSize) throws Exception{ //根据userid查询merchantId - WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); - if (user==null) - return new ResultData(ErrorCode.USER_IS_EMPTY); - WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) - return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); - wxMerchantTradeDaily.setMerchantId(merchant.getId()); +// WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); +// if (user==null) +// return new ResultData(ErrorCode.USER_IS_EMPTY); +// WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); +// if (merchant==null) +// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); +// 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 = wxMerchantTradeDaily.getMonth()+"-01"; - String endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); + String startTime; + String endTime; //month为空默认本月第一天到今天 if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ startTime = sd.format(DateUtils.getFirstDayForCurrMonth()); 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()); @@ -179,11 +182,11 @@ public class WxMerchantTradeDailyController extends BaseController { } } -// pageInfo.setList(resultList); -// for (WxMerchantTradeDaily w:resultList) { -// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); -// System.out.println("---------"); -// } + pageInfo.setList(resultList); + for (WxMerchantTradeDaily w:resultList) { + System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); + System.out.println("---------"); + } return new ResultData(pageInfo); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 25df0d61c..14338dd10 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -113,13 +113,16 @@ public class WxMerchantTradeDailyController extends BaseController { SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdMonth = new SimpleDateFormat("yyyy-MM"); - String startTime = wxMerchantTradeDaily.getMonth()+"-01"; - String endTime = sd.format(DateUtils.getLastDayForMonth(sd.parse(startTime))); + String startTime; + String endTime; //month为空默认本月第一天到今天 if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ startTime = sd.format(DateUtils.getFirstDayForCurrMonth()); 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());