增加车主结算单列表

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementDriverDetailParam.java → performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverDetailParam.java

-package com.clx.performance.param.pc.owner;
+package com.clx.performance.param.pc.driver;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverParam.java

+package com.clx.performance.param.pc.driver;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCarrierSettlementDriverParam extends PageParam {
+
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+    @ApiModelProperty(value="货单编号",example = "201457878")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="车主编码",example = "201457878")
+    private Long driverUserNo;
+
+
+
+
+
+
+}

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

+package com.clx.performance.vo.pc.carrier.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 CarrierPageSettlementDriverVO {
+
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;
+    @ApiModelProperty(value = "货单编号")
+    private String orderGoodsNo;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "车主编码")
+    private Long driverUserNo;
+    @ApiModelProperty(value = "司机名称")
+    private String driverName;
+    @ApiModelProperty(value = "货物id")
+    private Integer goodsId;
+    @ApiModelProperty(value = "货物名称")
+    private String goodsName;
+    @ApiModelProperty(value = "车牌号")
+    private String truckNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;                      
+    @MoneyOutConvert
+    @ApiModelProperty(value = "运费单价")
+    private BigDecimal freightPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损单价")
+    private BigDecimal lossPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementDriverController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
+import com.clx.performance.service.settle.SettlementDriverService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementDriver")
+@Validated
+@Api(tags = "承运端-结算管理-车主结算单")
+@AllArgsConstructor
+public class CarrierSettlementDriverController {
+
+    private final SettlementDriverService settlementDriverService;
+
+
+    @ApiOperation(value = "车主结算单列表",notes = "<br>By:刘海泉")
+    @GetMapping("/pageCarrierSettlementDriver")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementDriverVO>> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param) {
+        IPage<CarrierPageSettlementDriverVO> page  = settlementDriverService.pageCarrierSettlementDriver(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementDriverDetailController.java

 package com.clx.performance.controller.pc.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
 import com.msl.common.base.PageData;

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

@@ -35,4 +35,8 @@ public class CarrierSettlementOwnerController {
     }
 
 
+
+
+
+
 }

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

 package com.clx.performance.dao.impl.settle;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.mapper.settle.SettlementDriverMapper;
 import com.clx.performance.model.settle.SettlementDriver;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.util.Objects;
+
 /**
  * @Author: aiqinguo
  * @Description: 车主结算单
@@ -16,4 +23,24 @@ import org.springframework.stereotype.Repository;
 public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper, SettlementDriver, Integer> implements SettlementDriverDao {
 
 
+
+    @Override
+    public IPage<SettlementDriver> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param) {
+        LambdaQueryWrapper<SettlementDriver> query = new LambdaQueryWrapper<>();
+
+        if(StringUtils.isNotBlank(param.getChildNo())){
+            query.eq(SettlementDriver :: getChildNo,param.getChildNo());
+        }
+        if(StringUtils.isNotBlank(param.getOrderGoodsNo())){
+            query.eq(SettlementDriver :: getOrderGoodsNo,param.getOrderGoodsNo());
+        }
+        if(StringUtils.isNotBlank(param.getOrderNo())){
+            query.eq(SettlementDriver :: getOrderNo,param.getOrderNo());
+        }
+        if(Objects.nonNull(param.getDriverUserNo())){
+            query.eq(SettlementDriver :: getOrderNo,param.getOrderNo());
+        }
+        query.orderByDesc(SettlementDriver :: getCreateTime);
+        return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
+    }
 }

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
 import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;

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

 package com.clx.performance.dao.impl.settle;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.mapper.settle.SettlementOwnerMapper;
+import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementOwner;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-
+import java.util.Objects;
 
 /**
  * @Author: aiqinguo
@@ -47,4 +53,6 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
                 .set(SettlementOwner::getPaymentBankName, settlementOwner.getPaymentBankName())
         );
     }
+
+
 }

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

 package com.clx.performance.dao.settle;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementDriverMapper;
 import com.clx.performance.model.settle.SettlementDriver;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -11,5 +13,5 @@ import com.msl.common.dao.BaseDao;
  * @Version: 1.0
  */
 public interface SettlementDriverDao extends BaseDao<SettlementDriverMapper, SettlementDriver, Integer> {
-
+    IPage<SettlementDriver> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param);
 }

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

@@ -3,7 +3,7 @@ package com.clx.performance.dao.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
 import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.msl.common.dao.BaseDao;
 
 /**

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;

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

 package com.clx.performance.service.impl.settle;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.SettlementDriverDao;
+import com.clx.performance.model.settle.SettlementDriver;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
 import com.clx.performance.service.settle.SettlementDriverService;
+import com.clx.performance.struct.settle.SettlementDriverStruct;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2023-10-12
  * Time 09:43
  */
 @Service
+@AllArgsConstructor
 public class SettlementDriverServiceImpl implements SettlementDriverService {
+
+
+    SettlementDriverDao settlementDriverDao;
+    SettlementDriverStruct settlementDriverStruct;
+
+
+    @Override
+    public IPage<CarrierPageSettlementDriverVO> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param) {
+        IPage<SettlementDriver> page = settlementDriverDao.pageCarrierSettlementDriver(param);
+        List<CarrierPageSettlementDriverVO> list = settlementDriverStruct.covertList(
+                page.getRecords());
+        IPage<CarrierPageSettlementDriverVO> result = new Page().setRecords(list).setTotal(page.getTotal()).setPages(page.getPages());
+        return result;
+    }
 }

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

 package com.clx.performance.service.impl.settle;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OwnerBindCardRecordDao;
 import com.clx.performance.dao.settle.SettlementLogDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
@@ -7,13 +8,16 @@ import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.model.OwnerBindCardRecord;
+import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementPlatformAccount;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
 import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
 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.CarrierPageSettlementDriverVO;
 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.SettlementPlatformAccountVO;
@@ -137,4 +141,6 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         settlementOwnerDao.updateStatusBySettlementNo(settlementOwner.getSettlementNo(),status);
 
     }
+
+
 }

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

 package com.clx.performance.service.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
 
 /**

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

 package com.clx.performance.service.settle;
 
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
 
 /**
  * @author liruixin
@@ -8,4 +10,5 @@ package com.clx.performance.service.settle;
  * Time 09:43
  */
 public interface SettlementDriverService  {
+    IPage<CarrierPageSettlementDriverVO> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param);
 }

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

@@ -21,4 +21,5 @@ public interface SettlementOwnerService {
     void updatePaymentSettlement(OwnerPaymentSettlementParam param);
 
     void updatePaymentConfirmSettlement(Integer id);
+
 }

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

+package com.clx.performance.struct.settle;
+
+import com.clx.performance.model.settle.SettlementDriver;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface SettlementDriverStruct {
+    List<CarrierPageSettlementDriverVO> covertList(List<SettlementDriver> records);
+}