Merge branch 'v4.9_create_goods_child_20230918' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -59,6 +59,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_UNLOAD_TIME_ERROR(1317, "非卸车时间段"),
     ORDER_CHILD_ARRIVE_SEND_ADDRESS_DISTANCE_ERROR(1318, "没有到达货源地"),
     ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_DISTANCE_ERROR(1319, "没有到达目的地"),
+    ORDER_CHILD_OPERATION_FORBID(1320, "没有权限操作"),
 
     ;
     private final int code;

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

@@ -47,14 +47,12 @@ public class OrderChildFreightInfoVO {
     private BigDecimal lossPrice;
 
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
-    @MoneyOutConvert
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
+        return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
     }
 
     @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
-    @MoneyOutConvert
     private BigDecimal lossFreight;
     public BigDecimal getLossFreight() {
         return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : lossPrice.multiply(loadNet.subtract(unloadNet)).setScale(2, RoundingMode.HALF_UP);

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

@@ -150,10 +150,9 @@ public class OrderChildVO {
     private Address receiveAddressInfo;
 
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
-    @MoneyOutConvert
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
+        return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
     }
 
 }
\ No newline at end of file

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

@@ -236,9 +236,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.GO_TO_SEND.getCode())){return;}
         if (!Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.CREATED.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
@@ -261,9 +267,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARRIVE_SEND.getCode())){return;}
         if (!Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.GO_TO_SEND.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
@@ -299,9 +311,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.GO_TO_RECEIVE.getCode())){return;}
         if (!Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.LOAD.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
@@ -325,9 +343,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())){return;}
         if (!Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.GO_TO_RECEIVE.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
@@ -359,9 +383,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.DRIVER_CANCEL.getCode())
                 || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.PLATFORM_CANCEL.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
@@ -465,9 +495,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.DRIVER_CANCEL.getCode())
                 || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.PLATFORM_CANCEL.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
@@ -592,9 +628,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         LocalDateTime now = LocalDateTime.now();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.DRIVER_CANCEL.getCode())
                 || Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.PLATFORM_CANCEL.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
@@ -680,7 +722,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
 
@@ -723,9 +770,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         LocalDateTime now = LocalDateTime.now();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        }
+        else if (Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_OPERATION_FORBID);
+        }
+        else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
+
         if (OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
             return;
         }
@@ -824,7 +877,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         Long userNo = loginUserInfo.getUserNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (!Objects.equals(orderChild.getDriverUserNo(), userNo)
+                && !Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
 
@@ -878,7 +932,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         String childNo = param.getChildNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (!Objects.equals(orderChild.getDriverUserNo(), userNo)
+                && !Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
 
@@ -894,7 +949,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         Long userNo = loginUserInfo.getUserNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (!Objects.equals(orderChild.getDriverUserNo(), userNo)
+                && !Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }
 
@@ -917,7 +973,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         Long userNo = loginUserInfo.getUserNo();
 
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        if (!Objects.equals(orderChild.getUserNo(), userNo) && !Objects.equals(orderChild.getDriverUserNo(), userNo)){
+        if (!Objects.equals(orderChild.getDriverUserNo(), userNo)
+                && !Objects.equals(orderChild.getTruckOwnUserNo(), userNo)){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         }