Merge remote-tracking branch 'origin/v18.8_online_bug_20240704' into release

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -145,6 +145,10 @@ public interface PerformanceFeign {
      */
     @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
     Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
+
+    @PostMapping(value = {"clx-performance/feign/orderGoods/saveBindTruck"})
+    Result<Object> saveBindTruck(@RequestBody @Validated DistributionTruckParam param);
+
     /**
      * 取消货单
      * @param param
@@ -153,4 +157,15 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/orderGoods/cancelOrderGoods"})
     Result<BigDecimal> cancelOrderGoods(@RequestBody @Validated CancelOrderGoodsParam param);
 
+    /**
+     * 更新挂单运费
+     */
+    @PostMapping(value = {"clx-performance/feign/orderGoods/updatePendingOrderFright"})
+    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight);
+
+    /**
+     * 获取平台服务费配置
+     */
+    @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
+    Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
 }

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -166,4 +166,5 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("接单保证金 平台服务费费率 弹窗和文案显示 0 不显示  1 显示")
     private Integer goodsOrderDetailShow =  0;
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -111,8 +111,9 @@ public class OrderChildLoanComponent {
         OwnerQuotationDetailVO quotationDetailVO = orderFeign.getQuotationByOrderNo(orderInfoVO.getOrderNo()).getData();
         BigDecimal freightFreezeRate = quotationDetailVO.getFreightFreezeRate();
 
-        if (freightFreezeRate.compareTo(new BigDecimal(100)) == 0) {
-            //百分百预付不需要考虑借款账户
+        if (freightFreezeRate.compareTo(new BigDecimal(100)) == 0
+                || !Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),QuotationEnum.PlatformFreightQuotationTaxType.YES.getCode())) {
+            //百分百预付不需要考虑借款账户或者平台运费报价税类型为未税
             log.info("2.百分百预付不需要考虑借款账户");
             return;
         }

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -30,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 货单最晚接单时间、最晚到达货源地时间处理
@@ -121,6 +118,9 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     continue;
                 }
                 OrderGoods orderGoods = optional.get();
+//                if(Objects.equals(orderGoods.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+//                    continue;
+//                }
 
                 if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0) {
                     List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildByOrderGoodsNo(orderGoodsNo);

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -106,5 +106,7 @@ public interface OrderGoodsService {
 
     void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
 
+
+    void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
     BigDecimal cancelOrderGoods(CancelOrderGoodsParam param);
 }