Merge branch 'refs/heads/v30.6_order_quote_20241022' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -39,6 +39,7 @@ public class OrderChild implements HasKey<Integer> {
     private Integer goodsId;                        //货物id
     private String goodsName;                       //货物名称
     private BigDecimal freightPrice;                //运费单价（分）
+    private BigDecimal forecastFreightPrice;        //预估运费单价（分）
     private BigDecimal lossPrice;                   //损耗单价(分)
     private BigDecimal orderFreightPrice;           //订单运费单价（分）
 

clx-performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -171,6 +171,8 @@ public class OrderGoods implements HasKey<Integer> {
     @Schema(description="挂单运费")
     private BigDecimal pendingOrderFreight;
 
+    private BigDecimal forecastOrderFreight;        //预估运费单价（分）
+
     @TableField("user_no")
     @Schema(description="创建人用户编号")
     private Long userNo;

clx-performance-web/src/main/java/com/clx/performance/service/broker/OrderChildBrokerService.java

 package com.clx.performance.service.broker;
 
-import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriver;
@@ -10,10 +9,9 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 public interface OrderChildBrokerService {
 
     void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                        SettlementDriverDetail settlementDriverDetail, OwnerQuotationDetailVO quotationDetailVO);
+                        SettlementDriverDetail settlementDriverDetail);
     void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                        SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
-                          OwnerQuotationDetailVO quotationDetailVO);
+                        SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver);
 
     void orderChildDriverPay(SettlementDriverDetail settlementDriverDetail);
 

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

@@ -501,6 +501,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setOrderNo(orderGoods.getOrderNo());
         orderChild.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
         orderChild.setFreightPrice(orderGoods.getPendingOrderFreight());
+        orderChild.setForecastFreightPrice(orderGoods.getForecastOrderFreight());
         orderChild.setLossPrice(orderGoods.getLossPrice());
         orderChild.setOrderFreightPrice(orderInfo.getValidFreightPrice());
 

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

@@ -122,17 +122,13 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        // 获取最新订单报价数据
-        OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
-                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
         // 更新状态
         settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
         settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
         try{
             // 同步broker
-            orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail, quotationDetailVO);
+            orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
         } catch (Exception e) {
             log.info("同步无车承运失败, child:{}, msg:{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
         }
@@ -154,10 +150,6 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         SettlementDriver settlementDriver = settlementDriverDao
                 .getByChildNo(orderChild.getChildNo()).orNull();
 
-        // 获取最新订单报价数据
-        OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
-                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
         if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
             return;
         }
@@ -172,7 +164,7 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         try{
             // 更新broker
             orderChildBrokerService.orderChildUpdate(orderChild, orderGoods, settlementOwnerDetail,
-                    settlementDriverDetail, settlementDriver, quotationDetailVO);
+                    settlementDriverDetail, settlementDriver);
         } catch (Exception e) {
             log.info("更新无车承运失败, child:{}, msg:{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
         }

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

@@ -6,7 +6,6 @@ import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
-import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.PowerTypeEnum;
@@ -69,20 +68,19 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
     @Override
     public void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                               SettlementDriverDetail settlementDriverDetail, OwnerQuotationDetailVO quotationDetailVO) {
+                               SettlementDriverDetail settlementDriverDetail) {
 
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail,
-                settlementDriverDetail, null, quotationDetailVO);
+                settlementDriverDetail, null);
 
         brokerService.orderChildSync(transportParam);
     }
 
     @Override
     public void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                                 SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
-                                 OwnerQuotationDetailVO quotationDetailVO) {
+                                 SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver) {
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail,
-                settlementDriverDetail, settlementDriver, quotationDetailVO);
+                settlementDriverDetail, settlementDriver);
 
         // 运单更新
         brokerService.orderChildUpdate(transportParam);
