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},'%')