Merge remote-tracking branch 'origin/bugfix_3158' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java

@@ -168,6 +168,7 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService {
         OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
         orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh());
         OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList);
+
         log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
 
         //判断推送版本
@@ -176,6 +177,10 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService {
 
         PcfptsBO pcfpts = transPcfpts(orderInfo, ddmxxxList, orderInvoiceInfo);
         pcfpts.setCompCode(orderProcessInfo.getGsdm());
+        // 报账单号
+        pcfpts.setBzdh(orderProcessInfo.getBzdh());
+        // 报账人
+        pcfpts.setBzr(orderProcessInfo.getYgxm());
 
         content = JsonUtils.getInstance().toJsonString(pcfpts);
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/ticketpoolpush/PcfptsBO.java

@@ -157,5 +157,15 @@ public class PcfptsBO implements Serializable {
      * 发票明细数据
      */
     private List<PcfptsMxBO> detailList;
-    
+
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
+    /**
+     * 报账人
+     */
+    private String bzr;
+
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java

@@ -863,9 +863,11 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                 processInfo.setOriginOrderId(processInfo.getOrderInfoId());
                 processInfo.setKb(ddmxxx.get(0).getKB());
             }
-            for (OrderItemInfo itemInfo : insertOrderItem.get(0)) {
-                itemInfo.setPh(ddmxxx.get(0).getPH());
-                itemInfo.setKb(ddmxxx.get(0).getKB());
+            if(insertOrderItem != null && !insertOrderItem.isEmpty()){
+                for (OrderItemInfo itemInfo : insertOrderItem.get(0)) {
+                    itemInfo.setPh(ddmxxx.get(0).getPH());
+                    itemInfo.setKb(ddmxxx.get(0).getKB());
+                }
             }
             //根据配置拼接备注信息
             InvoiceRemarkSet invoiceRemarkSet = new InvoiceRemarkSet();