@@ -96,8 +94,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
     }
 
     private TransportParam buildParam(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                                   SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
-                                      OwnerQuotationDetailVO quotationDetailVO){
+                                   SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver){
         String host = documentFeign.getHost().getData();
 
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
@@ -126,8 +123,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         // 与承运平台约定默认设置0字符串
         transportParam.setTransportPlatformCode(ZERO_STR);
         // 若有开票配置，且开票配置为是，则使用开票配置的平台编码
-        if (Objects.nonNull(quotationDetailVO) && Objects.nonNull(quotationDetailVO.getInvoiceConfigType())
-                && Objects.equals(quotationDetailVO.getInvoiceConfigType(), QuotationEnum.InvoicingConfigType.YES.getCode())) {
+        if (Objects.equals(settlementOwnerDetail.getInvoiceConfigType(), QuotationEnum.InvoicingConfigType.YES.getCode())) {
             InvoicingCompanyVO invoicingCompanyByGroupCode = invoicingCompanyService.getInvoicingCompanyByGroupCode(orderChild.getInvoicingCompanyGroupCode());
             transportParam.setTransportPlatformCode(invoicingCompanyByGroupCode.getNetworkCargoCompanyCode());
         }
@@ -314,9 +310,9 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setSettleStatus(settlementDriver!=null
                 && Objects.equals(settlementDriver.getStatus(), SettlementDriverEnum.Status.SETTLED.getCode())? 1 : 0);
         // 开票票配置
-        orderChildInfo.setInvoiceNeed(quotationDetailVO.getInvoiceConfigType());
+        orderChildInfo.setInvoiceNeed(settlementOwnerDetail.getInvoiceConfigType());
         // 预估运费单价
-        orderChildInfo.setPredictFreightPrice(quotationDetailVO.getForecastFreightQuotation().intValue());
+        orderChildInfo.setPredictFreightPrice(orderChild.getForecastFreightPrice().intValue());
 
         transportParam.setOrder(orderInfo);
         transportParam.setOrderChildImage(imageList);

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

@@ -1102,13 +1102,15 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         OrderGoods orderGoods = orderGoodsDao
                 .getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        // 开票服务率
+        // 开票配置
         settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
         FeignOrderVO feignOrderVO = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());
         if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
 
-            if (settlementOwnerDetail.getInvoicingCompanyId() != null) {
+            if (Objects.equals(settlementDriverDetail.getInvoiceConfigType(),
+                    InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
+
                 // 查询开票公司
                 InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
                         settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);

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

@@ -151,13 +151,25 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
+        // 开票配置
+        Integer invoiceConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
+        settlementOwnerDetail.setInvoiceConfigType(invoiceConfigType);
+
         // 开票服务率
         settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
+
+        if (orderChild.getInvoicingCompanyId() != null) {
             FeignOrderVO feignOrderVO = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());
             if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
                     InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
 
-            if (settlementOwnerDetail.getInvoicingCompanyId() != null) {
+                if (Objects.equals(settlementOwnerDetail.getInvoiceConfigType(), InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
+
+                    //设置开票公司信息
+                    settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+                    settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+                    settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+
                     // 查询开票公司
                     InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
                             settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -166,6 +178,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
                             invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
                 }
             }
+        }
 
         // 开票服务费
         settlementOwnerDetail.setInvoiceServiceFee(

clx-performance-web/src/main/java/com/clx/performance/strategy/impl/OwnGoodsOrderStrategy.java

@@ -136,6 +136,7 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             }
             orderGoods.setPendingOrderTime(postedTime);
             orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
+            orderGoods.setForecastOrderFreight(orderInfo.getValidForecastFreightQuotation());
 
             orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
             //定向运单失效时间

clx-performance-web/src/main/java/com/clx/performance/strategy/impl/PartGoodsOrderStrategy.java

@@ -137,6 +137,7 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
 
             orderGoods.setPendingOrderTime(postedTime);
             orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
+            orderGoods.setForecastOrderFreight(orderInfo.getValidForecastFreightQuotation());
 
             orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
             //定向运单失效时间

clx-performance-web/src/main/java/com/clx/performance/strategy/impl/PlatformGoodsOrderStrategy.java

@@ -134,6 +134,7 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
 
             orderGoods.setPendingOrderTime(postedTime);
             orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
+            orderGoods.setForecastOrderFreight(orderInfo.getValidForecastFreightQuotation());
 
             orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
             //定向运单失效时间