增加pc 车辆管理业务信息接口

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName OrderChildBussInfoVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/9/24 17:41
+ * @Version 1.0
+ */
+
+@ApiModel(description = "车辆业务信息")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OrderChildBussInfoVO {
+
+    @ApiModelProperty(value = "运单完成数量")
+    private Integer complateNum;
+
+    @ApiModelProperty(value = "历史装车总量")
+    private BigDecimal historyLoadWeight;
+
+    @ApiModelProperty(value = "完成拉运总量")
+    private BigDecimal complateCarryWeight;
+
+
+    @ApiModelProperty(value = "亏吨数量总计")
+    private BigDecimal loseWeight;
+
+    @ApiModelProperty(value = "亏吨率")
+    private BigDecimal loseRate;
+
+
+}

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

@@ -7,6 +7,7 @@ import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.service.OrderChildPoundAuditService;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
+import com.clx.performance.vo.pc.OrderChildBussInfoVO;
 import com.clx.performance.vo.pc.OrderChildStatusVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.msl.common.base.PageData;
@@ -82,7 +83,7 @@ public class CarrierOrderChildController {
 
     @ApiOperation(value = "业务信息", notes = "<br>By:胡宇帆")
     @PostMapping("/orderChildBussInfo")
-    public Result<CarrierOrderChildDetailVO> getOrderChildBussInfo(@NotBlank(message = "车牌号不能为空") String truckNo) {
+    public Result<OrderChildBussInfoVO> getOrderChildBussInfo(@NotBlank(message = "车牌号不能为空") String truckNo) {
         return Result.ok(orderChildService.getOrderChildBussInfo(truckNo));
     }
 

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -6,10 +6,7 @@ import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.*;
-import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
-import com.clx.performance.vo.pc.OrderChildPCVO;
-import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
-import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.*;
 
 import java.util.List;
 
@@ -62,5 +59,5 @@ public interface OrderChildService {
 
     Integer getOrderChildTotalByUserNo(Long userNo);
 
-    CarrierOrderChildDetailVO getOrderChildBussInfo(String truckNo);
+    OrderChildBussInfoVO getOrderChildBussInfo(String truckNo);
 }

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

@@ -19,10 +19,7 @@ import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.*;
 import com.clx.performance.vo.app.*;
-import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
-import com.clx.performance.vo.pc.OrderChildPCVO;
-import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
-import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
+import com.clx.performance.vo.pc.*;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.msl.common.base.Optional;
@@ -1140,22 +1137,20 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     @Override
-    public CarrierOrderChildDetailVO getOrderChildBussInfo(String truckNo) {
+    public OrderChildBussInfoVO getOrderChildBussInfo(String truckNo) {
         List<OrderChild> childList = orderChildDao.getOrderChildBussInfo(truckNo);
         //运单完成数量
-        int totalSUm = childList.size();
-        //历史装车总理
-        BigDecimal old1 = childList.stream().map(OrderChild::getLoadNet).reduce(BigDecimal::add).get();
-
-        BigDecimal old2 = childList.stream().map(OrderChild::getUnloadNet).reduce(BigDecimal::add).get();
-
-        BigDecimal w = old2.subtract(old1).compareTo(BigDecimal.ZERO) < 0 ?BigDecimal.ZERO : old2.subtract(old1);
-
-        BigDecimal divide = w.divide(old1, 0, BigDecimal.ROUND_HALF_UP);
-
-
-//        orderChildDao.getOrderChildBussInfo(truckNo)
-//        return null;
-        return null;
+        int complateNum = childList.size();
+        //历史装车总量
+        BigDecimal historyLoadWeight = childList.stream().map(OrderChild::getLoadNet).reduce(BigDecimal::add).get();
+        //完成拉运总量
+        BigDecimal complateCarryWeight = childList.stream().map(OrderChild::getUnloadNet).reduce(BigDecimal::add).get();
+        //亏吨数量总计
+        BigDecimal loseWeight = complateCarryWeight.subtract(historyLoadWeight).compareTo(BigDecimal.ZERO) < 0 ?BigDecimal.ZERO : historyLoadWeight.subtract(complateCarryWeight);
+        //亏吨率
+        BigDecimal loseRate = loseWeight.divide(historyLoadWeight).setScale(2,RoundingMode.HALF_UP);
+        OrderChildBussInfoVO vo = OrderChildBussInfoVO.builder().complateNum(complateNum).historyLoadWeight(historyLoadWeight).complateCarryWeight(complateCarryWeight)
+                .loseWeight(loseWeight).loseRate(loseRate).build();
+        return vo;
     }
 }