From 2be0b0c4406c9bac086a8419e3ef532f3d0ee77a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 10 Aug 2024 00:36:22 +0800 Subject: [PATCH] fix --- .../impl/WxFinancePrintServiceImpl.java | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) 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 b2e134cb8..525ba56d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -182,6 +182,14 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { wxFinancePrintTemplateMapper.updateById(record); } + private boolean isSetDefaultValue(JSONObject component) { + boolean isSetDefaultValue = false; + String componentType = component.getString("type"); + if ("braid-html".equals(componentType)) { + isSetDefaultValue = true; + } + return isSetDefaultValue; + } @Override public List parseTemplateData(String tenantId, Long templateId, List dataIds,Object entity) { @@ -236,6 +244,8 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { JSONObject ov = items.getJSONObject(j); //是否是定制化的表格 Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); + + boolean isSetDefaultValue = isSetDefaultValue(ov); if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { //表格解析 String componentContent = ov.getString("value"); @@ -243,7 +253,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList)),JSON.parseObject(JSON.toJSONString(re)))); } }else { - ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); + if (isSetDefaultValue) { + ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); + }else { + ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); + } } } } @@ -270,11 +284,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { //是否是定制化的表格 Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); - boolean isSetDefaultValue = false; - String componentType = ov.getString("type"); - if ("braid-html".equals(componentType)) { - isSetDefaultValue = true; - } + boolean isSetDefaultValue = isSetDefaultValue(ov); if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { //表格解析 String componentContent = ov.getString("value"); @@ -283,9 +293,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { //} }else { if (isSetDefaultValue) { - ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); + ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); }else { - ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); + ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); } } @@ -308,6 +318,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { JSONObject ov = items.getJSONObject(j); //是否是定制化的表格 Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); + boolean isSetDefaultValue = isSetDefaultValue(ov); if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { //表格解析 List sumlist = new ArrayList(); @@ -346,7 +357,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(sumlist)),JSON.parseObject(JSON.toJSONString(bq)))); } }else { - ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); + if (isSetDefaultValue) { + ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); + }else { + ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); + } } }