承运优化需求9.30-解决冲突

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

@@ -37,7 +37,7 @@ public class TransportVO {
     @Schema(description = "开票状态 0 未开票 1 已开票 ", example = "1234124")
     private Integer invoiceStatus;
 
-    @ApiModelProperty(value = "第三方运单状态 20-已卸货，30-已创建支付单", example = "1234124", dataType = "String")
+    @Schema(description = "第三方运单状态 20-已卸货，30-已创建支付单", example = "1234124")
     private Integer thirdPartyChildStatus;
 
 }

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

@@ -6,10 +6,7 @@ import com.msl.common.result.Result;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 @FeignClient(name = "broker-service",configuration = PerformanceClientConfiguration.class,url = "${settlement.brokerHost}")
 public interface BrokerFeign {

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

@@ -325,55 +325,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void settlementDriverSettlement(SettlementDriverSettleMqParam mq) {
-
-        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
-                .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-        SettlementDriver settlementDriver = settlementDriverDao.findByChildNo(settlementDriverDetail.getChildNo()).orNull();
-        if (settlementDriver != null) {return;}
-
-        String settlementNo = settlementNoGenerate();
-
-        settlementDriver = new SettlementDriver();
-        settlementDriver.setDriverUserNo(settlementDriverDetail.getDriverUserNo());
-        settlementDriver.setDriverName(settlementDriverDetail.getDriverName());
-        settlementDriver.setSettlementNo(settlementNo);
-        settlementDriver.setChildNo(settlementDriverDetail.getChildNo());
-        settlementDriver.setOrderGoodsNo(settlementDriverDetail.getOrderGoodsNo());
-        settlementDriver.setOrderNo(settlementDriverDetail.getOrderNo());
-        settlementDriver.setGoodsId(settlementDriverDetail.getGoodsId());
-        settlementDriver.setGoodsName(settlementDriverDetail.getGoodsName());
-        settlementDriver.setTruckNo(settlementDriverDetail.getTruckNo());
-        settlementDriver.setFreightPrice(settlementDriverDetail.getFreightPrice());
-        settlementDriver.setWeight(settlementDriverDetail.getWeight());
-        settlementDriver.setFreight(settlementDriverDetail.getFreight());
-        settlementDriver.setLossPrice(settlementDriverDetail.getLossPrice());
-        settlementDriver.setLossWeight(settlementDriverDetail.getLossWeight());
-        settlementDriver.setLoanFlag(settlementDriverDetail.getLoanFlag());
-        settlementDriver.setLossFreight(settlementDriverDetail.getLossFreight());
-        settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
-        settlementDriver.setSettlementFreight(settlementDriverDetail.getSettlementFreight());
-        settlementDriver.setInvoiceType(settlementDriverDetail.getInvoiceType());
-        settlementDriver.setSettlementPlatform(settlementDriverDetail.getInvoiceType() == 1 ?
-                String.valueOf(SettlementPlatformEnum.Platform.WY.getCode()):
-                String.valueOf(SettlementPlatformEnum.Platform.MSL.getCode()));
-
-        settlementDriver.setStatus(SettlementDriverEnum.Status.DRIVER_UNCONFIRMED.getCode());
-
-        settlementDriver.setInvoicingCompanyId(settlementDriverDetail.getInvoicingCompanyId());
-        settlementDriver.setInvoicingCompanyShorterName(settlementDriverDetail.getInvoicingCompanyShorterName());
-        settlementDriver.setInvoicingCompanyGroupCode(settlementDriverDetail.getInvoicingCompanyGroupCode());
-        settlementDriver.setPlatformServiceFeeRate(settlementDriverDetail.getPlatformServiceFeeRate());
-        settlementDriver.setPlatformServiceFee(settlementDriverDetail.getPlatformServiceFee());
-
-        settlementDriverDao.saveEntity(settlementDriver);
-
-        settlementPostService.driverSettle(settlementDriverDetail.getChildNo());
-    }
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void settle(SettlementSettleMqParam mq) {

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

@@ -11,8 +11,6 @@ public interface SettlementMqHandlerService {
     void settlementStatistics(SettlementStatisticsMqParam mq);
     void settlementDriverSettlement(SettlementDriverSettleMqParam mq);
 
-    void settlementDriverSettlement(SettlementDriverSettleMqParam mq);
-
     void settle(SettlementSettleMqParam mq);
 
     void invoiceTypeSync(SettlementInvoiceTypeSyncMqParam mq);