commit

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -13,6 +13,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 /**
 * @Author: aiqinguo
@@ -181,4 +182,28 @@ public class OrderChildVO {
     @ApiModelProperty("最晚装货时间")
     private String lastLoadTime;
 
+
+    //运单详情增加字段
+    @ApiModelProperty(value = "亏吨重量", example = "1.23")
+    private BigDecimal lossWeight;
+
+    public BigDecimal getLossWeight() {
+        if (Objects.nonNull(unloadNet)){
+            return unloadNet.subtract(loadNet).compareTo(BigDecimal.ZERO) < 0 ?loadNet.subtract(unloadNet) : BigDecimal.ZERO;
+        }else{
+            return null;
+        }
+    }
+    @ApiModelProperty(value = "亏吨扣款", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossAmount;
+    public BigDecimal getLossAmount() {
+        if (Objects.nonNull(unloadNet)){
+            return unloadNet.subtract(loadNet).compareTo(BigDecimal.ZERO) < 0 ?loadNet.subtract(unloadNet) : BigDecimal.ZERO;
+        }else{
+            return null;
+        }
+    }
+
+
 }
\ No newline at end of file

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

 package com.clx.performance.service.impl;
 
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.OrderEnum;
-import com.clx.order.enums.ResultEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
-import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
@@ -46,7 +43,6 @@ import com.clx.performance.vo.pc.*;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
-import com.clx.user.vo.pc.driver.truck.DriverTruckVo;
 import com.msl.common.base.Optional;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
@@ -56,7 +52,6 @@ import com.msl.common.utils.LocalDateTimeUtils;
 import com.msl.common.utils.gps.GpsUtil;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -70,7 +65,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -1311,9 +1305,29 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (sendAndReceiveAddress.isPresent()) {
             result.setReceiveAddressInfo(addressStruct.convert(sendAndReceiveAddress.get().getReceiveAddress()));
         }
+        //亏吨吨数
+        result.setLossWeight(calcLossWeight(orderChild));
+        //亏吨扣款
+        result.setLossAmount(calcLossAmount(result.getLossWeight(),orderChild.getLossPrice()));
+
 
         return result;
     }
+    //计算亏吨吨数
+    private BigDecimal calcLossWeight(OrderChild orderChild){
+        if (Objects.nonNull(orderChild.getUnloadNet())){
+            return orderChild.getUnloadNet().subtract(orderChild.getLoadNet()).compareTo(BigDecimal.ZERO) < 0 ?
+                    orderChild.getLoadNet().subtract(orderChild.getUnloadNet()) : BigDecimal.ZERO;
+        }
+        return null;
+    }
+    //计算亏吨金额
+    private BigDecimal calcLossAmount(BigDecimal lossWeight, BigDecimal lossPrice){
+        if (Objects.nonNull(lossWeight)){
+            return lossWeight.multiply(lossPrice).setScale(0, RoundingMode.HALF_UP);
+        }
+        return null;
+    }
 
     @Override
     public IPage<OrderChildVO> pageOrderChild(PageOrderChildOfDriverParam param) {