Merge branch 'refs/heads/v26.2-jdk17springboot3-20240912' into test_jdk17

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadAndUnloadAgainParam.java

@@ -22,11 +22,9 @@ public class OrderChildLoadAndUnloadAgainParam extends PositionParam {
     private String childNo;
 
     @Schema(description = "装货毛重（单位吨）", example = "2.46")
-    @NotNull
     private BigDecimal loadRough;
 
     @Schema(description = "装货皮重（单位吨）", example = "1.23")
-    @NotNull
     private BigDecimal loadTare;
 
     @Schema(description = "装货净重（单位吨）", example = "1.23")

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java

@@ -21,11 +21,9 @@ public class OrderChildLoadParam extends PositionParam {
     private String childNo;
 
     @Schema(description = "装货毛重（单位吨）", example = "2.46")
-    @NotNull
     private BigDecimal loadRough;
 
     @Schema(description = "装货皮重（单位吨）", example = "1.23")
-    @NotNull
     private BigDecimal loadTare;
 
     @Schema(description = "装货净重（单位吨）", example = "1.23")

performance-api/src/main/java/com/clx/performance/vo/mq/SettlementDriverSettleMqParam.java → performance-api/src/main/java/com/clx/performance/vo/mq/settle/SettlementDriverSettleMqParam.java

-package com.clx.performance.vo.mq;
+package com.clx.performance.vo.mq.settle;
 
 import lombok.*;
 

performance-web/src/main/java/com/clx/performance/listener/settle/SettlementDriverSettlementListener.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.clx.performance.common.MqWrapper;
 import com.clx.performance.constant.RabbitKeySettlementConstants;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
-import com.clx.performance.vo.mq.SettlementDriverSettleMqParam;
+import com.clx.performance.vo.mq.settle.SettlementDriverSettleMqParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;

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

@@ -276,6 +276,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void settlementDriverSettlement(SettlementDriverSettleMqParam mq) {
 
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao