From 11d05c3e80bf3826b3e979b7a6a9f2c9eaad0b80 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 20 Dec 2018 17:25:45 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E6=94=B6?= =?UTF-8?q?=E9=93=B6=E8=AE=B0=E5=BD=95=E5=95=86=E6=88=B7=E5=90=8D=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantMicroPayController.java | 5 +++-- .../java/com/iformall/domain/dto/WxOrderReportDto.java | 9 +++++++++ .../service/impl/MarkingDataReportServiceImpl.java | 4 ++++ .../src/main/resources/mapper/WxOrderMapper.xml | 3 +++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java index ffec4e8f3..5bd35d38e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java @@ -52,9 +52,10 @@ public class WxMerchantMicroPayController extends BaseController { @ApiOperation("获得昨日刷卡列表") @GetMapping("/listYesterday") - public ResultData listYesterday(Integer pageNum, Integer pageSize) { + public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); - WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); + if (wxOrderReportDto == null) + wxOrderReportDto = new WxOrderReportDto(); wxOrderReportDto.setTenantId(getTenantId()); final PageInfo page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index 99c89f6e0..72384278f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -8,6 +8,7 @@ import java.util.Date; public class WxOrderReportDto { private String tenantId; private Long merchantId; + private String merchantName; private Date startTime; private Date endTime; private Integer type; @@ -28,6 +29,14 @@ public class WxOrderReportDto { this.merchantId = merchantId; } + public String getMerchantName() { + return merchantName; + } + + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } + public Integer getType() { return type; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 5222734b2..798dbafa6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.enums.EnumOrderType; import com.iformall.mapper.*; import com.iformall.service.MarkingDataReportService; import com.iformall.utils.DateUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -502,6 +503,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { public PageInfo listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageIndex, Integer pageSize) { HashMap params = new HashMap<>(); + if (!StringUtils.isEmpty(wxOrderReportDto.getMerchantName())) + params.put("merchantName",wxOrderReportDto.getMerchantName()); + if (wxOrderReportDto.getStartTime() != null) { params.put("startTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); } else { diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 0e11d120e..f435368fd 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -380,6 +380,9 @@ group by m.id,xTime) mo on mo.mid = wm.id where wm.status = 1 + + and wm.name like concat('%', #{merchantName},'%') + order by wm.create_date desc