|
|
|
@@ -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<WxBillAllVo> list = wxBillAllMapper.list(wxBillAll); |
|
|
|
|