运单

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

@@ -19,18 +19,18 @@ public enum OrderChildEnum {
 
         GO_TO_SEND(30, "前往货源地"),
         ARRIVE_SEND(40, "到达货源地"),
-        LOAD(60 , "装货成功"),
-        GO_TO_RECEIVE(50, "前往目的地"),
-        ARRIVE_RECEIVE(60 , "到达目的地"),
-        DRIVER_CONFIRM(70, "收货待确认"),
+        LOAD(50 , "装货成功"),
+        GO_TO_RECEIVE(60, "前往目的地"),
+        ARRIVE_RECEIVE(70 , "到达目的地"),
+        UNLOAD(80, "收货待确认"),
 
-        POUND_AUDIT_FAIL(80, "磅单审核驳回"),
-        UNSETTLED(80, "待结算"),
+        POUND_AUDIT_FAIL(90, "磅单审核驳回"),
+        UNSETTLED(90, "待结算"),
 
         COMPLETE(100, "完成"),
 
-        DRIVER_CANCEL(200, "司机取消"),
-        PLATFORM_CANCEL(200, "平台取消"),
+        DRIVER_CANCEL(210, "司机取消"),
+        PLATFORM_CANCEL(220, "平台取消"),
 
 //
 //        OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆

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

@@ -42,4 +42,21 @@ public enum OrderChildLogEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum CreateType {
+        OWNER(1, "货主"),
+        PLATFORM(2, "承运"),
+        DRIVER(3, "司机"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<CreateType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
 }

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderChildPoundAuditEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        AUDIT(0, "待审核"),
+        APPROVED(1, "审核通过"),
+        REJECT(2, "审核驳回"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

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

+package com.clx.performance.vo.app;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @Author: aiqinguo
+* @Description: 运单表
+* @Date: 2023/09/19 16:49:06
+* @Version: 1.0
+*/
+
+@ApiModel(description = "运单表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "货主用户编号", example = "")
+    private Long ownerUserNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "货单编号", example = "")
+    private String orderGoodsNo;
+    @ApiModelProperty(value = "订单编号", example = "")
+    private String orderNo;
+    @ApiModelProperty(value = "货物id", example = "")
+    private Integer goodsId;
+    @ApiModelProperty(value = "货物名称", example = "")
+    private String goodsName;
+    @ApiModelProperty(value = "运费单价（分）", example = "")
+    private BigDecimal freightPrice;
+    @ApiModelProperty(value = "发货地址id", example = "")
+    private Integer sendAddressId;
+    @ApiModelProperty(value = "发货地址", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址id", example = "")
+    private Integer receiveAddressId;
+    @ApiModelProperty(value = "收货地址", example = "")
+    private String receiveAddress;
+    @ApiModelProperty(value = "车辆ID", example = "")
+    private Integer truckId;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "载重（单位吨）", example = "")
+    private BigDecimal truckLoad;
+    @ApiModelProperty(value = "司机用户编号", example = "")
+    private Long driverUserNo;
+    @ApiModelProperty(value = "司机姓名", example = "")
+    private String driverName;
+    @ApiModelProperty(value = "司机手机号", example = "")
+    private String driverMobile;
+    @ApiModelProperty(value = "装货毛重（单位吨）", example = "")
+    private BigDecimal loadRough;
+    @ApiModelProperty(value = "装货皮重（单位吨）", example = "")
+    private BigDecimal loadTare;
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "")
+    private BigDecimal loadNet;
+    @ApiModelProperty(value = "卸货毛重（单位吨）", example = "")
+    private BigDecimal unloadRough;
+    @ApiModelProperty(value = "卸货皮重（单位吨）", example = "")
+    private BigDecimal unloadTare;
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "")
+    private BigDecimal unloadNet;
+    @ApiModelProperty(value = "拉运重量（单位吨）", example = "")
+    private BigDecimal weight;
+    @ApiModelProperty(value = "磅单审核状态", example = "")
+    private Integer poundStatus;
+    @ApiModelProperty(value = "状态", example = "")
+    private Integer status;
+    @ApiModelProperty(value = "支付时间", example = "")
+    private String payTime;
+    @ApiModelProperty(value = "装车时间", example = "")
+    private String loadTime;
+    @ApiModelProperty(value = "卸车时间", example = "")
+    private String unloadTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+    @ApiModelProperty(value = "装车磅单图片列表")
+    private List<String> loadImageList;
+
+    @ApiModelProperty(value = "卸车磅单图片列表")
+    private List<String> unloadImageList;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/param/app/SaveOrderChildVo.java → performance-api/src/main/java/com/clx/performance/vo/app/SaveOrderChildVO.java

-package com.clx.performance.param.app;
+package com.clx.performance.vo.app;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -6,12 +6,11 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 @Getter
 @Setter
 @NoArgsConstructor
-public class SaveOrderChildVo {
+public class SaveOrderChildVO {
 
     @ApiModelProperty(value = "运单编号", example = "100000000")
     @NotBlank(message = "运单编号不能为空")

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

@@ -83,6 +83,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("收货地址纬度")
     private BigDecimal receiveLatitude;
 
+    @TableField("goods_id")
+    @ApiModelProperty("货物ID")
+    private Integer goodsId;
+
     @TableField("goods_name")
     @ApiModelProperty("货物名称")
     private String goodsName;

performance-web/src/main/java/com/clx/performance/struct/OrderChildStruct.java

+package com.clx.performance.struct;
+
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.vo.app.OrderChildVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface OrderChildStruct {
+
+    OrderChildVO convert(OrderChild item);
+
+}