From 5430d946d22a0281ad66d72828819d56a10a9d0b Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 14 Aug 2024 10:34:57 +0800 Subject: [PATCH] fix --- .../data/PrintCustomedTableDataHandler.java | 1 + .../impl/PrintFinanceReceiveDataHandler.java | 17 ++++------------- .../service/impl/WxFinancePrintServiceImpl.java | 5 +++++ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java index bcc100e45..eac2380a6 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java @@ -22,6 +22,7 @@ public class PrintCustomedTableDataHandler{ for (Iterator it = entity.keySet().iterator(); it.hasNext();) { String fieldName = it.next(); //Object o = entity.get(fieldName); + System.out.println(">>>>>>>>>>"+fieldName); if (StringUtils.isBlank(fieldName)) { }else { Object o = objectParser.getObjectValue(fieldName, object,params); diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java index 52b2d705e..6ec0f93fa 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java @@ -31,7 +31,6 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ public Object getObjectValue(String name, Object o, Object... params) { Map merchantMap = (Map) params[0]; Map feesMap = (Map) params[1]; - Map shopNumber = (Map) params[2]; WxFinanceReceive receive = (WxFinanceReceive) o; if (name.equals("id")) { return receive.getId(); @@ -72,15 +71,10 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ return receive.getMoneyDetail(); }else if (name.equals("remark")) { return receive.getRemark(); - }else if (name.equals("merchantName")) { - if (null != merchantMap) { - WxMerchant m = merchantMap.get(receive.getMerchantId()); - if (null != m) { - return m.getName(); - } + }else if (name.equals("merchantId") || name.equals("merchantName")) { + if (StringUtils.isNotBlank(receive.getMerchantName())) { + return receive.getMerchantName(); } - return ""; - }else if (name.equals("merchantId")) { if (null != merchantMap) { WxMerchant m = merchantMap.get(receive.getMerchantId()); if (null != m) { @@ -89,10 +83,7 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ } return ""; }else if (name.equals("shopNumber")) { - if (null != shopNumber) { - return shopNumber.get(receive.getMerchantId()); - } - return ""; + return receive.getShopNumber(); } 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 7866fed46..2f91f4fa5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -273,6 +273,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { WxFinanceReceiveBill rb = new WxFinanceReceiveBill(); rb.updateTenantInfo(re); rb.setReceiveId(re.getId()); + if (null != shopNumber && null != re.getMerchantId()) { + re.setShopNumber(shopNumber.get(re.getMerchantId())); + }else { + re.setShopNumber(""); + } List rbills = wxFinanceService.getReceiveBills(rb); PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printReceiveBillDataHandler, rbills,merchantMap,feesMap,shopNumber); if (null != vo) {