重新拉取 v26.2-jdk17springboot3-20240912_release 分支 ，排除notice分支，merge master

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

@@ -21,7 +21,7 @@ public class OpenOrderChildDTO {
     private String sourceOrderNo;
     @Schema(description = "源结算单编号", example = "1234", required = true)
     private String sourceSettlementNo;
-    @ApiModelProperty(value = "订单来源", example = "1234", required = true, dataType = "String")
+    @Schema(description = "订单来源", example = "1234")
     private Integer orderSource;
 
     @Schema(description = "运费单价（分/吨）", example = "162", required = true)
@@ -38,7 +38,7 @@ public class OpenOrderChildDTO {
     private Integer lossFee;
     @Schema(description = "货损单价（分/吨）",  example = "123")
     private Integer lossFeePrice;
-    @ApiModelProperty(value = "管理费（分）",  example = "123", dataType = "Integer")
+    @Schema(description = "管理费（分）",  example = "123")
     private Integer invoiceServiceFee;
 
     @Schema(description = "发货皮重（吨）")
@@ -65,7 +65,7 @@ public class OpenOrderChildDTO {
     private BigDecimal receiveRough;
     @Schema(description = "收货净重（吨）")
     private BigDecimal receiveNet;
-    @ApiModelProperty(value = "实收净重（吨）")
+    @Schema(description = "实收净重（吨）")
     private BigDecimal realNet;
 
     @Schema(description = "备注", example = "", required = true)

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

 package com.clx.performance.vo.pc.broker;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Getter
 @Setter
@@ -14,11 +14,11 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 public class TransportPayConfirmParam {
 
-    @ApiModelProperty(value = "用户编号", required = true)
+    @Schema(description = "用户编号", required = true)
     @NotNull(message = "用户编号不能为空")
     private String userCode;
 
-    @ApiModelProperty(value = "运单编号", required = true)
+    @Schema(description = "运单编号", required = true)
     @NotNull(message = "运单编号不能为空")
     String orderCode;
 

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -212,17 +212,9 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     void batchUpdateCancel(List<OrderChild> canCancelOrderChildList);
 
-<<<<<<< HEAD
-    int countTakeByOrderGoodsNo(String orderGoodsNo);
-    int countLoadByOrderGoodsNo(String orderGoodsNo);
-
-    List<OrderChild> findListByChildNoList(List<String> childNoList);
-
-=======
     List<OrderChild> findListByChildNoList(List<String> childNoList);
 
 
     int countTakeByOrderGoodsNo(String orderGoodsNo);
     int countLoadByOrderGoodsNo(String orderGoodsNo);
->>>>>>> master
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -704,9 +704,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         baseMapper.batchUpdateCancel(canCancelOrderChildList);
     }
 
-<<<<<<< HEAD
-=======
-
     @Override
     public List<OrderChild> findListByChildNoList(List<String> childNoList) {
         return list(lQrWrapper()
@@ -715,7 +712,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
 
->>>>>>> master
     @Override
     public int countTakeByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.countTakeByOrderGoodsNo(orderGoodsNo);
@@ -725,16 +721,4 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public int countLoadByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.countLoadByOrderGoodsNo(orderGoodsNo);
     }
-<<<<<<< HEAD
-
-
-    @Override
-    public List<OrderChild> findListByChildNoList(List<String> childNoList) {
-        return list(lQrWrapper()
-                .in(OrderChild :: getChildNo, childNoList)
-        );
-    }
-
-=======
->>>>>>> master
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java

@@ -45,10 +45,7 @@ public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper,
                 .set(SettlementDriver::getInvoicingCompanyId, item.getInvoicingCompanyId())
                 .set(SettlementDriver::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
                 .set(SettlementDriver::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
-<<<<<<< HEAD
-=======
                 .set(SettlementDriver::getPrepayFreightFlag, item.getPrepayFreightFlag())
->>>>>>> master
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java

@@ -20,15 +20,9 @@ public interface SettlementDriverDao extends BaseDao<SettlementDriverMapper, Set
     boolean updatePayStatus(SettlementDriver item);
 
 
-<<<<<<< HEAD
-    boolean updateInvoiceCompany(SettlementDriver item);
-
-    boolean updateSettleStatus(SettlementDriver item);
-=======
     boolean updateSettleStatus(SettlementDriver item);
 
     boolean updateInvoiceCompany(SettlementDriver item);
->>>>>>> master
 
     Optional<SettlementDriver> findBySettlementNo(String settlementNo);
 

performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java

@@ -32,7 +32,7 @@ public interface BrokerFeign {
     /**
      *  司机支付
      */
-    @RequestMapping(value = "/broker-service/open/transport/payConfirm", method = RequestMethod.POST)
+    @PostMapping("/broker-service/open/transport/payConfirm")
     Result<Object> payConfirm(@RequestBody TransportPayConfirmParam param);
 
 }

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

@@ -122,7 +122,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;

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

@@ -19,13 +19,8 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.broker.OrderChildBrokerMqHandlerService;
 import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.broker.OrderChildBrokerService;
-<<<<<<< HEAD
-import com.clx.performance.service.settle.SettlementPostService;
-import com.clx.performance.vo.mq.broker.BrokerOrderChildDriverPayMqParam;
-=======
 import com.clx.performance.vo.mq.broker.BrokerOrderChildDriverPayMqParam;
 import com.clx.performance.service.settle.SettlementPostService;
->>>>>>> master
 import com.clx.performance.vo.mq.broker.BrokerOrderChildSyncMqParam;
 import com.clx.performance.vo.mq.broker.BrokerOrderChildUpdateMqParam;
 import lombok.extern.slf4j.Slf4j;

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

@@ -253,14 +253,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Transactional(rollbackFor = Exception.class)
     public void settlementDriverSettlement(SettlementDriverSettleMqParam mq) {
 
-<<<<<<< HEAD
-        OrderChild orderChild = orderChildDao
-                .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        OrderGoods orderGoods = orderGoodsDao
-                .getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-=======
->>>>>>> master
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
@@ -293,11 +285,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 String.valueOf(SettlementPlatformEnum.Platform.WY.getCode()):
                 String.valueOf(SettlementPlatformEnum.Platform.MSL.getCode()));
 
-<<<<<<< HEAD
-        settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
-=======
         settlementDriver.setStatus(SettlementDriverEnum.Status.DRIVER_UNCONFIRMED.getCode());
->>>>>>> master
 
         settlementDriver.setInvoicingCompanyId(settlementDriverDetail.getInvoicingCompanyId());
         settlementDriver.setInvoicingCompanyShorterName(settlementDriverDetail.getInvoicingCompanyShorterName());
@@ -310,29 +298,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriverDetail.setSettlementNo(settlementDriver.getSettlementNo());
         settlementDriverDetailDao.updateSettlementNo(settlementDriverDetail);
 
-<<<<<<< HEAD
-        //车主结算单自动支付
-        log.info(" 运单号 {}, 是否是普通单 {} ",settlementDriverDetail.getChildNo(),settlementDriverDetail.getInvoiceType());
-        if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
-            paySettlementDriver(settlementDriverDetail);
-        } else {
-            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
-                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
-                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
-                settlementDriverDetail.setSettlementNo(settlementNo);
-                //插入同步网络货运待支付记录
-                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-            }
-            else if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
-                    && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
-                settlementDriverDetail.setSettlementNo(settlementNo);
-                //插入同步网络货运待支付记录
-                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-            }
-
-        }
-=======
->>>>>>> master
     }
 
     @Transactional(rollbackFor = Exception.class)

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URL;

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

@@ -15,13 +15,7 @@ public interface SettlementPostService {
 
     void updateInvoice(List<String> childNoList);
 
-<<<<<<< HEAD
-    void riskAdd(Integer id);
-
-    void driverSettle(String childNo);
-=======
     void driverSettle(String childNo);
     void riskAdd(Integer id);
 
->>>>>>> master
 }