运单列表增加运输中状态

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 
 public enum OrderChildEnum {
@@ -82,5 +83,22 @@ public enum OrderChildEnum {
         }
     }
 
+    // 运输中
+    public static final List<Integer> TRANSIT_lIST = Arrays.asList(
+            Status.CREATED.getCode(),
+            Status.PAY.getCode(),
+
+            Status.GO_TO_SEND.getCode(),
+            Status.ARRIVE_SEND.getCode(),
+            Status.LOAD.getCode(),
+            Status.GO_TO_RECEIVE.getCode(),
+            Status.ARRIVE_RECEIVE.getCode(),
+            Status.UNLOAD.getCode(),
+
+            Status.UNSETTLE.getCode()
+
+    );
+
+
 
 }

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

 package com.clx.performance.vo.app;
 
+import com.clx.performance.enums.OrderChildEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -7,7 +8,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -91,6 +91,11 @@ public class OrderChildVO {
     private Integer poundStatus;
     @ApiModelProperty(value = "状态", example = "")
     private Integer status;
+    @ApiModelProperty(value = "运输状态 0非运输中 1运输中", example = "1")
+    private Integer transitStatus;
+    public Integer getTransitStatus() {
+        return status==null || !OrderChildEnum.TRANSIT_lIST.contains(status)? 0 : 1;
+    }
 
     @ApiModelProperty(value = "支付时间", example = "")
     private String payTime;

performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -57,7 +57,9 @@ public class OrderChild implements HasKey<Integer> {
     private BigDecimal unloadRough;                 //卸货毛重（单位吨）
     private BigDecimal unloadTare;                  //卸货皮重（单位吨）
     private BigDecimal unloadNet;                   //卸货净重（单位吨）
+
     private BigDecimal weight;                      //拉运重量（单位吨）
+    private BigDecimal freight;                     //运费（分）
 
     private String cancelRemark;                    //取消原因
     private Integer poundStatus;                    //磅单审核状态  0 待审核 1 审核通过 2 审核驳回

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

@@ -128,6 +128,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setTruckLoad(truckLoad);
 
         orderChild.setWeight(orderChild.getTruckLoad());
+        orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setPayTime(now);
         orderChild.setStatus(OrderChildEnum.Status.CREATED.getCode());
         orderChild.setCreateTime(now);
@@ -667,6 +668,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         else {return orderChild.getUnloadNet().compareTo(orderChild.getLoadNet())>0? orderChild.getLoadNet() : orderChild.getUnloadNet();}
     }
 
+    /**
+     * 运费计算
+     */
+    private BigDecimal orderChildFreightCalc(OrderChild orderChild){
+        return orderChild.getWeight().multiply(orderChild.getFreightPrice()).setScale(0, BigDecimal.ROUND_HALF_UP);
+    }
+
 
     /**
      * 接单锁定司机