提交代码

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

+package com.clx.performance.param.pc.owner;
+
+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 PageCarrierSettlementDriverDetailParam extends PageParam {
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="货主编码",example = "201457878")
+    private Long driverUserNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+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 PageCarrierSettlementOwnerDetailParam extends PageParam {
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="货主编码",example = "201457878")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.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 CarrierPageSettlementDriverDetailVO {
+
+    @ApiModelProperty(value = "计费明细ID")
+    private Integer id;
+    @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 = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @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;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.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 CarrierPageSettlementOwnerDetailVO {
+
+    @ApiModelProperty(value = "计费明细ID")
+    private Integer id;                             
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;                       
+    @ApiModelProperty(value = "货主姓名")
+    private String ownerName;                       
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;                         
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "货物id")
+    private Integer goodsId;                        
+    @ApiModelProperty(value = "货物名称")
+    private String goodsName;                       
+    @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;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;              
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+
+
+}

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.service.settle.SettlementDriverDetailService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementDriverDetail")
+@Validated
+@Api(tags = "承运端-计费管理")
+@AllArgsConstructor
+public class CarrierSettlementDriverDetailController {
+
+    private final SettlementDriverDetailService settlementDriverDetailService;
+
+
+    @ApiOperation(value = "运单计费列表（车主）",notes = "<br>By:刘海泉")
+    @GetMapping("/pageSettlementDriverDetail")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementDriverDetailVO>> pageSettlementDriverDetail(@RequestBody @Validated PageCarrierSettlementDriverDetailParam param) {
+        IPage<CarrierPageSettlementDriverDetailVO> page = settlementDriverDetailService.pageSettlementDriverDetail(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+
+}

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

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementOwnerDetail")
+@Validated
+@Api(tags = "承运端-计费管理")
+@AllArgsConstructor
+public class CarrierSettlementOwnerDetailController {
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+
+    @ApiOperation(value = "运单计费列表（货主）",notes = "<br>By:刘海泉")
+    @GetMapping("/pageSettlementOwnerDetail")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementOwnerDetailVO>> pageSettlementOwnerDetail(@RequestBody @Validated PageCarrierSettlementOwnerDetailParam param) {
+        IPage<CarrierPageSettlementOwnerDetailVO> page = settlementOwnerDetailService.pageSettlementOwnerDetail(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.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.SettlementOwnerDetailDao;
 import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 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: 货主运单计费明细
@@ -18,6 +23,22 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> implements SettlementOwnerDetailDao {
+    @Override
+    public IPage<SettlementOwnerDetail> pageSettlementOwnerDetail(
+            PageCarrierSettlementOwnerDetailParam param) {
+        LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getChildNo())){
+            query.eq(SettlementOwnerDetail :: getChildNo,param.getChildNo());
+        }
+        if(StringUtils.isNotBlank(param.getOrderNo())){
+            query.eq(SettlementOwnerDetail :: getOrderNo,param.getOrderNo());
+        }
+        if(Objects.nonNull(param.getOwnerUserNo())){
+            query.eq(SettlementOwnerDetail :: getOwnerUserNo,param.getOwnerUserNo());
+        }
+        return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
+    }
+
     @Override
     public IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
         Page<PageOwnerSettlementOwnerDetailVO> page = Page.of(param.getPage(), param.getPageSize());

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

@@ -3,6 +3,7 @@ package com.clx.performance.dao.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.msl.common.dao.BaseDao;
@@ -18,4 +19,5 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
 
     IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 
+    IPage<SettlementOwnerDetail> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
 }

performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriverDetail.java

@@ -44,6 +44,7 @@ public class SettlementDriverDetail implements HasKey<Integer> {
     private BigDecimal lossFreight;                 //货损金额（分）
     private BigDecimal prepayFreight;               //预付运费金额（分）
     private BigDecimal settlementFreight;           //结算金额（分）
+    private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

 package com.clx.performance.service.impl.settle;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -10,4 +13,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetailService {
+    @Override
+    public IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(
+            PageCarrierSettlementDriverDetailParam param) {
+        return null;
+    }
 }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.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.SettlementOwnerDetailDao;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.struct.settle.SettlementOwnerDetailStruct;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2023-10-12
@@ -20,7 +27,15 @@ import org.springframework.stereotype.Service;
 public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailService {
 
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+    private final SettlementOwnerDetailStruct settlementOwnerDetailStruct;
 
+    @Override
+    public IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(
+            PageCarrierSettlementOwnerDetailParam param) {
+        IPage<SettlementOwnerDetail> result = settlementOwnerDetailDao.pageSettlementOwnerDetail(param);
+        List<CarrierPageSettlementOwnerDetailVO> list = settlementOwnerDetailStruct.covertList(result.getRecords());
+        return new Page<CarrierPageSettlementOwnerDetailVO>().setRecords(list).setTotal(result.getTotal()).setPages(result.getPages());
+    }
 
     @Override
     public IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {

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

@@ -136,5 +136,5 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         //更新状态
         settlementOwnerDao.updateStatusBySettlementNo(settlementOwner.getSettlementNo(),status);
 
-    }
+    }s
 }

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.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
 
 /**
  * @author liruixin
@@ -8,4 +10,5 @@ package com.clx.performance.service.settle;
  * Time 09:43
  */
 public interface SettlementDriverDetailService  {
+    IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
 }

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

@@ -2,7 +2,9 @@ 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.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 
 /**
@@ -13,4 +15,6 @@ import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 public interface SettlementOwnerDetailService  {
 
     IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
+
+    IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
 }

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

 package com.clx.performance.struct.settle;
 
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
 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 SettlementOwnerDetailStruct {
 
 
-
+    List<CarrierPageSettlementOwnerDetailVO> covertList(List<SettlementOwnerDetail> list);
 }
\ No newline at end of file