Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test

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

@@ -197,7 +197,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 }
             }
             if(CollectionUtils.isEmpty(cpyOrderItems)||CollectionUtils.isEmpty(nocpyOrderItems)){
-                commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems);
+                commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:cpyOrderItems);
                 commonOrderInfoList.add(commonOrderInfo);
             }else {
                 //封装成品油
@@ -1602,6 +1602,7 @@ public class InvoiceServiceImpl implements InvoiceService {
             if (buyerEntity != null) {
                 if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) {
                     log.info("开始校验客户信息完整");
+
                     if (StrUtil.isBlank(orderInfo.getGhfNsrsbh())) {
                         throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方纳税人识别号为空,请补全!");
                     }

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

@@ -269,7 +269,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId());
         if (buyerEntity == null) {
             log.error("{}查询原始订单客户信息为空，id为：{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId());
-            oderDetailInfo.setCheckBankFlag(OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey());
+            oderDetailInfo.setCheckBankFlag(OrderInfoEnum.CHECK_BANK_FLAG_NO.getKey());
         } else {
             oderDetailInfo.setCheckBankFlag(buyerEntity.getCheckBankFlag());
         }