diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/IsInput.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/IsInput.java index 0a5bdb1c..e5608d81 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/IsInput.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/IsInput.java @@ -2,6 +2,8 @@ package com.dxhy.order.consumer.openapi.protocol.po; import lombok.Data; +import java.util.Map; + /** * @Description: PO输入参数 * @Author liufeilong @@ -52,6 +54,6 @@ public class IsInput { /** * 业务参数 */ - private Object ZDATA; + private Map ZDATA; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/PoCommonResponseParam.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/PoCommonResponseParam.java index 9ac87b40..c0eb7509 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/PoCommonResponseParam.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/PoCommonResponseParam.java @@ -12,5 +12,5 @@ public class PoCommonResponseParam { /** * ES_OUTPUT */ - private EsOutput ESOUTPUT; + private EsOutput ES_OUTPUT; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java index 2be894ee..3c75b87d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java @@ -3,6 +3,8 @@ package com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap; import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; import lombok.Data; +import java.util.List; + /** * @Description: SAP发票开具请求实体 * @Author liufeilong @@ -85,7 +87,7 @@ public class FpkjReqSap { /** * 行项目结构 */ - private FpkjMxSap ITITEM; + private List ITITEM; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 6e767119..b5b7260a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson.JSONObject; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxCommonBO; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbReqBO; @@ -48,6 +49,7 @@ import com.dxhy.order.model.sk.query.ResponseCommonInvoice; import com.dxhy.order.model.sk.sld.SearchSld; import com.dxhy.order.utils.CommonUtils; import com.dxhy.order.utils.DecimalCalculateUtil; +import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -3212,7 +3214,9 @@ public class BeanTransitionUtils { if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(requestParam.getISINPUT().getSYSID())){ IsInput isinput = requestParam.getISINPUT(); - FpkjReqSap req = (FpkjReqSap)isinput.getZDATA(); + Map zdata = isinput.getZDATA(); + String zdataString = JsonUtils.getInstance().toJsonString(zdata); + FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class); ddpcxxBO.setDDQQPCH(isinput.getSAPKEY()); //TODO lfl 20230206 业务数据待转换 } @@ -3242,7 +3246,7 @@ public class BeanTransitionUtils { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); } esOutput.setZMESSAGE(ddpcxxRspV5.getZTXX()); - poCommonResponseParam.setESOUTPUT(esOutput); + poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam; }