diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index bbeaac13..ce4f54cc 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -532,27 +532,31 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { DxhyInterfaceResponse dxhyInterfaceResponse = JsonUtils.getInstance().parseObject(result, DxhyInterfaceResponse.class); if (OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(fpTsMqData.getPushType())) { //TODO 山能易行回传流水号重置 - if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ + if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)||OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(xtly)) { PoCommonResponseParam poCommonResponseParam = JsonUtils.getInstance().parseObject(result, PoCommonResponseParam.class); EsOutput es_output = poCommonResponseParam.getES_OUTPUT(); String sapkey = es_output.getSAPKEY(); String ztype = es_output.getZTYPE(); String zmessage = es_output.getZMESSAGE(); List resultList = new ArrayList<>(); - DdfptsV5 ddfptsV5 = new DdfptsV5(); - ddfptsV5.setDDQQLSH(fpTsMqData.getFpTsMqData().getFpqqlsh()); - ddfptsV5.setNSRSBH(""); - if(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey().equals(ztype)){ - ddfptsV5.setZTDM(ConfigureConstant.STRING_000000); - }else { - ddfptsV5.setZTDM(ConfigureConstant.STRING_9999); + String[] split = fpTsMqData.getFpTsMqData().getPushBackLsh().split(","); + for (String fpqqlsh : split) { + DdfptsV5 ddfptsV5 = new DdfptsV5(); + ddfptsV5.setDDQQLSH(fpqqlsh); + ddfptsV5.setNSRSBH(""); + if (OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey().equals(ztype)) { + ddfptsV5.setZTDM(ConfigureConstant.STRING_000000); + } else { + ddfptsV5.setZTDM(ConfigureConstant.STRING_9999); + } + ddfptsV5.setZTXX(zmessage); + resultList.add(ddfptsV5); } - ddfptsV5.setZTXX(zmessage); dxhyInterfaceResponse.setReturnCode(ConfigureConstant.STRING_000000); dxhyInterfaceResponse.setReturnMessage("处理成功"); dxhyInterfaceResponse.setEncryptCode(ConfigurerInfo.ENCRYPTCODE_0); dxhyInterfaceResponse.setZipCode(ConfigurerInfo.ENCRYPTCODE_0); - resultList.add(ddfptsV5); + dxhyInterfaceResponse.setContent(Base64Encoding.encode(JsonUtils.getInstance().toJsonString(resultList))); }else{ dxhyInterfaceResponse = JsonUtils.getInstance().parseObject(result, DxhyInterfaceResponse.class); @@ -1404,13 +1408,6 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { return content; } - public static void main(String[] args) { - try { - System.out.println(MD5.getMd5Encode("e4b0190b2fadc0adbe54471ffd79a729")); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - } public String convertToYwxtParam(CommonTsMqData fpTsMqData,String content){ String ywxtParam = "";