Merge branch 'dev-snyx' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

order-management-common/src/main/java/com/dxhy/order/model/queue/ZfTsMqData.java

@@ -32,4 +32,8 @@ public class ZfTsMqData implements Serializable {
      */
     private String fphm;
 
+    private String xtly;
+
+    private String bzdh;
+
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -14,6 +14,7 @@ import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackS
 import com.dxhy.order.constant.*;
 import com.dxhy.order.consumer.config.OpenApiConfig;
 import com.dxhy.order.consumer.dao.GsClientMapper;
+import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
 import com.dxhy.order.consumer.dao.PushInfoRecordMapper;
 import com.dxhy.order.consumer.model.PushInfoRecord;
 import com.dxhy.order.consumer.model.protocol.CommonResponse;
@@ -38,6 +39,7 @@ import com.dxhy.order.consumer.openapi.protocol.po.EsOutput;
 import com.dxhy.order.consumer.openapi.protocol.po.IsInput;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam;
+import com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap.FpkjReqSap;
 import com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap.FpkjtsMxSap;
 import com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap.FpkjtsReqSap;
 import com.dxhy.order.consumer.openapi.protocol.po.voidinvoicepush.sap.FpzftsReqSap;
@@ -170,6 +172,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
     @Resource
     private BaseServiceConfig baseServiceConfig;
 
+    @Resource
+    private InterfaceRequestDataMapper interfaceRequestDataMapper;
+
     @Resource
     private PushInfoRecordMapper pushInfoRecordMapper;
 
@@ -253,6 +258,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), null);
             commonTsMqData.setNsrsbh(orderInvoiceInfo.getXhfNsrsbh());
             if(StrUtil.isNotBlank(orderProcessInfo.getBzdh())){
+                zfTsMqData.setXtly(orderProcessInfo.getXtly());
+                zfTsMqData.setBzdh(orderProcessInfo.getBzdh());
                 commonPush(commonTsMqData);
             }else {
                 log.error("{},{}{}发票作废推送失败,没有报账单号",LOGGER_MSG,orderInvoiceInfo.getFpdm(),orderInvoiceInfo.getFphm());
@@ -1558,6 +1565,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             fpzftsReqSap.setZFPZT(ConfigureConstant.STRING_1);
             if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())){
                 fpzftsReqSap.setZJSDH(orderProcessInfo.getOriginDdh());
+            }else if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
+                fpzftsReqSap.setZJSDH(orderProcessInfo.getDdh());
             }else {
                 fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh());
             }
@@ -1965,6 +1974,18 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 zffptsV5.setFPHM(invalidInvoiceInfo.getFphm());
                 zffptsV5.setZFLX(invalidInvoiceInfo.getZflx());
                 zffptsV5.setZFYY(invalidInvoiceInfo.getZfyy());
+                if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(zfTsMqData.getXtly())){
+                    try {
+                        InterfaceRequestData interfaceRequestData = interfaceRequestDataMapper.selectByBatchId(zfTsMqData.getBzdh(), "GenerateQdInvoice");
+                        String requestData = interfaceRequestData.getRequestData();
+                        PoCommonRequestParam poCommonRequestParam = JsonUtils.getInstance().parseObject(requestData, PoCommonRequestParam.class);
+                        String zdata = poCommonRequestParam.getIS_INPUT().getZDATA();
+                        FpkjReqSap req = JsonUtils.getInstance().parseObject(zdata, FpkjReqSap.class);
+                        zffptsV5.setDDH(StringUtils.isBlank(req.getZJSDH())?"":req.getZJSDH());
+                    } catch (Exception e) {
+                        log.error("商旅匹配结算单号{}",e.getMessage());
+                    }
+                }
                 if (OrderInfoEnum.INVALID_INVOICE_1.getKey().equals(invalidInvoiceInfo.getZfBz())) {
                     zffptsV5.setZTDM(InterfaceEnum.INTERFACE_V5_REQ_CHECK_STATUS_050000.getKey());
                     zffptsV5.setZTXX(InterfaceEnum.INTERFACE_V5_REQ_CHECK_STATUS_050000.getMessage());

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/invalid/ZffptsV5.java

@@ -43,4 +43,9 @@ public class ZffptsV5 extends ResponseV4BO implements Serializable {
      * 作废原因
      */
     private String ZFYY;
+
+    /**
+     * 结算单号
+     */
+    private String DDH;
 }