运单明细详情

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.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.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageOwnerSettlementOwnerDetailVO {
+
+    @ApiModelProperty(value="货主用户编号",example = "4174174")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="货主名称",example = "张三")
+    private String ownerName;
+
+    @ApiModelProperty(value="结算单号",example = "41441")
+    private String settlementNo;
+
+    @ApiModelProperty(value="结算子单号",example = "41441")
+    private String settlementSubNo;
+
+    @ApiModelProperty(value="运单编号",example = "41441")
+    private String childNo;
+
+    @ApiModelProperty(value="货单编号",example = "41441")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value="订单编号",example = "41441")
+    private String orderNo;
+
+    @ApiModelProperty(value="货物id",example = "5")
+    private Integer goodsId;
+
+    @ApiModelProperty(value="货物名称",example = "货物名称")
+    private String goodsName;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="平台运费单价（分）",example = "10.2")
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value="实际净重（吨）",example = "2.3")
+    private BigDecimal weight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="实际运费（分）",example = "2.52")
+    private BigDecimal freight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="损耗单价（分）",example = "1.2")
+    private BigDecimal lossPrice;
+
+    @ApiModelProperty(value="货损吨数（吨）",example = "1.02")
+    private BigDecimal lossWeight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="货损金额（分）",example = "2.3")
+    private BigDecimal lossFreight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="预付运费金额（分）",example = "1.2")
+    private BigDecimal prepayFreight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="结算金额（分）",example = "1.2")
+    private BigDecimal settlementFreight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="开票金额（分）",example = "2.1")
+    private BigDecimal invoiceFreight;
+
+    @ApiModelProperty(value="开票标识：1网运单 2普通单",example = "1")
+    private Integer invoiceType;
+
+    @ApiModelProperty(value="尾款状态 0-否,1-是,2-无需支付",example = "1")
+    private Integer finalPaymentStatus;
+
+    @ApiModelProperty(value="开票状态 0-否,1-是",example = "1")
+    private Integer invoiceStatus;
+
+}
\ No newline at end of file

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

@@ -38,8 +38,6 @@ public class CarrierOrderChildController {
 
     private final OrderChildService orderChildService;
 
-    private final OrderChildPoundAuditService orderChildPoundAuditService;
-
     @ApiOperation(value = "运单列表",notes = "<br>By:李瑞新")
     @PostMapping("/pageCarrierOrderChildList")
     @UnitCovert(param = false)

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

 package com.clx.performance.controller.pc.owner;
 
+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.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.PageOwnerSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
+import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -27,6 +32,9 @@ public class OwnerSettlementOwnerController {
 
     private final SettlementOwnerService settlementOwnerService;
 
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+
 
     @ApiOperation(value = "结算单详情",notes = "<br>By:李瑞新")
     @GetMapping("/getOwnerSettlementOwnerDetail")
@@ -64,5 +72,13 @@ public class OwnerSettlementOwnerController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "结算运单明细",notes = "<br>By:李瑞新")
+    @PostMapping("/pageOwnerSettlementOrderDetailList")
+    @UnitCovert(param = false)
+    public Result<PageData<PageOwnerSettlementOwnerDetailVO>> pageOwnerSettlementOrderDetailList(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param) {
+        IPage<PageOwnerSettlementOwnerDetailVO> page = settlementOwnerDetailService.pageOwnerSettlementOrderDetailList(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.PageOwnerSettlementOwnerDetailParam;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +20,15 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> implements SettlementOwnerDetailDao {
-
-
+    @Override
+    public IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
+        LambdaQueryWrapper<SettlementOwnerDetail> queryWrapper = lQrWrapper()
+                .eq(SettlementOwnerDetail::getSettlementNo,param.getSettlementNo())
+                .eq(StringUtils.isNotBlank(param.getChildNo()),SettlementOwnerDetail::getChildNo, param.getChildNo())
+                .eq(StringUtils.isNotBlank(param.getOrderNo()),SettlementOwnerDetail::getOrderNo, param.getOrderNo())
+                .eq(StringUtils.isNotBlank(param.getSettlementSubNo()),SettlementOwnerDetail::getSettlementSubNo, param.getSettlementSubNo());
+        queryWrapper.orderByDesc(SettlementOwnerDetail::getId);
+        return Optional.ofNullable(super.page(Page.of(param.getPage(), param.getPageSize()), queryWrapper))
+                .orElse(Page.of(param.getPage(), param.getPageSize()));
+    }
 }

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

 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.PageOwnerSettlementOwnerDetailParam;
 import com.msl.common.dao.BaseDao;
 
 
@@ -13,4 +15,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> {
 
+    IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
+
 }

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.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+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.owner.settle.PageOwnerSettlementOwnerDetailVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
@@ -9,5 +17,19 @@ import org.springframework.stereotype.Service;
  * Time 09:43
  */
 @Service
+@Slf4j
+@AllArgsConstructor
 public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailService {
+
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
+    private final SettlementOwnerDetailStruct settlementOwnerDetailStruct;
+
+    @Override
+    public IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
+
+        IPage<SettlementOwnerDetail> settlementOwnerDetailIPage = settlementOwnerDetailDao.pageOwnerSettlementOrderDetailList(param);
+        return  settlementOwnerDetailStruct.convertPage(settlementOwnerDetailIPage);
+
+    }
 }

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

 package com.clx.performance.service.settle;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 
 /**
  * @author liruixin
@@ -8,4 +11,6 @@ package com.clx.performance.service.settle;
  * Time 09:43
  */
 public interface SettlementOwnerDetailService  {
+
+    IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 }

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

+package com.clx.performance.struct.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface SettlementOwnerDetailStruct {
+
+    IPage<PageOwnerSettlementOwnerDetailVO> convertPage(IPage<SettlementOwnerDetail> page);
+
+
+}
\ No newline at end of file