From b13560f6ca51eec214ecd37c13ea08261fbb00ea Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 17:16:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderPressServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 977326510..91e49488d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -91,7 +91,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { orderPressQ.setUserId(cUserId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(orderPressQ); - int count = wxOrderPressMapper.selectCount(new QueryWrapper(queryWrapper)); + int count = wxOrderPressMapper.selectCount(queryWrapper); if(count >= 1) { logger.error("用户已参与砍价: " + cUserId); throw new MallinkException(ErrorCode.COUPON_PRESS_IS_EXIST); From 57e6f38a5d75823c8645954bea50f23fbe8c900c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 17:55:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=A7=A3=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 8 ++ .../service/WxMerchantTradeDailyService.java | 3 + .../impl/WxMerchantTradeDailyServiceImpl.java | 87 +++++++++++-------- 3 files changed, 60 insertions(+), 38 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 34b74d97e..28077203a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -52,6 +52,14 @@ public class WxMerchantTradeDailyController extends BaseController { return new ResultData(page); } + @ApiOperation("数据汇总") + @GetMapping("/summary") + @SystemControllerLog(description = "商户解单-数据汇总") + public ResultData summary(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) { + logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::summary"); + return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); + } + @ApiOperation("获商户得近30日解单") @GetMapping("/detail") @SystemControllerLog(description = "商户-获商户得近30日解单detail") diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 13a66235b..3f812b3b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -88,4 +88,7 @@ public interface WxMerchantTradeDailyService { ResultData queryTradeDaily(WxMerchantTradeDaily wxMerchantTradeDaily); void exportData(WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response); + + ResultData summary(WxMerchantTradeDaily wxMerchantTradeDaily); + } 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 da6b48867..803e6da56 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -29,14 +29,14 @@ import java.util.stream.Collectors; @Service public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired + + @Autowired WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; - @Autowired + @Autowired WxMerchantBUserService wxMerchantBUserService; - @Autowired + @Autowired WxMerchantService wxMerchantService; @Autowired @@ -64,7 +64,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); + record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); wxMerchantTradeDailyMapper.insert(record); @@ -84,16 +84,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ WxMerchantBUser user = wxMerchantBUserService.getById(userId); - if (user==null) + if (user == null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) + if (merchant == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); - if (mall==null) + if (mall == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -101,15 +101,15 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setMerchantId(merchant.getId()); - SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); - if (tradeList.size() > 0 ) { + if (tradeList.size() > 0) { wxMerchantTradeDaily = tradeList.get(0); - wxMerchantTradeDaily.setTradeAmt(volume+""); + wxMerchantTradeDaily.setTradeAmt(volume + ""); wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDailyMapper.updateById(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily); @@ -120,7 +120,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); wxMerchantTradeDaily.setMerchantId(merchant.getId()); wxMerchantTradeDaily.setbUserId(userId); - wxMerchantTradeDaily.setTradeAmt(volume+""); + wxMerchantTradeDaily.setTradeAmt(volume + ""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); @@ -147,7 +147,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ if (tradeList.size() > 0) { wxMerchantTradeDaily = tradeList.get(0); wxMerchantTradeDaily.setUpdateDate(new Date()); - wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+""); + wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt() + ""); wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount()); wxMerchantTradeDaily.setProof(tradeDaily.getProof()); wxMerchantTradeDailyMapper.updateById(wxMerchantTradeDaily); @@ -158,7 +158,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setId(idWorker.nextId()); wxMerchantTradeDaily.setTenantId(tradeDaily.getTenantId()); wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); - wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+""); + wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt() + ""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount()); @@ -183,20 +183,31 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ //没有商户ID导出全部数据 List list = wxMerchantTradeDailyMapper.findVoList(tradeDaily); - list.stream().forEach(m->{ + list.stream().forEach(m -> { //商铺信息 m.setShopVos(wxShopMapper.findShopVoList(m.getMerchantId())); }); //商铺信息 - excelService.exportExcel(list, "商户解单数据", "商户解单数据", WxMerchantTradeDailyVo.class, "商户解单数据.xlsx", response, false); + excelService.exportExcel(list, "商户解单数据", "商户解单数据", WxMerchantTradeDailyVo.class, "商户解单数据.xlsx", response, false); + } + + @Override + public ResultData summary(WxMerchantTradeDaily record) { + List voList = wxMerchantTradeDailyMapper.findVoList(record); + Integer tradeAmt = voList.stream().collect(Collectors.summingInt(WxMerchantTradeDailyVo::getTradeAmt)); + Integer tradeCount = voList.stream().collect(Collectors.summingInt(WxMerchantTradeDailyVo::getTradeCount)); + Map data = new HashMap<>(); + data.put("tradeAmt", tradeAmt); + data.put("tradeCount", tradeCount); + return new ResultData(data); } @Override public ResultData getVolumeOfMonth(Long merchantId) { WxMerchant merchant = wxMerchantService.getById(merchantId); - if (merchant==null) + if (merchant == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.setMerchantId(merchantId); @@ -205,7 +216,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setStartTime(startTime); wxMerchantTradeDaily.setEndTime(endTime); List recordList = wxMerchantTradeDailyMapper.findVoList(wxMerchantTradeDaily); - Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDailyVo::getReportDate, r -> r)); + Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDailyVo::getReportDate, r -> r)); List tradeList = new ArrayList<>(); Calendar cal = Calendar.getInstance(); @@ -215,14 +226,14 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ cal.setTime(new Date()); cal.add(Calendar.DAY_OF_YEAR, -i); WxMerchantTradeDailyVo trade = recordMap.get(fmt.format(cal.getTime())); - if (trade != null){ + 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(); + } else { + trade = new WxMerchantTradeDailyVo(); trade.setTradeAmt(0); trade.setReportDate(fmtv.format(cal.getTime())); tradeList.add(trade); @@ -241,7 +252,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(tenantId); List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); - Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); + Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); List tradeList = new ArrayList<>(); Calendar cal = Calendar.getInstance(); @@ -252,11 +263,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ cal.add(Calendar.DAY_OF_MONTH, -i); System.out.println(fmt.format(cal.getTime())); WxMerchantTradeDaily trade = recordMap.get(fmt.format(cal.getTime())); - if (trade != null){ + if (trade != null) { trade.setReportDate(fmtv.format(cal.getTime())); tradeList.add(trade); - }else { - trade = new WxMerchantTradeDaily(); + } else { + trade = new WxMerchantTradeDaily(); trade.setTradeAmt("0"); trade.setReportDate(fmtv.format(cal.getTime())); tradeList.add(trade); @@ -269,30 +280,30 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } @Override - public ResultData getVolume(WxMerchantTradeDaily merchantTradeDaily,Long userId) { + public ResultData getVolume(WxMerchantTradeDaily merchantTradeDaily, Long userId) { WxMerchantBUser user = wxMerchantBUserService.getById(userId); - if (user==null) + if (user == null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) + if (merchant == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); - if (mall==null) + if (mall == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.setMerchantId(merchant.getId()); - if(merchantTradeDaily.getReportDate() != null){ + if (merchantTradeDaily.getReportDate() != null) { wxMerchantTradeDaily.setReportDate(merchantTradeDaily.getReportDate()); - }else { - SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); + } else { + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); } List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); - if (tradeList.size() > 0 ) { + if (tradeList.size() > 0) { wxMerchantTradeDaily = tradeList.get(0); return new ResultData(wxMerchantTradeDaily); } @@ -306,16 +317,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ WxMerchantBUser user = wxMerchantBUserService.getById(userId); - if (user==null) + if (user == null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) + if (merchant == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); - if (mall==null) + if (mall == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); @@ -323,11 +334,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setMerchantId(merchant.getId()); - SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); return new ResultData(wxMerchantTradeDailyMapper.findListOfWeek(wxMerchantTradeDaily)); } - + } From f91b80304d39e4b71afc82ff0d049d06e30e3eaa Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 18:07:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][B=E7=AB=AF=E6=A0=87=E7=AD=BE=E5=88=A4?= =?UTF-8?q?=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCreditHistoryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 4b0fbb936..af4ad3bb8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -122,7 +122,7 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setBuserId(getBuser().getId()); WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); //更新标签 - if (!wxCreditHistory.getTags().isEmpty()) { + if (wxCreditHistory.getTags() != null && !wxCreditHistory.getTags().isEmpty()) { wxCUserTagsService.updateTagByUserId(wxCreditHistory.getCUserId(), wxCreditHistory.getTags()); } return new ResultData(Result.SUCCESS, "操作成功", credit);