From bc50c623156ca680f72d1e4c92fa155c5ddd3f06 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 8 Nov 2018 11:45:52 +0800 Subject: [PATCH] =?UTF-8?q?[M=E7=AB=AF][=E6=96=B0=E5=A2=9E]:=E6=9C=88?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=E6=97=A5=E6=80=BB=E9=87=91=E9=A2=9D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 6 ++++ .../mapper/WxMerchantTradeDailyMapper.java | 1 + .../service/WxMerchantTradeDailyService.java | 9 +++-- .../impl/WxMerchantTradeDailyServiceImpl.java | 35 +++++++++++++++++++ .../mapper/WxMerchantTradeDailyMapper.xml | 21 ++++++++++- 5 files changed, 68 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 976f38eb1..629ab6605 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -50,5 +50,11 @@ public class WxMerchantTradeDailyController extends BaseController { return wxMerchantTradeDailyService.getVolumeOfMonth(merchantId); } + @ApiOperation("获得昨日解单列表") + @GetMapping("/listMonth") + public ResultData listMonth() { + return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantId()); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java index c5f67215d..f1ec40aa7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java @@ -15,4 +15,5 @@ public interface WxMerchantTradeDailyMapper extends CommonMapper findListVoOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily); + List findTotalListOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 00840e790..9cc09fc36 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -68,13 +68,16 @@ public interface WxMerchantTradeDailyService { */ ResultData getVolumeOfMonth(Long merchantId); - + /** + * 获取近30日解单数据(总额) ADMIN 端 + */ + ResultData getVolumeTotalOfMonth(String tenantId); /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 2c1f5bc14..b610befca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -146,6 +146,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ WxMerchantTradeDailyVo trade = recordMap.get(fmt.format(cal.getTime())); if (trade != null){ trade.setReportDate(fmtv.format(cal.getTime())); + trade.setTenantId(null); + trade.setMerchantId(null); + trade.setMerchantName(null); tradeList.add(trade); }else { trade = new WxMerchantTradeDailyVo(); @@ -158,6 +161,38 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return new ResultData(tradeList); } + @Override + public ResultData getVolumeTotalOfMonth(String tenantId) { + + + WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + wxMerchantTradeDaily.setTenantId(tenantId); + + List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); + Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); + + List tradeList = new ArrayList<>(); + Calendar cal = Calendar.getInstance(); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat fmtv = new SimpleDateFormat("MM/dd"); + cal.setTime(new Date()); + for (int i = 0; i < 30; i++) { + cal.add(Calendar.DAY_OF_YEAR, -1); + WxMerchantTradeDaily trade = recordMap.get(fmt.format(cal.getTime())); + if (trade != null){ + trade.setReportDate(fmtv.format(cal.getTime())); + tradeList.add(trade); + }else { + trade = new WxMerchantTradeDaily(); + trade.setTradeAmt(0); + trade.setReportDate(fmtv.format(cal.getTime())); + tradeList.add(trade); + } + } + + return new ResultData(tradeList); + } + @Override public ResultData getVolume(Long userId) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 473622515..fdc2b959b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -151,6 +151,25 @@ order by mtd.create_date desc LIMIT 30 - + + + + + + + +