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 72069aad3..4802cab89 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -110,7 +110,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { //更新各账单状态 - updateBillStatus(record); + //updateBillStatus(record); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillAllMapper.list(record)); Map result = new HashMap<>(); @@ -604,7 +604,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); wxPayAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); - if (wxPayAccountBill == null) { + if (wxPayAccountBill != null) { result.put("accountNumber", wxPayAccountBill.getBankCardId()); result.put("accountName", wxPayAccountBill.getBankAccountName()); } else { @@ -722,6 +722,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { result.put("depositDetail", " "); result.put("otherDetail", " "); + + result.put("linkPerson", " "); + result.put("linkPhone", " "); } String createtime = DateUtils.getSystemTime("yyyy-MM-dd"); diff --git a/mallinkService/src/main/resources/contract-word-template/bill_owe.docx b/mallinkService/src/main/resources/contract-word-template/bill_owe.docx index 4b6ae276a..4b49166fd 100644 Binary files a/mallinkService/src/main/resources/contract-word-template/bill_owe.docx and b/mallinkService/src/main/resources/contract-word-template/bill_owe.docx differ