| @@ -110,7 +110,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| @Override | @Override | ||||
| public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { | public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { | ||||
| //更新各账单状态 | //更新各账单状态 | ||||
| updateBillStatus(record); | |||||
| //updateBillStatus(record); | |||||
| PageInfo<WxBillAllVo> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillAllMapper.list(record)); | PageInfo<WxBillAllVo> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillAllMapper.list(record)); | ||||
| Map<String, Object> result = new HashMap<>(); | Map<String, Object> result = new HashMap<>(); | ||||
| @@ -604,7 +604,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); | WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); | ||||
| wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); | wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); | ||||
| wxPayAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); | wxPayAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); | ||||
| if (wxPayAccountBill == null) { | |||||
| if (wxPayAccountBill != null) { | |||||
| result.put("accountNumber", wxPayAccountBill.getBankCardId()); | result.put("accountNumber", wxPayAccountBill.getBankCardId()); | ||||
| result.put("accountName", wxPayAccountBill.getBankAccountName()); | result.put("accountName", wxPayAccountBill.getBankAccountName()); | ||||
| } else { | } else { | ||||
| @@ -722,6 +722,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| result.put("depositDetail", " "); | result.put("depositDetail", " "); | ||||
| result.put("otherDetail", " "); | result.put("otherDetail", " "); | ||||
| result.put("linkPerson", " "); | |||||
| result.put("linkPhone", " "); | |||||
| } | } | ||||
| String createtime = DateUtils.getSystemTime("yyyy-MM-dd"); | String createtime = DateUtils.getSystemTime("yyyy-MM-dd"); | ||||