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 4802cab89..1d9e2028b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -603,19 +603,15 @@ public class WxBillAllServiceImpl implements WxBillAllService { //付款方式 WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); - wxPayAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); - if (wxPayAccountBill != null) { - result.put("accountNumber", wxPayAccountBill.getBankCardId()); - result.put("accountName", wxPayAccountBill.getBankAccountName()); + WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); + if (payAccountBill != null) { + result.put("accountNumber", payAccountBill.getBankCardId()); + result.put("accountName", payAccountBill.getBankAccountName()); } else { result.put("accountNumber", " "); result.put("accountName", " "); } - //账单时间段 - result.put("starttime", wxBillAll.getStarttime()); - result.put("endtime", wxBillAll.getEndtime().substring(0, 10)); - //编号 String number = "JF" + DateUtils.getSystemTime("yyyyMMddHHmmss"); result.put("number", number); @@ -627,6 +623,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { statusList.add(EnumBillRentStatus.WAIT_PAY.getCode()); statusList.add(EnumBillRentStatus.NOT_EXPIRED.getCode()); wxBillAll.setStatusList(statusList); + //账单时间段 + result.put("starttime", wxBillAll.getStarttime()); + result.put("endtime", wxBillAll.getEndtime().substring(0, 10)); + } else { + result.put("starttime", " "); + result.put("endtime", " "); } Integer filterHasPay = wxBillAll.getFilterHasPay(); List list = wxBillAllMapper.list(wxBillAll); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 180887a0b..91df387e0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -85,7 +85,7 @@ rent_shop_type,'[]' shop_info from wx_bill_other union - select id,merchant_id,shop_id,tenant_id,name,8 bill_type_value,'其他押金' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, rent_shop_type,'[]' shop_info from wx_bill_other_deposit