运单详情增加磅单图片

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -34,6 +34,15 @@ public class CarrierOrderChildDetailVO {
     @MoneyOutConvert
     private BigDecimal freightPrice;
 
+    @ApiModelProperty(value = "应付运费（元）", example = "1.23")
+    private BigDecimal payableFreight;
+
+    @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
+    private BigDecimal lossDeduction;
+
+    @ApiModelProperty(value = "实付运费（元）", example = "1.23")
+    private BigDecimal realFreight;
+
 
     @ApiModelProperty(value = "损耗单价（元）", example = "1.23")
     @MoneyOutConvert
@@ -43,6 +52,9 @@ public class CarrierOrderChildDetailVO {
     @MoneyOutConvert
     private BigDecimal orderFreightPrice;
 
+    @ApiModelProperty("货物重量")
+    private BigDecimal extractWeight;
+
     @ApiModelProperty(value = "发货地址", example = "朝阳")
     private String sendAddress;
 

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

@@ -870,12 +870,47 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public CarrierOrderChildDetailVO getCarrierOrderChildDetail(String childNo) {
+        //运单数据
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         CarrierOrderChildDetailVO carrierOrderChildDetailVO = orderChildStruct.carrierConvert(orderChild);
+
+        //货单数据
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        carrierOrderChildDetailVO.setExtractWeight(orderGoods.getExtractWeight());
+
+        //磅单审核数据
         List<OrderChildPoundAudit> poundAuditList = orderChildPoundAuditDao.getPoundAuditList(childNo);
         carrierOrderChildDetailVO.setPoundAudits(orderChildPoundStruct.convert(poundAuditList));
+
+        //运单日志
         List<OrderChildLog> orderChildLog = orderChildLogService.getOrderChildNodeLog(childNo);
         carrierOrderChildDetailVO.setChildLogs(orderChildLogStruct.convert(orderChildLog));
+
+        //应付运费
+        BigDecimal payableFreight=BigDecimal.ZERO;
+        if(Objects.nonNull(orderChild.getLoadNet())){
+            payableFreight = orderChild.getLoadNet().multiply(carrierOrderChildDetailVO.getFreight());
+        }
+
+        //亏吨扣款（元）
+        BigDecimal lossDeduction=BigDecimal.ZERO;
+        if(Objects.nonNull(orderChild.getLoadNet()) && Objects.nonNull(orderChild.getUnloadNet())){
+            if(orderChild.getLoadNet().compareTo(orderChild.getUnloadNet()) >0){
+                lossDeduction = carrierOrderChildDetailVO.getFreight().multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet()));
+            }
+        }
+
+        //实付运费（元）
+        BigDecimal realFreight=payableFreight.subtract(lossDeduction);
+        carrierOrderChildDetailVO.setPayableFreight(payableFreight);
+        carrierOrderChildDetailVO.setLossDeduction(lossDeduction);
+        carrierOrderChildDetailVO.setRealFreight(realFreight);
+
+        //磅单图片
+        List<OrderChildImage> loadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.LOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        List<OrderChildImage> unloadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.UNLOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        carrierOrderChildDetailVO.setLoadImageList(loadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
+        carrierOrderChildDetailVO.setUnloadImageList(unloadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
         return carrierOrderChildDetailVO;
     }
 }