From a0c641a910ee44b7e7a0e53c644e50c590908b31 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 9 Oct 2019 11:00:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9][=E4=BF=AE=E5=A4=8Dbug]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillAllServiceImpl.java | 6 ++++++ .../src/main/resources/mapper/WxMerchantMapper.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index cdbde5519..5d4a898be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -335,6 +335,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime())); wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime())); + + //status不是欠缴,都展示0,与前端保持一致 + if(!EnumBillRentStatus.NOT_PAID.getCode().equals(wxBillAllVo.getStatus())){ + wxBillAllVo.setOwe(0l); + wxBillAllVo.setOweStr("0"); + } datalist.add(wxBillAllVo); } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 9e5b77b07..52403d7d3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -490,10 +490,10 @@ - and c.`nick_name` like concat('%', #{userName},'%') + and mb.`name` like concat('%', #{userName},'%') - and c.`phone` like concat('%', #{phone},'%') + and mb.`phone` like concat('%', #{phone},'%') and co.`title` like concat('%', #{couponName},'%')