app物流模块(二级市场)

sp-core/sp-api/src/main/java/com/pj/api/dto/TbLogisticsDto.java

@@ -1,15 +1,17 @@
 package com.pj.api.dto;
 
 
+import java.util.Date;
+
 /**
- * Model: tb_logistics -- 物流表
- * @author qzy 
+ * Model: tb_logistics -- 物流订单表
+ * @author qzy
  */
 
 public class TbLogisticsDto{
-	public TbLogisticsDto(Long id, Long ordersId, String declarationNumber, Integer prepare, String prepareTime, Integer loading, String loadingTime, Integer delivery, String deliveryTime, Integer clearedCustom, String clearedCustomTime, Integer makeCargo, String makeCargoTime, Integer confirmReceipt, String confirmReceiptTime, Integer orderFinish, String createTime, String createBy, String createName, String updateTime, String updateBy, String updateName, Integer deleteStatus, Long levelOneOrderId) {
+	public TbLogisticsDto(Long id, Long ordersId, String declarationNumber, Integer prepare, Date prepareTime, Integer loading, Date loadingTime, Integer delivery, Date deliveryTime, Integer clearedCustom, Date clearedCustomTime, Integer makeCargo, Date makeCargoTime, Integer confirmReceipt, Date confirmReceiptTime, Integer orderFinish, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, String orderNo, Long levelOneOrderId, Long levelTwoOrderId, Integer tradeAreaId, String tradeAreaName, String loadingAddress, String unloadingAddress, String comment, Long driverId, String driverName, String driverPhone, Long vehicleId, String vehiclePlate, Integer vehicleType ) {
 		this.id = id;
-		this.ordersId = ordersId;
+		/*this.ordersId = ordersId;*/
 		this.declarationNumber = declarationNumber;
 		this.prepare = prepare;
 		this.prepareTime = prepareTime;
@@ -32,6 +34,19 @@ public class TbLogisticsDto{
 		this.updateName = updateName;
 		this.deleteStatus = deleteStatus;
 		this.levelOneOrderId = levelOneOrderId;
+		this.levelTwoOrderId = levelTwoOrderId;
+		this.orderNo = orderNo;
+		this.tradeAreaId = tradeAreaId;
+		this.tradeAreaName = tradeAreaName;
+		this.loadingAddress = loadingAddress;
+		this.unloadingAddress = unloadingAddress;
+		this.comment = comment;
+		this.driverId = driverId;
+		this.driverName = driverName;
+		this.driverPhone = driverPhone;
+		this.vehicleId = vehicleId;
+		this.vehiclePlate = vehiclePlate;
+		this.vehicleType = vehicleType;
 	}
 
 	public TbLogisticsDto() {
@@ -45,13 +60,13 @@ public class TbLogisticsDto{
 		this.id = id;
 	}
 
-	public Long getOrdersId() {
+	/*public Long getOrdersId() {
 		return ordersId;
 	}
 
 	public void setOrdersId(Long ordersId) {
 		this.ordersId = ordersId;
-	}
+	}*/
 
 	public String getDeclarationNumber() {
 		return declarationNumber;
@@ -69,11 +84,11 @@ public class TbLogisticsDto{
 		this.prepare = prepare;
 	}
 
-	public String getPrepareTime() {
+	public Date getPrepareTime() {
 		return prepareTime;
 	}
 
-	public void setPrepareTime(String prepareTime) {
+	public void setPrepareTime(Date prepareTime) {
 		this.prepareTime = prepareTime;
 	}
 
@@ -85,11 +100,11 @@ public class TbLogisticsDto{
 		this.loading = loading;
 	}
 
-	public String getLoadingTime() {
+	public Date getLoadingTime() {
 		return loadingTime;
 	}
 
-	public void setLoadingTime(String loadingTime) {
+	public void setLoadingTime(Date loadingTime) {
 		this.loadingTime = loadingTime;
 	}
 
@@ -101,11 +116,11 @@ public class TbLogisticsDto{
 		this.delivery = delivery;
 	}
 
-	public String getDeliveryTime() {
+	public Date getDeliveryTime() {
 		return deliveryTime;
 	}
 
-	public void setDeliveryTime(String deliveryTime) {
+	public void setDeliveryTime(Date deliveryTime) {
 		this.deliveryTime = deliveryTime;
 	}
 
@@ -117,11 +132,11 @@ public class TbLogisticsDto{
 		this.clearedCustom = clearedCustom;
 	}
 
-	public String getClearedCustomTime() {
+	public Date getClearedCustomTime() {
 		return clearedCustomTime;
 	}
 
-	public void setClearedCustomTime(String clearedCustomTime) {
+	public void setClearedCustomTime(Date clearedCustomTime) {
 		this.clearedCustomTime = clearedCustomTime;
 	}
 
@@ -133,11 +148,11 @@ public class TbLogisticsDto{
 		this.makeCargo = makeCargo;
 	}
 
-	public String getMakeCargoTime() {
+	public Date getMakeCargoTime() {
 		return makeCargoTime;
 	}
 
-	public void setMakeCargoTime(String makeCargoTime) {
+	public void setMakeCargoTime(Date makeCargoTime) {
 		this.makeCargoTime = makeCargoTime;
 	}
 
@@ -149,11 +164,11 @@ public class TbLogisticsDto{
 		this.confirmReceipt = confirmReceipt;
 	}
 
-	public String getConfirmReceiptTime() {
+	public Date getConfirmReceiptTime() {
 		return confirmReceiptTime;
 	}
 
-	public void setConfirmReceiptTime(String confirmReceiptTime) {
+	public void setConfirmReceiptTime(Date confirmReceiptTime) {
 		this.confirmReceiptTime = confirmReceiptTime;
 	}
 
@@ -165,11 +180,11 @@ public class TbLogisticsDto{
 		this.orderFinish = orderFinish;
 	}
 
-	public String getCreateTime() {
+	public Date getCreateTime() {
 		return createTime;
 	}
 
-	public void setCreateTime(String createTime) {
+	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
@@ -189,11 +204,11 @@ public class TbLogisticsDto{
 		this.createName = createName;
 	}
 
-	public String getUpdateTime() {
+	public Date getUpdateTime() {
 		return updateTime;
 	}
 
-	public void setUpdateTime(String updateTime) {
+	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
 
@@ -228,132 +243,300 @@ public class TbLogisticsDto{
 	public void setLevelOneOrderId(Long levelOneOrderId) {
 		this.levelOneOrderId = levelOneOrderId;
 	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public Long getLevelTwoOrderId() {
+		return levelTwoOrderId;
+	}
+
+	public void setLevelTwoOrderId(Long levelTwoOrderId) {
+		this.levelTwoOrderId = levelTwoOrderId;
+	}
+
+	public Integer getTradeAreaId() {
+		return tradeAreaId;
+	}
+
+	public void setTradeAreaId(Integer tradeAreaId) {
+		this.tradeAreaId = tradeAreaId;
+	}
+
+	public String getTradeAreaName() {
+		return tradeAreaName;
+	}
+
+	public void setTradeAreaName(String tradeAreaName) {
+		this.tradeAreaName = tradeAreaName;
+	}
+
+	public String getLoadingAddress() {
+		return loadingAddress;
+	}
+
+	public void setLoadingAddress(String loadingAddress) {
+		this.loadingAddress = loadingAddress;
+	}
+
+	public String getUnloadingAddress() {
+		return unloadingAddress;
+	}
+
+	public void setUnloadingAddress(String unloadingAddress) {
+		this.unloadingAddress = unloadingAddress;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public Long getDriverId() {
+		return driverId;
+	}
+
+	public void setDriverId(Long driverId) {
+		this.driverId = driverId;
+	}
+
+	public String getDriverName() {
+		return driverName;
+	}
+
+	public void setDriverName(String driverName) {
+		this.driverName = driverName;
+	}
+
+	public String getDriverPhone() {
+		return driverPhone;
+	}
+
+	public void setDriverPhone(String driverPhone) {
+		this.driverPhone = driverPhone;
+	}
+
+	public Long getVehicleId() {
+		return vehicleId;
+	}
+
+	public void setVehicleId(Long vehicleId) {
+		this.vehicleId = vehicleId;
+	}
+
+	public String getVehiclePlate() {
+		return vehiclePlate;
+	}
+
+	public void setVehiclePlate(String vehiclePlate) {
+		this.vehiclePlate = vehiclePlate;
+	}
+
+	public Integer getVehicleType() {
+		return vehicleType;
+	}
+
+	public void setVehicleType(Integer vehicleType) {
+		this.vehicleType = vehicleType;
+	}
 // ---------- 表中字段 ----------
 	/**
-	 * 物流表主键 
+	 * 物流表主键
 	 */
 	private Long id;
 
 	/**
-	 * 订单表ID 
+	 * 订单表ID
+	 */
+	/*private Long ordersId;	*/
+
+	/**
+	 * 订单编号
+	 */
+	private String orderNo;
+
+	/**
+	 * 一级市场订单ID
+	 */
+	private Long levelOneOrderId;
+
+	/**
+	 * 二级市场订单ID
+	 */
+	private Long levelTwoOrderId;
+
+	/**
+	 * 贸易区域id
+	 */
+	private Integer tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
+
+	/**
+	 * 装货地址
+	 */
+	private String loadingAddress;
+
+	/**
+	 * 卸货地址
+	 */
+	private String unloadingAddress;
+
+	/**
+	 * 备注
+	 */
+	private String comment;
+
+	/**
+	 * 司机ID
+	 */
+	private Long driverId;
+
+	/**
+	 * 司机名称
+	 */
+	private String driverName;
+
+	/**
+	 * 司机电话
+	 */
+	private String driverPhone;
+
+	/**
+	 * 车辆ID
+	 */
+	private Long vehicleId;
+
+	/**
+	 * 车牌号
 	 */
-	private Long ordersId;	
+	private String vehiclePlate;
 
 	/**
-	 * (预留字段) 申报订单号 
+	 * 车辆类型
 	 */
-	private String declarationNumber;	
+	private Integer vehicleType;
 
 	/**
-	 * 订单待确认(0=待确认,1=订单已确认,2=订单确认失败) 
+	 * (预留字段) 申报订单号
 	 */
-	private Integer prepare;	
+	private String declarationNumber;
 
 	/**
-	 * 订单确认时间 
+	 * 订单待司机确认(0=待确认,1=订单已确认,2=订单确认失败)
 	 */
-	private String prepareTime;	
+	private Integer prepare;
 
 	/**
-	 * 待装货(0=待装货,1=已装货) 
+	 * 订单确认时间
 	 */
-	private Integer loading;	
+	private Date prepareTime;
 
 	/**
-	 * 已装货时间 
+	 * 待装货(0=待装货,1=已装货)
 	 */
-	private String loadingTime;	
+	private Integer loading;
 
 	/**
-	 * 发货(0=未发,1=已发) 
+	 * 已装货时间
 	 */
-	private Integer delivery;	
+	private Date loadingTime;
 
 	/**
-	 * 发货时间 
+	 * 发货(0=未发,1=已发)
 	 */
-	private String deliveryTime;	
+	private Integer delivery;
 
 	/**
-	 * 已出海关(0=禁用,1=启用) 
+	 * 发货时间
 	 */
-	private Integer clearedCustom;	
+	private Date deliveryTime;
 
 	/**
-	 * 出海关时间 
+	 * 已出海关(0=禁用,1=启用)
 	 */
-	private String clearedCustomTime;	
+	private Integer clearedCustom;
 
 	/**
-	 * 接货人确定接货(0=禁用,1=启用) 
+	 * 出海关时间
 	 */
-	private Integer makeCargo;	
+	private Date clearedCustomTime;
 
 	/**
-	 * 接货完成时间 
+	 * 接货人确定接货(0=禁用,1=启用)
 	 */
-	private String makeCargoTime;	
+	private Integer makeCargo;
 
 	/**
-	 * 收购商确认(0=禁用,1=启用) 
+	 * 接货完成时间
 	 */
-	private Integer confirmReceipt;	
+	private Date makeCargoTime;
 
 	/**
-	 * 收货方确认时间(相当于订单完成时间) 
+	 * 收购商确认(0=禁用,1=启用)
 	 */
-	private String confirmReceiptTime;	
+	private Integer confirmReceipt;
 
 	/**
-	 * 订单状态已完成(0=进行中,1=已完成) 
+	 * 收货方确认时间(相当于订单完成时间)
 	 */
-	private Integer orderFinish;	
+	private Date confirmReceiptTime;
 
 	/**
-	 * 创建时间 
+	 * 订单状态已完成(0=进行中,1=已完成)
 	 */
-	private String createTime;	
+	private Integer orderFinish;
 
 	/**
-	 * 创建人编号 
+	 * 创建时间
 	 */
-	private String createBy;	
+	private Date createTime;
 
 	/**
-	 * 创建人名称 
+	 * 创建人编号
 	 */
-	private String createName;	
+	private String createBy;
 
 	/**
-	 * 更新时间 
+	 * 创建人名称
 	 */
-	private String updateTime;	
+	private String createName;
 
 	/**
-	 * 更新人编号 
+	 * 更新时间
 	 */
-	private String updateBy;	
+	private Date updateTime;
 
 	/**
-	 * 更新人名称 
+	 * 更新人编号
 	 */
-	private String updateName;	
+	private String updateBy;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 更新人名称
 	 */
-	private Integer deleteStatus;	
+	private String updateName;
 
 	/**
-	 * 一级市场订单ID 
+	 * 删除状态(0=禁用,1=启用)
 	 */
-	private Long levelOneOrderId;	
+	private Integer deleteStatus;
 
 
 
 
 
-	
 
 
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriver.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 
 /**
  * Model: tb_driver -- 司机
- * @author qzy 
+ * @author qzy
  */
 @Data
 @Accessors(chain = true)
@@ -25,15 +25,15 @@ public class TbDriver extends Model<TbDriver> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_driver";	
+	public static final String TABLE_NAME = "tb_driver";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-driver";
 	public static final String PERMISSION_CODE_ADD = "tb-driver-add";
@@ -45,93 +45,93 @@ public class TbDriver extends Model<TbDriver> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键 
+	 * 主键
 	 */
 	@TableId(type = IdType.AUTO)
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;	
+	private Long id;
 
 	/**
-	 * 姓名 
+	 * 姓名
 	 */
 	@Excel(name = "姓名")
-	private String name;	
+	private String name;
 
 	/**
-	 * 年龄 
+	 * 年龄
 	 */
 	@Excel(name = "年龄")
-	private Integer age;	
+	private Integer age;
 
 	/**
-	 * 性别性别(1=男,2=女) 
+	 * 性别性别(1=男,2=女)
 	 */
 	@Excel(name = "性别")
 	private Integer sex;
 
 	/**
-	 * 手机号 
+	 * 手机号
 	 */
-	private String phone;	
+	private String phone;
 
 	/**
-	 * 联系地址 
+	 * 联系地址
 	 */
-	private String address;	
+	private String address;
 
 	/**
-	 * 银行卡号 
+	 * 银行卡号
 	 */
-	private String bankCode;	
+	private String bankCode;
 
 	/**
-	 * 银行名称 
+	 * 银行名称
 	 */
-	private String bankName;	
+	private String bankName;
 
 	/**
-	 * 身份证号 
+	 * 身份证号
 	 */
-	private String idCard;	
+	private String idCard;
 
 	/**
-	 * 身份证照片 
+	 * 身份证照片
 	 */
-	private String idCardImg;	
+	private String idCardImg;
 
 	/**
-	 * 驾驶证号 
+	 * 驾驶证号
 	 */
-	private String drivingLicenseId;	
+	private String drivingLicenseId;
 
 	/**
-	 * 驾驶证照片 
+	 * 驾驶证照片
 	 */
-	private String drivingLicenseImg;	
+	private String drivingLicenseImg;
 
 	/**
-	 * 车辆行驶证号 
+	 * 车辆行驶证号
 	 */
-	private String vehicleDrivingId;	
+	private String vehicleDrivingId;
 
 	/**
-	 * 车辆行驶证照片 
+	 * 车辆行驶证照片
 	 */
-	private String vehicleDrivingImg;	
+	private String vehicleDrivingImg;
 
 	/**
-	 * 车辆前脸照 
+	 * 车辆前脸照
 	 */
-	private String vehicleImg;	
+	private String vehicleImg;
 
 	/**
-	 * 注册时间 
+	 * 注册时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date registerTime;
 
 	/**
-	 * 是否被锁定 
+	 * 是否被锁定
 	 */
 	private Integer isLock;
 
@@ -160,17 +160,17 @@ public class TbDriver extends Model<TbDriver> implements Serializable {
 
 
 	/**
-	 * 创建者id 
+	 * 创建者id
 	 */
-	private String createBy;	
+	private String createBy;
 
 	/**
-	 * 创建者名称 
+	 * 创建者名称
 	 */
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date createTime;
@@ -178,20 +178,20 @@ public class TbDriver extends Model<TbDriver> implements Serializable {
 
 
 	/**
-	 * 更新者id 
+	 * 更新者id
 	 */
-	private String updateBy;	
+	private String updateBy;
 
 	/**
-	 * 更新者名称 
+	 * 更新者名称
 	 */
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date updateTime;	
+	private Date updateTime;
 
 
 
@@ -202,6 +202,15 @@ public class TbDriver extends Model<TbDriver> implements Serializable {
 	private Integer deleteStatus;
 
 
+	/**
+	 * 贸易区域id
+	 */
+	private Integer tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
 
 
 

sp-service/transport-server/src/main/java/com/pj/project/tb_logistics/TbLogistics.java

@@ -1,6 +1,8 @@
 package com.pj.project.tb_logistics;
 
 import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.EqualsAndHashCode;
@@ -9,8 +11,8 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * Model: tb_logistics -- 物流表
- * @author qzy 
+ * Model: tb_logistics -- 物流订单表
+ * @author qzy
  */
 @Data
 @Accessors(chain = true)
@@ -20,15 +22,15 @@ public class TbLogistics extends Model<TbLogistics> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_logistics";	
+	public static final String TABLE_NAME = "tb_logistics";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-logistics";
 	public static final String PERMISSION_CODE_ADD = "tb-logistics-add";
@@ -40,131 +42,191 @@ public class TbLogistics extends Model<TbLogistics> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 物流表主键 
+	 * 物流订单表主键
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;	
+	private Long id;
+
+	/**
+	 * 订单表ID ---- 当前主键id为物流订单表id，故去掉此字段
+	 */
+	/*private Long ordersId;*/
+
+	/**
+	 * 订单编号
+	 */
+	private String orderNo;
+
+	/**
+	 * 一级市场订单ID
+	 */
+	private Long levelOneOrderId;
+
+	/**
+	 * 二级市场订单ID
+	 */
+	private Long levelTwoOrderId;
+
+	/**
+	 * 贸易区域id
+	 */
+	private Integer tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
+
+	/**
+	 * 装货地址
+	 */
+	private String loadingAddress;
+
+	/**
+	 * 卸货地址
+	 */
+	private String unloadingAddress;
+
+	/**
+	 * 备注
+	 */
+	private String comment;
 
 	/**
-	 * 订单表ID 
+	 * 司机ID
 	 */
-	private Long ordersId;	
+	private Long driverId;
 
 	/**
-	 * (预留字段) 申报订单号 
+	 * 司机名称
 	 */
-	private String declarationNumber;	
+	private String driverName;
 
 	/**
-	 * 订单待确认(0=待确认,1=订单已确认,2=订单确认失败) 
+	 * 司机电话
 	 */
-	private Integer prepare;	
+	private String driverPhone;
 
 	/**
-	 * 订单确认时间 
+	 * 车辆ID
 	 */
-	private String prepareTime;	
+	private Long vehicleId;
 
 	/**
-	 * 待装货(0=待装货,1=已装货) 
+	 * 车牌号
 	 */
-	private Integer loading;	
+	private String vehiclePlate;
 
 	/**
-	 * 已装货时间 
+	 * 车辆类型
 	 */
-	private String loadingTime;	
+	private Integer vehicleType;
 
 	/**
-	 * 发货(0=未发,1=已发) 
+	 * (预留字段) 申报订单号
 	 */
-	private Integer delivery;	
+	private String declarationNumber;
 
 	/**
-	 * 发货时间 
+	 * 订单待司机确认(0=待确认,1=订单已确认,2=订单确认失败)
 	 */
-	private String deliveryTime;	
+	private Integer prepare;
 
 	/**
-	 * 已出海关(0=禁用,1=启用) 
+	 * 订单确认时间
 	 */
-	private Integer clearedCustom;	
+	private Date prepareTime;
 
 	/**
-	 * 出海关时间 
+	 * 待装货(0=待装货,1=已装货)
 	 */
-	private String clearedCustomTime;	
+	private Integer loading;
 
 	/**
-	 * 接货人确定接货(0=禁用,1=启用) 
+	 * 已装货时间
 	 */
-	private Integer makeCargo;	
+	private Date loadingTime;
 
 	/**
-	 * 接货完成时间 
+	 * 发货(0=未发,1=已发)
 	 */
-	private String makeCargoTime;	
+	private Integer delivery;
 
 	/**
-	 * 收购商确认(0=禁用,1=启用) 
+	 * 发货时间
 	 */
-	private Integer confirmReceipt;	
+	private Date deliveryTime;
 
 	/**
-	 * 收货方确认时间(相当于订单完成时间) 
+	 * 已出海关(0=禁用,1=启用)
 	 */
-	private String confirmReceiptTime;	
+	private Integer clearedCustom;
 
 	/**
-	 * 订单状态已完成(0=进行中,1=已完成) 
+	 * 出海关时间
 	 */
-	private Integer orderFinish;	
+	private Date clearedCustomTime;
 
 	/**
-	 * 创建时间 
+	 * 接货人确定接货(0=禁用,1=启用)
 	 */
-	private String createTime;	
+	private Integer makeCargo;
 
 	/**
-	 * 创建人编号 
+	 * 接货完成时间
 	 */
-	private String createBy;	
+	private Date makeCargoTime;
 
 	/**
-	 * 创建人名称 
+	 * 收购商确认(0=禁用,1=启用)
 	 */
-	private String createName;	
+	private Integer confirmReceipt;
 
 	/**
-	 * 更新时间 
+	 * 收货方确认时间(相当于订单完成时间)
 	 */
-	private String updateTime;	
+	private Date confirmReceiptTime;
 
 	/**
-	 * 更新人编号 
+	 * 订单状态已完成(0=进行中,1=已完成)
 	 */
-	private String updateBy;	
+	private Integer orderFinish;
 
 	/**
-	 * 更新人名称 
+	 * 创建时间
 	 */
-	private String updateName;	
+	private Date createTime;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 创建人编号
 	 */
-	private Integer deleteStatus;	
+	private String createBy;
 
 	/**
-	 * 一级市场订单ID 
+	 * 创建人名称
 	 */
-	private Long levelOneOrderId;	
+	private String createName;
 
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
 
+	/**
+	 * 更新人编号
+	 */
+	private String updateBy;
 
+	/**
+	 * 更新人名称
+	 */
+	private String updateName;
 
+	/**
+	 * 删除状态(0=禁用,1=启用)
+	 */
+	private Integer deleteStatus;
 
-	
 
 
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_logistics/TbLogisticsAppController.java

@@ -0,0 +1,74 @@
+package com.pj.project.tb_logistics;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.api.dto.TbLogisticsDto;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * Controller: tb_logistics -- 物流订单表(APP接口)
+ * @author qzy
+ */
+@RestController
+@RequestMapping("/app/TbLogistics/")
+public class TbLogisticsAppController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbLogisticsService tbLogisticsService;
+
+	/** 查 - 根据id */
+	@RequestMapping("getById")
+		@SaCheckPermission(TbLogistics.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbLogistics t = tbLogisticsService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+		@SaCheckPermission(TbLogistics.PERMISSION_CODE)
+	public AjaxJson getList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbLogistics> list = tbLogisticsService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+	/** 增 二级市场订单选择车辆时触发,物流订单在此传入并绑定二级市场订单号*/
+	@RequestMapping("saveLogisticOrder")
+	@SaCheckPermission(TbLogistics.PERMISSION_CODE_ADD)
+	public AjaxJson saveLogisticOrder(TbLogisticsDto logisticsDto) {
+		boolean result = tbLogisticsService.saveLogisticOrder(logisticsDto);
+		if(result) return AjaxJson.getSuccess();
+
+		return AjaxJson.getError();
+	}
+
+	/** 改 根据物流订单Id,修改物流状态*/
+	@RequestMapping("updateLogisticStatus")
+	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
+	public AjaxJson updateLogisticStatus(TbLogisticsDto logisticsDto) {
+		boolean result = tbLogisticsService.saveLogisticOrder(logisticsDto);
+		if(result) return AjaxJson.getSuccess();
+
+		return AjaxJson.getError();
+	}
+
+	/** 查 通过司机Id查物流订单 */
+	@RequestMapping("selectByDriverId")
+	@SaCheckPermission(TbLogistics.PERMISSION_CODE)
+	public AjaxJson selectByDriverId(Long driverId) {
+		List<TbLogistics> list = tbLogisticsService.selectByDriverId(driverId);
+		return AjaxJson.getPageData(Long.valueOf(list.size()), list);
+	}
+
+}

sp-service/transport-server/src/main/java/com/pj/project/tb_logistics/TbLogisticsController.java

@@ -14,8 +14,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 
 
 /**
- * Controller: tb_logistics -- 物流表
- * @author qzy 
+ * Controller: tb_logistics -- 物流订单表
+ * @author qzy
  */
 @RestController
 @RequestMapping("/TbLogistics/")
@@ -34,24 +34,24 @@ public class TbLogisticsController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbLogisticsService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbLogistics.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 */  
+
+	/** 改 */
 	@RequestMapping("update")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbLogistics t){
@@ -59,7 +59,7 @@ public class TbLogisticsController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(TbLogistics.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
@@ -67,74 +67,74 @@ public class TbLogisticsController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 		@SaCheckPermission(TbLogistics.PERMISSION_CODE)
-	public AjaxJson getList() { 
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbLogistics> list = tbLogisticsService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
-	
-	
-	/** 改 - 订单待确认(0=待确认,1=订单已确认,2=订单确认失败) */  
+
+
+
+	/** 改 - 订单待司机确认(0=待确认,1=订单已确认,2=订单确认失败) */
 	@RequestMapping("updatePrepare")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updatePrepare(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "prepare", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 待装货(0=待装货,1=已装货) */  
+
+	/** 改 - 待装货(0=待装货,1=已装货) */
 	@RequestMapping("updateLoading")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateLoading(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "loading", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 发货(0=未发,1=已发) */  
+
+	/** 改 - 发货(0=未发,1=已发) */
 	@RequestMapping("updateDelivery")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDelivery(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "delivery", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 已出海关(0=禁用,1=启用) */  
+
+	/** 改 - 已出海关(0=禁用,1=启用) */
 	@RequestMapping("updateClearedCustom")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateClearedCustom(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "cleared_custom", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 接货人确定接货(0=禁用,1=启用) */  
+
+	/** 改 - 接货人确定接货(0=禁用,1=启用) */
 	@RequestMapping("updateMakeCargo")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateMakeCargo(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "make_cargo", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 收购商确认(0=禁用,1=启用) */  
+
+	/** 改 - 收购商确认(0=禁用,1=启用) */
 	@RequestMapping("updateConfirmReceipt")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateConfirmReceipt(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "confirm_receipt", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 订单状态已完成(0=进行中,1=已完成) */  
+
+	/** 改 - 订单状态已完成(0=进行中,1=已完成) */
 	@RequestMapping("updateOrderFinish")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateOrderFinish(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbLogistics.TABLE_NAME, "order_finish", value, id);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 - 删除状态(0=禁用,1=启用) */  
+
+	/** 改 - 删除状态(0=禁用,1=启用) */
 	@RequestMapping("updateDeleteStatus")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDeleteStatus(Long id, Integer value){

sp-service/transport-server/src/main/java/com/pj/project/tb_logistics/TbLogisticsService.java

@@ -1,10 +1,18 @@
 package com.pj.project.tb_logistics;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.api.dto.TbLogisticsDto;
+import com.pj.common.core.utils.StringUtils;
+import com.pj.current.config.SystemObject;
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
+import com.pj.project.tb_orders.TbOrders;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: tb_logistics -- 物流表
- * @author qzy 
+ * @author qzy
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -46,16 +54,16 @@ public class TbLogisticsService extends ServiceImpl<TbLogisticsMapper, TbLogisti
 		return super.getById(id);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	List<TbLogistics> getList(SoMap so) { 
-		return tbLogisticsMapper.getList(so);	
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	List<TbLogistics> getList(SoMap so) {
+		return tbLogisticsMapper.getList(so);
 	}
 
 	/**
 	 * 通过订单ID表查询物流
 	 */
 	TbLogisticsDto selectByOrderId(Long orderId){
-		List<TbLogistics> tbLogistics = tbLogisticsMapper.selectList(new LambdaQueryWrapper<TbLogistics>().eq(TbLogistics::getOrdersId, orderId).eq(TbLogistics::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
+		List<TbLogistics> tbLogistics = tbLogisticsMapper.selectList(new LambdaQueryWrapper<TbLogistics>().eq(TbLogistics::getId, orderId).eq(TbLogistics::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
 		if(tbLogistics.size() == 0)return null;
 		if(tbLogistics.size() > 1)throw new RuntimeException("当前订单信息存在异常!");
 		//创建返回值对象
@@ -64,4 +72,104 @@ public class TbLogisticsService extends ServiceImpl<TbLogisticsMapper, TbLogisti
 		return tbLogisticsDto;
 	}
 
+	/** 增 二级市场订单选择车辆时触发,物流订单在此传入并绑定二级市场订单号*/
+	boolean saveLogisticOrder(TbLogisticsDto logisticsDto) {
+		if(null == logisticsDto) return false;
+
+		//获取当前登陆人信息
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+
+		TbLogistics logistics = new TbLogistics();
+		BeanUtils.copyProperties(logisticsDto, logistics);
+		//订单编号:WLDD=物流订单
+		logistics.setOrderNo(SystemObject.getREFcode("WLDD",new Date()));
+		//订单待司机确认(0=待确认,1=订单已确认,2=订单确认失败)
+		logistics.setPrepare(0);
+		//待装货(0=待装货,1=已装货)
+		logistics.setLoading(0);
+		//发货(0=未发,1=已发)
+		logistics.setDelivery(0);
+		//已出海关(0=禁用,1=启用)
+		logistics.setClearedCustom(0);
+		//接货人确定接货(0=禁用,1=启用)
+		logistics.setMakeCargo(0);
+		//收购商确认(0=禁用,1=启用)
+		logistics.setConfirmReceipt(0);
+		//订单状态已完成(0=进行中,1=已完成)
+		logistics.setOrderFinish(0);
+		//创建时间
+		logistics.setCreateTime(new Date());
+		//创建人编号
+		logistics.setCreateBy( String.valueOf(appLoginInfo.getLoginId()));
+		//创建人名称
+		logistics.setCreateName(appLoginInfo.getLoginName());
+		//删除状态
+		logistics.setDeleteStatus(1);
+
+		return this.save(logistics);
+	}
+
+	/** 改 根据物流订单Id,修改物流状态*/
+	boolean updateLogisticStatus(TbLogisticsDto logisticsDto) {
+		if(null == logisticsDto) return false;
+
+		TbLogistics logistics = new TbLogistics();
+		BeanUtils.copyProperties(logisticsDto, logistics);
+
+		LambdaUpdateWrapper<TbLogistics> wrapper = new LambdaUpdateWrapper<>();
+		Date nowTime = new Date();
+
+		//订单待司机确认(0=待确认,1=订单已确认,2=订单确认失败)
+		wrapper.set(TbLogistics::getPrepare ,logisticsDto.getPrepare());
+		//订单确认时间
+		if(logisticsDto.getPrepare() != 0)
+			wrapper.set(TbLogistics::getPrepareTime ,nowTime);
+
+		//待装货(0=待装货,1=已装货)
+		wrapper.set(TbLogistics::getLoading ,logisticsDto.getLoading());
+		//已装货时间
+		if(logisticsDto.getLoading() == 1)
+			wrapper.set(TbLogistics::getLoadingTime ,nowTime);
+
+		//发货(0=未发,1=已发)
+		wrapper.set(TbLogistics::getDelivery ,logisticsDto.getDelivery());
+		//发货时间
+		if(logisticsDto.getDelivery() == 1)
+			wrapper.set(TbLogistics::getDeliveryTime ,nowTime);
+
+		//已出海关(0=禁用,1=启用)
+		wrapper.set(TbLogistics::getClearedCustom ,logisticsDto.getClearedCustom());
+		//出海关时间
+		if(logisticsDto.getClearedCustom() == 1)
+			wrapper.set(TbLogistics::getClearedCustomTime ,nowTime);
+
+		//接货人确定接货(0=禁用,1=启用)
+		wrapper.set(TbLogistics::getMakeCargo ,logisticsDto.getMakeCargo());
+		//接货完成时间
+		if(logisticsDto.getMakeCargo() == 1)
+			wrapper.set(TbLogistics::getMakeCargoTime ,nowTime);
+
+		//收购商确认(0=禁用,1=启用)
+		wrapper.set(TbLogistics::getConfirmReceipt ,logisticsDto.getConfirmReceipt());
+		//收货方确认时间(相当于订单完成时间)
+		if(logisticsDto.getConfirmReceipt() == 1)
+			wrapper.set(TbLogistics::getConfirmReceiptTime ,nowTime);
+
+		//根据物流订单Id修改
+		wrapper.eq(TbLogistics::getId ,logisticsDto.getId());
+
+
+		return this.update(wrapper);
+	}
+
+	/** 查 通过司机Id查物流订单 */
+	List<TbLogistics> selectByDriverId(Long driverId) {
+		List<TbLogistics> tbLogistics = tbLogisticsMapper.selectList(
+				new LambdaQueryWrapper<TbLogistics>()
+						.eq(TbLogistics::getDriverId, driverId)
+						.eq(TbLogistics::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
+		if(tbLogistics.size() == 0)return null;
+
+		return tbLogistics;
+	}
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_orders/TbOrders.java

@@ -1,6 +1,8 @@
 package com.pj.project.tb_orders;
 
 import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -12,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * Model: tb_orders -- 订单表
- * @author loovi 
+ * @author loovi
  */
 @Data
 @Accessors(chain = true)
@@ -22,15 +24,15 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_orders";	
+	public static final String TABLE_NAME = "tb_orders";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-orders";
 	public static final String PERMISSION_CODE_ADD = "tb-orders-add";
@@ -42,132 +44,152 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 货运订单管理表主键 
+	 * 货运订单管理表主键
 	 */
 	@TableId(type = IdType.AUTO)
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;	
+	private Long id;
+
+	/**
+	 * 一级市场订单ID
+	 */
+	private Long levelOneOrderId;
 
 	/**
-	 * 一级市场订单ID 
+	 * 订单编号
 	 */
-	private Long levelOneOrderId;	
+	private String orderNo;
 
 	/**
-	 * 订单编号 
+	 * 贸易区域id
 	 */
-	private String orderNo;	
+	private Integer tradeAreaId;
 
 	/**
-	 * 商品id 
+	 * 贸易区域名称
 	 */
-	private Long goodsId;	
+	private String tradeAreaName;
 
 	/**
-	 * 商品名称 
+	 * 商品id
 	 */
-	private String goodsName;	
+	private Long goodsId;
 
 	/**
-	 * 商品来源(国家) 
+	 * 商品名称
 	 */
-	private String goodsFrom;	
+	private String goodsName;
 
 	/**
-	 * 发货商电话 
+	 * 商品来源(国家)
 	 */
-	private String shipperPhone;	
+	private String goodsFrom;
 
 	/**
-	 * 发货商名称 
+	 * 发货商电话
 	 */
-	private String shipperName;	
+	private String shipperPhone;
 
 	/**
-	 * 司机ID 
+	 * 发货商名称
 	 */
-	private Long driverId;	
+	private String shipperName;
 
 	/**
-	 * 司机名称 
+	 * 司机ID
 	 */
-	private String driverName;	
+	private Long driverId;
 
 	/**
-	 * 司机电话 
+	 * 司机名称
 	 */
-	private String driverPhone;	
+	private String driverName;
 
 	/**
-	 * 车型ID 
+	 * 司机电话
 	 */
-	private Long carId;	
+	private String driverPhone;
 
 	/**
-	 * 车型名称 
+	 * 车型ID
 	 */
-	private String carType;	
+	private Long carId;
 
 	/**
-	 * 收货人名称 
+	 * 车型名称
 	 */
-	private String consigneeName;	
+	private String carType;
 
 	/**
-	 * 收货人电话号码 
+	 * 收货人名称
 	 */
-	private String consigneePhone;	
+	private String consigneeName;
 
 	/**
-	 * (预留字段) 申报订单号 
+	 * 收货人电话号码
 	 */
-	private String declarationNumber;	
+	private String consigneePhone;
 
 	/**
-	 * 订单状态已完成 (0=禁用,1=启用) 
+	 * (预留字段) 申报订单号
 	 */
-	private Integer orderFinish;	
+	private String declarationNumber;
 
 	/**
-	 * 创建时间 
+	 * 订单状态已完成 (0=禁用,1=启用)
 	 */
-	private String createTime;	
+	private Integer orderFinish;
 
 	/**
-	 * 创建人编号 
+	 * 装货地址
 	 */
-	private String createBy;	
+	private String loadingAddress;
 
 	/**
-	 * 创建人名称 
+	 * 卸货地址
 	 */
-	private String createName;	
+	private String unloadingAddress;
 
 	/**
-	 * 更新时间 
+	 * 备注
 	 */
-	private String updateTime;	
+	private String comment;
 
 	/**
-	 * 更新人编号 
+	 * 创建时间
 	 */
-	private String updateBy;	
+	private Date createTime;
 
 	/**
-	 * 更新人名称 
+	 * 创建人编号
 	 */
-	private String updateName;	
+	private String createBy;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 创建人名称
 	 */
-	private Integer deleteStatus;	
+	private String createName;
 
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
 
+	/**
+	 * 更新人编号
+	 */
+	private String updateBy;
 
+	/**
+	 * 更新人名称
+	 */
+	private String updateName;
 
+	/**
+	 * 删除状态(0=禁用,1=启用)
+	 */
+	private Integer deleteStatus;
 
-	
 
 
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicle.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * Model: tb_vehicle -- 车辆
- * @author loovi 
+ * @author loovi
  */
 @Data
 @Accessors(chain = true)
@@ -24,15 +24,15 @@ public class TbVehicle extends Model<TbVehicle> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_vehicle";	
+	public static final String TABLE_NAME = "tb_vehicle";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-vehicle";
 	public static final String PERMISSION_CODE_ADD = "tb-vehicle-add";
@@ -44,105 +44,135 @@ public class TbVehicle extends Model<TbVehicle> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键 
+	 * 主键
 	 */
 	@TableId(type = IdType.AUTO)
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;	
+	private Long id;
 
 	/**
-	 * 车牌 
+	 * 车牌
 	 */
-	private String vehiclePlate;	
+	private String vehiclePlate;
 
 	/**
-	 * 所有人 
+	 * 贸易区域id
 	 */
-	private String owner;	
+	private Integer tradeAreaId;
 
 	/**
-	 * 车辆类型 
+	 * 贸易区域名称
 	 */
-	private Integer vehicleType;	
+	private String tradeAreaName;
 
 	/**
-	 * 类型父id 
+	 * 所有人
 	 */
-	private Integer parentId;	
+	private String owner;
 
 	/**
-	 * 车辆尺寸 
+	 * 司机ID
 	 */
-	private String vehicleSize;	
+	private Long driverId;
 
 	/**
-	 * 车辆品牌型号 
+	 * 司机名称
 	 */
-	private String vehicleModel;	
+	private String driverName;
 
 	/**
-	 * 核定载质量 
+	 * 司机电话
 	 */
-	private String vehicleLoad;	
+	private String driverPhone;
 
 	/**
-	 * 车辆自重 
+	 * 车辆类型
 	 */
-	private String vehicleWeight;	
+	private Integer vehicleType;
 
 	/**
-	 * 创建者id 
+	 * 类型父id
 	 */
-	private String createBy;	
+	private Integer parentId;
 
 	/**
-	 * 创建者姓名 
+	 * 车辆尺寸
 	 */
-	private String createName;	
+	private String vehicleSize;
 
 	/**
-	 * 创建时间 
+	 * 车辆品牌型号
+	 */
+	private String vehicleModel;
+
+	/**
+	 * 核定载质量
+	 */
+	private String vehicleLoad;
+
+	/**
+	 * 车辆自重
+	 */
+	private String vehicleWeight;
+
+	/**
+	 * 车辆状态(1=空闲 2=作业中)
+	 */
+	private Integer vehicleStatus;
+
+	/**
+	 * 创建者id
+	 */
+	private String createBy;
+
+	/**
+	 * 创建者姓名
+	 */
+	private String createName;
+
+	/**
+	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTime;	
+	private Date createTime;
 
 	/**
-	 * 更新者id 
+	 * 更新者id
 	 */
-	private String updateBy;	
+	private String updateBy;
 
 	/**
-	 * 更新者名称 
+	 * 更新者名称
 	 */
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
-	private Date updateTime;	
+	private Date updateTime;
 
 	/**
-	 * 删除状态 
+	 * 删除状态
 	 */
 	private Integer deleteStatus;
 
 	/**
-	 * 审核状态(0=待审核，1=已通过，2=不通过) 
+	 * 审核状态(0=待审核，1=已通过，2=不通过)
 	 */
-	private Integer auditStatus;	
+	private Integer auditStatus;
 
 	/**
-	 * 审核人 
+	 * 审核人
 	 */
-	private String auditBy;	
+	private String auditBy;
 
 	/**
-	 * 审核不通过原因 
+	 * 审核不通过原因
 	 */
-	private String nopassReason;	
+	private String nopassReason;
 
 	/**
-	 * 审核时间 
+	 * 审核时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date auditTime;
@@ -151,7 +181,7 @@ public class TbVehicle extends Model<TbVehicle> implements Serializable {
 
 
 
-	
+
 
 
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicleAppController.java

@@ -0,0 +1,61 @@
+package com.pj.project.tb_vehicle;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+
+/**
+ * Controller: tb_vehicle -- 车辆(app接口)
+ * @author lbl
+ */
+@RestController
+@RequestMapping("/app/TbVehicle/")
+public class TbVehicleAppController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbVehicleService tbVehicleService;
+
+
+	/** 查 - 根据车牌号查车辆信息 */
+	@RequestMapping("getByVehiclePlate")
+	@SaCheckPermission(TbVehicle.PERMISSION_CODE)
+	public AjaxJson getByVehiclePlate(String vehiclePlate){
+		TbVehicle t = tbVehicleService.getByVehiclePlate(vehiclePlate);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+	@SaCheckPermission(TbVehicle.PERMISSION_CODE)
+	public AjaxJson getList() {
+		SoMap so = SoMap.getRequestSoMap();
+		so.set("deleteStatus", 1);
+		List<TbVehicle> list = tbVehicleService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+	/** 改 - 根据车辆Id修改车辆状态 */
+	@RequestMapping("updateStatusByVehicleId")
+	@SaCheckPermission(TbVehicle.PERMISSION_CODE_EDIT)
+	public AjaxJson updateStatusByVehicleId(TbVehicleVo vehicleVo) {
+		boolean result = tbVehicleService.updateStatusByVehicleId(vehicleVo);
+		if(result) return AjaxJson.getSuccess();
+
+		return AjaxJson.getError();
+	}
+
+}

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicleService.java

@@ -7,6 +7,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.project.tb_driver.TbDriver;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +26,7 @@ import javax.swing.filechooser.FileSystemView;
 
 /**
  * Service: tb_vehicle -- 车辆
- * @author loovi 
+ * @author loovi
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -59,11 +60,37 @@ public class TbVehicleService extends ServiceImpl<TbVehicleMapper, TbVehicle> im
 		return super.getById(id);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	List<TbVehicle> getList(SoMap so) { 
-		return tbVehicleMapper.getList(so);	
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	List<TbVehicle> getList(SoMap so) {
+		return tbVehicleMapper.getList(so);
 	}
 
+	/** 查 - 根据车牌号查车辆信息 */
+	TbVehicle getByVehiclePlate(String vehiclePlate) {
+
+		TbVehicle tbVehicle = tbVehicleMapper.selectOne(new LambdaQueryWrapper<TbVehicle>()
+				.eq(TbVehicle::getVehiclePlate, vehiclePlate) //车牌号
+				.eq(TbVehicle::getVehicleStatus, 1)//车辆状态:1=空闲
+				.eq(TbVehicle::getDeleteStatus, 1));
+		return tbVehicle;
+	}
+
+	/** 改 - 根据车辆Id修改车辆状态 */
+	boolean updateStatusByVehicleId(TbVehicleVo vehicleVo) {
+
+		LambdaUpdateWrapper<TbVehicle> wrapper = new LambdaUpdateWrapper<>();
+		wrapper.set(TbVehicle::getVehicleStatus, vehicleVo.getVehicleStatus());
+		wrapper.eq(TbVehicle::getId, vehicleVo.getId());
+
+		return this.update(wrapper);
+	}
+
+	/** TODO: 向第三方系统发送车辆状态（预留发送接口） */
+	void sendVehicleStatus(){
+
+	}
+
+
 	/**
 	 * 导入
 	 * @param file excel文件

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicleVo.java

@@ -0,0 +1,132 @@
+package com.pj.project.tb_vehicle;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Model: tb_vehicle -- 车辆
+ * @author lbl
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TbVehicleVo {
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键
+	 */
+	private Long id;
+
+	/**
+	 * 车牌
+	 */
+	private String vehiclePlate;
+
+	/**
+	 * 贸易区域id
+	 */
+	private Integer tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
+
+	/**
+	 * 所有人
+	 */
+	private String owner;
+
+	/**
+	 * 司机ID
+	 */
+	private Long driverId;
+
+	/**
+	 * 司机名称
+	 */
+	private String driverName;
+
+	/**
+	 * 司机电话
+	 */
+	private String driverPhone;
+
+	/**
+	 * 车辆类型
+	 */
+	private Integer vehicleType;
+
+	/**
+	 * 类型父id
+	 */
+	private Integer parentId;
+
+	/**
+	 * 车辆尺寸
+	 */
+	private String vehicleSize;
+
+	/**
+	 * 车辆品牌型号
+	 */
+	private String vehicleModel;
+
+	/**
+	 * 核定载质量
+	 */
+	private String vehicleLoad;
+
+	/**
+	 * 车辆自重
+	 */
+	private String vehicleWeight;
+
+	/**
+	 * 车辆状态(1=空闲 2=作业中)
+	 */
+	private Integer vehicleStatus;
+
+	/**
+	 * 删除状态
+	 */
+	private Integer deleteStatus;
+
+	/**
+	 * 审核状态(0=待审核，1=已通过，2=不通过)
+	 */
+	private Integer auditStatus;
+
+	/**
+	 * 审核人
+	 */
+	private String auditBy;
+
+	/**
+	 * 审核不通过原因
+	 */
+	private String nopassReason;
+
+	/**
+	 * 审核时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date auditTime;
+
+
+}