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 30db65686..e47ae5c0d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -117,7 +117,7 @@ public class WxMerchantTradeDailyController extends BaseController { PageInfo pageInfo = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum,pageSize); // List tradeDailyList = pageInfo.getList(); -// SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat sdMonth = new SimpleDateFormat("yyyy-MM"); // // String startTime; @@ -153,10 +153,22 @@ public class WxMerchantTradeDailyController extends BaseController { // pageInfo.setList(resultList); -// for (WxMerchantTradeDaily w:resultList) { -// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); -// System.out.println("---------"); -// } + // 判断第1条是否是当天 + List resultList = pageInfo.getList(); + if(CollectionUtils.isNotEmpty(resultList)){ + if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){ + resultList.get(0).setIsToday(1); + }else{ + WxMerchantTradeDaily wx = new WxMerchantTradeDaily(); + wx.setIsToday(1); + wx.setCreateDate(new Date()); + resultList.add(0,wx); + } + } + 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 63095b48a..ed08a40c9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -86,6 +86,15 @@ public class WxMerchantTradeDailyController extends BaseController { if(wxMerchantTradeDaily.getTradeAmt()!= null){ wxMerchantTradeDaily.setTradeAmt(wxMerchantTradeDaily.getTradeAmt()*100); } + + 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()); + wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); return new ResultData(); } @@ -102,6 +111,8 @@ public class WxMerchantTradeDailyController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true) }) public ResultData list(WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum,Integer pageSize) throws Exception{ + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + //根据userid查询merchantId WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); if (user==null) @@ -112,6 +123,25 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily.setMerchantId(merchant.getId()); PageInfo pageInfo = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum,pageSize); + + List resultList = pageInfo.getList(); + // 判断第1条是否是当天 + if(CollectionUtils.isNotEmpty(resultList)){ + if(sd.format(resultList.get(0).getCreateDate()).equals(sd.format(new Date()))){ + resultList.get(0).setIsToday(1); + }else{ + WxMerchantTradeDaily wx = new WxMerchantTradeDaily(); + wx.setIsToday(1); + wx.setCreateDate(new Date()); + resultList.add(0,wx); + } + }else{ + WxMerchantTradeDaily wx = new WxMerchantTradeDaily(); + wx.setIsToday(1); + wx.setCreateDate(new Date()); + resultList.add(0,wx); + } + pageInfo.setList(resultList); return new ResultData(pageInfo); }