Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

@@ -93,7 +93,7 @@ public class OrderChild implements HasKey<Integer> {
 
     private Integer settlementAccountPeriod;                 //结算账期  1拉运完成结  2月结
 
-    private Integer settlementWay;                          //结算方式  1装车净重
+    private Integer settlementWay;                          //结算方式  1装车净重 2卸车净重 3卸车净重（减货损）
     private Integer invoicingCompanyId;  //开票公司id
     private String invoicingCompanyShorterName; //开票公司简称
     private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.InvoicingCompanyEnum;
 import com.clx.order.enums.OrderEnum;
+import com.clx.order.enums.QuotationEnum;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
@@ -467,10 +468,14 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
         orderChild.setReportFlag(orderInfo.getReportFlag());
 
-        // 平台服务费
-        orderChild.setPlatformServiceFeeRate(orderGoods.getPlatformServiceFeeRate());
-        orderChild.setPlatformServiceFee(orderGoods.getDeposit());
-        orderChild.setDeposit(orderGoods.getDeposit());
+        // 平台服务费 (订单运费报价为“未税”订单结算方式为“卸车净重（减货损）)
+        if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
+                QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
+                && Objects.equals(orderChild.getSettleTime(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+            orderChild.setPlatformServiceFeeRate(orderGoods.getPlatformServiceFeeRate());
+            orderChild.setPlatformServiceFee(orderGoods.getDeposit());
+            orderChild.setDeposit(orderGoods.getDeposit());
+        }
 
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, orderChild);

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

@@ -323,25 +323,30 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         OrderChild orderChild = orderChildDao.getByChildNo(settlementDriverDetail.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        SettlementPlatformServiceFee settlementPlatformServiceFee = new SettlementPlatformServiceFee();
-        settlementPlatformServiceFee.setChildNo(settlementDriverDetail.getChildNo());
-        settlementPlatformServiceFee.setDriverUserNo(settlementDriverDetail.getDriverUserNo());
-        settlementPlatformServiceFee.setDriverName(settlementDriverDetail.getDriverName());
-        settlementPlatformServiceFee.setDriverMobile(orderChild.getDriverMobile());
-        settlementPlatformServiceFee.setSendAddressId(orderChild.getSendAddressId());
-        settlementPlatformServiceFee.setSendAddress(orderChild.getSendAddress());
-        settlementPlatformServiceFee.setReceiveAddressId(orderChild.getReceiveAddressId());
-        settlementPlatformServiceFee.setReceiveAddress(orderChild.getReceiveAddress());
-        settlementPlatformServiceFee.setTruckNo(orderChild.getTruckNo());
-        settlementPlatformServiceFee.setSettlementFreight(settlementDriverDetail.getSettlementFreight());
-        settlementPlatformServiceFee.setInvoiceServiceFeeRate(settlementDriverDetail.getPlatformServiceFeeRate());
-        settlementPlatformServiceFee.setInvoiceServiceFee(settlementDriverDetail.getPlatformServiceFee());
-
-        // 平台服务费
-        orderChild.setPlatformServiceFee(settlementDriverDetail.getPlatformServiceFee());
+        SettlementPlatformServiceFee settlementPlatformServiceFee = null;
+        if (settlementDriverDetail.getPlatformServiceFee().compareTo(BigDecimal.ZERO) > 0) {
+            settlementPlatformServiceFee = new SettlementPlatformServiceFee();
+            settlementPlatformServiceFee.setChildNo(settlementDriverDetail.getChildNo());
+            settlementPlatformServiceFee.setDriverUserNo(settlementDriverDetail.getDriverUserNo());
+            settlementPlatformServiceFee.setDriverName(settlementDriverDetail.getDriverName());
+            settlementPlatformServiceFee.setDriverMobile(orderChild.getDriverMobile());
+            settlementPlatformServiceFee.setSendAddressId(orderChild.getSendAddressId());
+            settlementPlatformServiceFee.setSendAddress(orderChild.getSendAddress());
+            settlementPlatformServiceFee.setReceiveAddressId(orderChild.getReceiveAddressId());
+            settlementPlatformServiceFee.setReceiveAddress(orderChild.getReceiveAddress());
+            settlementPlatformServiceFee.setTruckNo(orderChild.getTruckNo());
+            settlementPlatformServiceFee.setSettlementFreight(settlementDriverDetail.getSettlementFreight());
+            settlementPlatformServiceFee.setInvoiceServiceFeeRate(settlementDriverDetail.getPlatformServiceFeeRate());
+            settlementPlatformServiceFee.setInvoiceServiceFee(settlementDriverDetail.getPlatformServiceFee());
+
+            // 平台服务费
+            orderChild.setPlatformServiceFee(settlementDriverDetail.getPlatformServiceFee());
+        }
 
         orderChildDao.updatePlatformServiceFee(orderChild);
-        settlementPlatformServiceFeeDao.saveEntity(settlementPlatformServiceFee);
+        if (settlementPlatformServiceFee != null) {
+            settlementPlatformServiceFeeDao.saveEntity(settlementPlatformServiceFee);
+        }
         log.info("更新网络标识 {} ",orderChild.getChildNo());
         // 更新网络标识
         settlementService.updateSettlementDetailInvoiceType(settlementOwnerDetail.getChildNo(), SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());