From 271633e7bb1bda573a259d36116a303b35a56d88 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 17 Aug 2024 11:29:10 +0800 Subject: [PATCH] fix --- .../com/iformall/domain/vo/WxMerchantBillVo.java | 5 +++++ .../data/impl/PrintMerchantSettleDataHandler.java | 4 ++++ .../service/impl/WxFinancePrintServiceImpl.java | 13 +++++++++++++ 3 files changed, 22 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index 1f96900cd..e7aa89fc5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -76,6 +76,11 @@ public class WxMerchantBillVo implements Serializable { @Excel(name = "账单最大日期",format="yyyy-MM-dd", width = 20, orderNum = "8") private Date maxDate; + @TableField(exist = false) + private String cusName; + @TableField(exist = false) + private String cusPhone; + @TableField(exist = false) private List billSumList; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java index 503a65eae..3f9860664 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java @@ -51,6 +51,10 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ } } return ""; + }else if (name.equals("cusName")) { + return receive.getCusName(); + }else if (name.equals("cusPhone")) { + return receive.getCusPhone(); } return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 4d94b5b32..e3bfb9420 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -337,6 +337,19 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setPaid(payTotal.toPlainString()); bq.setOwe(oweTotal.toPlainString()); bq.setCurrentTime(new Date()); + if (null != merchantMap && null != bq.getMerchantId()) { + WxMerchant merchant = merchantMap.get(bq.getMerchantId()); + if (null != merchant) { + bq.setCusName(merchant.getLinkPerson()); + bq.setCusPhone(merchant.getLinkPhone()); + }else { + bq.setCusName(""); + bq.setCusPhone(""); + } + }else { + bq.setCusName(""); + bq.setCusPhone(""); + } PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); if (null != vo) { voList.add(vo);