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

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -223,23 +223,7 @@ public class OrderChildSyncTransportListener {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
-            // 如果开票标识为“普通单”时，开票费率从开票公司“五寨华祥”中获取
-            InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
-                    settlementConfig.getOrdinaryInvoiceCompanyGroupCode());
-            //设置开票公司信息
-            settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
-            settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
-            settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
-
-            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
-            if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
-                settlementOwnerDetail.setInvoiceServiceFeeRate(
-                        invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
-            }
 
-            settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
-            settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
-            settlementDriverDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
         } else {
             if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());

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

@@ -3235,6 +3235,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         for (OrderChild child : orderChildList) {
             String childNo = child.getChildNo();
             String truckNo = child.getTruckNo();
+            Long driverUserNo = child.getDriverUserNo();
             //解除监装限制的不进行处理
             if (Objects.equals(child.getRemoveLoadLimitStatus(), OrderChildEnum.RemoveLoadLimitStatus.REMOVED.getCode())) {
                 log.info("运单:{},卡车:{} 已解除监装限制", childNo, truckNo);
@@ -3247,6 +3248,12 @@ public class OrderChildServiceImpl implements OrderChildService {
             if (Objects.nonNull(truckTraceDTO)) {
                 truckLongitudeX = truckTraceDTO.getLocation()[0];
                 truckLatitudeY = truckTraceDTO.getLocation()[1];
+            } else {
+                BigDecimal[] location = truckTraceService.getCurrentPosition(truckNo, driverUserNo);
+                if (location != null && location.length > 2) {
+                    truckLongitudeX = location[0];
+                    truckLatitudeY = location[1];
+                }
             }
             //判断卡车是否出了货源地x公里范围
             String orderGoodsNo = child.getOrderGoodsNo();

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

@@ -56,6 +56,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.clx.performance.enums.PerformanceResultEnum.DATA_NOT_FIND;
@@ -169,6 +170,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         return settlementOwnerDetail.getId();
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateInvoiceCompany(CarrierSettlementOwnerDetailCompanyUpdateParam param) {