diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java index 7f174600..dee9de4f 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java @@ -395,6 +395,45 @@ public class CommonUtils { } + /** + * 发票推送-发票平台发票类型转换成山能SAP发票类型 + * @param fpzldm + * @return + */ + public static String transToSnFplxdm(String fpzldm) { + String fplxdm; + if (OrderInfoEnum.ORDER_INVOICE_TYPE_004.getKey().equals(fpzldm)) { + //增值税专用发票 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_10.getKey(); + } else if (OrderInfoEnum.ORDER_INVOICE_TYPE_007.getKey().equals(fpzldm)) { + //增值税普通发票 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_11.getKey(); + } else if (OrderInfoEnum.ORDER_INVOICE_TYPE_026.getKey().equals(fpzldm)) { + //增值税电子普通发票 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_12.getKey(); + } else if (OrderInfoEnum.ORDER_INVOICE_TYPE_005.getKey().equals(fpzldm)) { + //机动车销售统一发票 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_14.getKey(); + }else if (OrderInfoEnum.ORDER_INVOICE_TYPE_006.getKey().equals(fpzldm)) { + //二手车销售统一发票 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_15.getKey(); + }else if (OrderInfoEnum.ORDER_INVOICE_TYPE_028.getKey().equals(fpzldm)) { + //增值税电子专用发票 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_25.getKey(); + }else if (OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(fpzldm)) { + //全电专 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_26.getKey(); + }else if (OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(fpzldm)) { + //全电普 + fplxdm = OrderInfoEnum.SN_INVOICE_TYPE_27.getKey(); + }else { + fplxdm = fpzldm; + } + log.debug("{}标品开票接口发票种类转换为山能SAP发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm); + return fplxdm; + } + + /** * 获取作废标志的对应的名称 * 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 1fdaccfb..44ccbea3 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 @@ -1022,6 +1022,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { if (ConfigureConstant.STRING_000000.equals(ddfptsV5.getZTDM())) { log.debug("==>推送返回解析成功,更新数据库表开始!"); updateOrderInvoiceInfo.setPushStatus(OrderInfoEnum.PUSH_STATUS_1.getKey()); + updateOrderInvoiceInfo.setInvoicePushSbyy(""); } else { String sbyy = ddfptsV5.getZTXX(); if (StrUtil.isNotBlank(sbyy) && sbyy.length() > ConfigureConstant.INT_200) { @@ -1269,14 +1270,14 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpkjtsReqSap.setZJSDH(ddfpxx.getDDH()); fpkjtsReqSap.setZFPDM(ddfpxx.getFPDM()); fpkjtsReqSap.setZFPHM(ddfpxx.getFPHM()); - fpkjtsReqSap.setZFPLX(ddfpxx.getFPLXDM()); + fpkjtsReqSap.setZFPLX(CommonUtils.transToSnFplxdm(ddfpxx.getFPLXDM())); fpkjtsReqSap.setZXFBM(ddfpxx.getXHFSBH()); fpkjtsReqSap.setZGFBH(ddfpxx.getGMFSBH()); fpkjtsReqSap.setZBHSJEY(ddfpxx.getHJJE()); fpkjtsReqSap.setZZSEY(ddfpxx.getHJSE()); fpkjtsReqSap.setZHSJEY(ddfpxx.getJSHJ()); fpkjtsReqSap.setZZBZ(ddfpxx.getBZ()); - fpkjtsReqSap.setZFPZT(ConfigureConstant.STRING_1);//0-作废、1-正常 + fpkjtsReqSap.setZFPZT(ConfigureConstant.STRING_0);//0-正常、1-作废 fpkjtsReqSap.setZKPRQ(ddfpxx.getKPRQ()); fpkjtsReqSap.setZGFMC(ddfpxx.getGMFMC()); fpkjtsReqSap.setZGFSH(ddfpxx.getGMFSBH()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java index 4003d1a3..ef0da2b6 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java @@ -1,6 +1,7 @@ package com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.util.List; @@ -51,14 +52,17 @@ public class FpkjtsReqSap { /** * 不含税金额(SAP):金税系统开票不含税金额 */ + @JSONField(name = "ZBHSJE_Y") private String ZBHSJEY; /** * 税额(发票):金税系统开票总税额 */ + @JSONField(name = "ZZSE_Y") private String ZZSEY; /** * 含税金额(发票):金税系统开票含税总额 */ + @JSONField(name = "ZHSJE_Y") private String ZHSJEY; /** * 不含税金额(差额):"金税系统与SAP差额-不含税ZBHSJE_Y- ZBHSJE"