修改合并明细接口，使用原有详情接口的VO进行装载

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerSettlementOwnerController.java

@@ -8,7 +8,6 @@ import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
-import com.clx.performance.vo.pc.carrier.settle.SettlementMergeDetailVO;
 import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
@@ -17,7 +16,6 @@ import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -28,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @Slf4j
 @RestController
@@ -106,12 +103,5 @@ public class OwnerSettlementOwnerController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
-    @ApiOperation(value = "结算单合并明细",notes = "<br>By:刘海泉")
-    @GetMapping("/settlementMergeDetail")
-    public Result<List<SettlementMergeDetailVO>> settlementMergeDetail(@ApiParam("结算单号") @NotNull(message = "结算单号不能为空") String settlementNo) {
-        List<SettlementMergeDetailVO> list  = settlementOwnerService.settlementMergeDetail(settlementNo);
-        return Result.ok(list);
-    }
-
 
 }

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

@@ -573,10 +573,4 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         //更新货主运单计费明细
         settlementOwnerDetailDao.updateSettlementMerge(settlementNo,settlementNos);
     }
-
-    @Override
-    public List<SettlementMergeDetailVO> settlementMergeDetail(String settlementNo) {
-        List<SettlementOwner> list  = settlementOwnerDao.listByField(SettlementOwner :: getSettlementSubNo,settlementNo);
-        return settlementOwnerStruct.convertToMergeDetailVOList(list);
-    }
 }

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

@@ -7,8 +7,6 @@ import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
-import java.util.List;
-
 /**
  * @author liruixin
  * Date 2023-10-12
@@ -56,5 +54,4 @@ public interface SettlementOwnerService {
 
     void mergeOwnerSettlement(MergeOwnerSettlementParam param);
 
-    List<SettlementMergeDetailVO> settlementMergeDetail(String settlementNo);
 }

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementOwnerStruct.java

@@ -23,6 +23,8 @@ public interface SettlementOwnerStruct {
     CarrierSettlementOwnerDetailVO convertToDetail(SettlementOwner settlementOwner);
 
 
+    @Mapping(target = "settlementNo", source = "settlementSubNo")
+    @Mapping(target = "settlementSubNo", source = "settlementNo")
     List<SettlementMergeVO> convertToMergeList(List<SettlementOwner> settlementOwners);
 
     List<CarrierPageSettlementOwnerVO> convertCarrierList(List<SettlementOwner> settlementOwners);
@@ -37,9 +39,7 @@ public interface SettlementOwnerStruct {
 
     CarrierSettlementOwnerExpressVO convertToExpress(SettlementOwner settlementOwner);
 
-    @Mapping(target = "settlementNo", source = "settlementSubNo")
-    @Mapping(target = "settlementSubNo", source = "settlementNo")
-    List<SettlementMergeDetailVO> convertToMergeDetailVOList(List<SettlementOwner> list);
+