新增结算单接口

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageOwnerSettlementParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @ClassName PageOwnerSettlementParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/17 15:46
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class PageOwnerSettlementParam extends PageParam {
+
+    @ApiModelProperty(value = "结算单编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -17,7 +17,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class CarrierPageSettlementDriverVO {
-
+    @ApiModelProperty(value = "结算单Id")
+    private Integer id;
     @ApiModelProperty(value = "运单编号")
     private String childNo;
     @ApiModelProperty(value = "货单编号")

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -17,7 +17,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class CarrierPageSettlementOwnerVO {
-
+    @ApiModelProperty(value = "结算单Id")
+    private Integer id;
     @ApiModelProperty(value = "结算单号")
     private String settlementNo;
     @ApiModelProperty(value = "开票标识：1网运单 2普通单")

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/OwnerPageSettlementOwnerVO.java

+package com.clx.performance.vo.pc.owner.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName CarrierPageSettlementOwnerDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/16 15:01
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class OwnerPageSettlementOwnerVO {
+    @ApiModelProperty(value = "结算单Id")
+    private Integer id;
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;
+    @ApiModelProperty(value = "货主姓名")
+    private String ownerName;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+    @ApiModelProperty(value = "状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:平台确认货主付款 60:待平台付款 70:货主确认平台付款 80:待邮寄发票 90:已完结")
+    private Integer status;
+}

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

@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.OwnerConfirmSettlementParam;
 import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+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.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
-import com.clx.user.param.pc.driver.truck.PageDriverTruckParam;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
@@ -17,7 +18,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -96,5 +96,14 @@ public class OwnerSettlementOwnerController {
         return null;
     }
 
+    @ApiOperation(value = "结算单列表")
+    @PostMapping("/pageSettlementOwner")
+    public Result<PageData<OwnerPageSettlementOwnerVO>> pageSettlementOwner(@RequestBody @Validated PageOwnerSettlementParam param){
+        IPage<OwnerPageSettlementOwnerVO> page = settlementOwnerService.pageSettlementOwner(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+
 
 }

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

@@ -8,6 +8,7 @@ import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.mapper.settle.SettlementOwnerMapper;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -69,4 +70,17 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
 
     }
+
+    @Override
+    public IPage<SettlementOwner> pageSettlementOwner(PageOwnerSettlementParam param) {
+        LambdaQueryWrapper<SettlementOwner> query = new LambdaQueryWrapper<>();
+        if(Objects.nonNull(param.getOrderNo())){
+            query.eq(SettlementOwner :: getOrderNo,param.getOrderNo());
+        }
+        if(StringUtils.isNotBlank(param.getSettlementNo())){
+            query.eq(SettlementOwner :: getSettlementNo,param.getSettlementNo());
+        }
+        query.orderByDesc(SettlementOwner :: getCreateTime);
+        return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementOwnerMapper;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.msl.common.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,6 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
     boolean updatePayment(SettlementOwner settlementOwner);
 
     IPage<SettlementOwner> pageCarrierSettlementOwner(PageCarrierSettlementOwnerParam param);
+
+    IPage<SettlementOwner> pageSettlementOwner(PageOwnerSettlementParam param);
 }

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

@@ -14,8 +14,6 @@ import com.clx.performance.utils.excel.ExcelSheet;
 import com.clx.performance.utils.excel.ExcelUtil;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
-import com.clx.user.enums.driver.DriverTruckEnum;
-import com.clx.user.vo.pc.driver.truck.DriverTruckVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;

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

@@ -14,12 +14,14 @@ import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementPlatformAccount;
 import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.struct.settle.SettlementLogStruct;
 import com.clx.performance.struct.settle.SettlementOwnerStruct;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.carrier.settle.SettlementLogVO;
+import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.user.data.UserSessionData;
@@ -145,10 +147,19 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     @Override
     public IPage<CarrierPageSettlementOwnerVO> pageCarrierSettlementOwner(PageCarrierSettlementOwnerParam param) {
         IPage<SettlementOwner> page =  settlementOwnerDao.pageCarrierSettlementOwner(param);
-        List<CarrierPageSettlementOwnerVO> list = settlementOwnerStruct.convertList(
+        List<CarrierPageSettlementOwnerVO> list = settlementOwnerStruct.convertCarrierList(
                 page.getRecords());
         IPage<CarrierPageSettlementOwnerVO> result = new Page().setRecords(list).setTotal(page.getTotal()).setPages(
                 page.getPages());
         return result;
     }
+
+    @Override
+    public IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param) {
+        IPage<SettlementOwner> page = settlementOwnerDao.pageSettlementOwner(param);
+        List<OwnerPageSettlementOwnerVO> list = settlementOwnerStruct.convertOwnerList(page.getRecords());
+        IPage<OwnerPageSettlementOwnerVO> result = new Page().setRecords(list).setTotal(page.getTotal()).setPages(
+                page.getPages());
+        return result;
+    }
 }

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

@@ -4,9 +4,10 @@ package com.clx.performance.service.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
-import com.clx.user.param.pc.driver.truck.PageDriverTruckParam;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
 /**

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

@@ -3,8 +3,10 @@ package com.clx.performance.service.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 
 /**
@@ -25,4 +27,6 @@ public interface SettlementOwnerService {
     void updatePaymentConfirmSettlement(Integer id);
 
     IPage<CarrierPageSettlementOwnerVO> pageCarrierSettlementOwner(PageCarrierSettlementOwnerParam param);
+
+    IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param);
 }

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

@@ -5,6 +5,7 @@ import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.carrier.settle.SettlementMergeVO;
+import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;
@@ -26,8 +27,9 @@ public interface SettlementOwnerStruct {
 
     List<SettlementMergeVO> convertToMergeList(List<SettlementOwner> settlementOwners);
 
-    List<CarrierPageSettlementOwnerVO> convertList(List<SettlementOwner> settlementOwners);
+    List<CarrierPageSettlementOwnerVO> convertCarrierList(List<SettlementOwner> settlementOwners);
 
+    List<OwnerPageSettlementOwnerVO> convertOwnerList(List<SettlementOwner> settlementOwners);
 
 
 }
\ No newline at end of file