开票配置为是--货主结算-开票公司为null处理

clx-performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -291,9 +291,13 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         settlementDriver.setStatus(SettlementDriverEnum.Status.DRIVER_UNCONFIRMED.getCode());
 
-        settlementDriver.setInvoicingCompanyId(settlementDriverDetail.getInvoicingCompanyId());
-        settlementDriver.setInvoicingCompanyShorterName(settlementDriverDetail.getInvoicingCompanyShorterName());
-        settlementDriver.setInvoicingCompanyGroupCode(settlementDriverDetail.getInvoicingCompanyGroupCode());
+        // 订单报价需求-开票配置为否，对应开票公司信息赋值为null
+        settlementDriver.setInvoicingCompanyId(null != settlementDriverDetail.getInvoicingCompanyId()
+                ? settlementDriverDetail.getInvoicingCompanyId() : null);
+        settlementDriver.setInvoicingCompanyShorterName(null != settlementDriverDetail.getInvoicingCompanyShorterName()
+                ? settlementDriverDetail.getInvoicingCompanyShorterName() : null);
+        settlementDriver.setInvoicingCompanyGroupCode(null != settlementDriverDetail.getInvoicingCompanyGroupCode()
+                ? settlementDriverDetail.getInvoicingCompanyGroupCode() : null);
         settlementDriver.setPlatformServiceFeeRate(settlementDriverDetail.getPlatformServiceFeeRate());
         settlementDriver.setPlatformServiceFee(settlementDriverDetail.getPlatformServiceFee());
 
@@ -871,9 +875,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setCompanyContactAddress(ownerInfo.getContactsAddress());
         settlementOwner.setSettlementWay(settlementOwnerDetail.getSettlementWay());
         //设置开票公司
-        settlementOwner.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
-        settlementOwner.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
-        settlementOwner.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
+        settlementOwner.setInvoicingCompanyId(null != settlementOwnerDetail.getInvoicingCompanyId()
+                ? settlementOwnerDetail.getInvoicingCompanyId() : null);
+        settlementOwner.setInvoicingCompanyShorterName(null != settlementOwnerDetail.getInvoicingCompanyShorterName()
+                ? settlementOwnerDetail.getInvoicingCompanyShorterName()  : null);
+        settlementOwner.setInvoicingCompanyGroupCode(null != settlementOwnerDetail.getInvoicingCompanyGroupCode()
+                ? settlementOwnerDetail.getInvoicingCompanyGroupCode() : null);
         settlementOwner.setReportFlag(orderInfo.getReportFlag());
         // 开票服务费
         settlementOwner.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee());