diff --git a/src/main/java/com/sczx/car/dto/StoreCarDTO.java b/src/main/java/com/sczx/car/dto/StoreCarDTO.java index 5b2f265..f917520 100644 --- a/src/main/java/com/sczx/car/dto/StoreCarDTO.java +++ b/src/main/java/com/sczx/car/dto/StoreCarDTO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @ApiModel(value = "门店车辆信息") @Data public class StoreCarDTO { @@ -16,6 +18,12 @@ public class StoreCarDTO { @ApiModelProperty("车牌号码") private String licensePlate; + @ApiModelProperty("IoT设备状态") + private String iotStatus; + + @ApiModelProperty("IoT识别码") + private String iotCode; + @ApiModelProperty("车辆品牌ID") private Long brandId; @@ -34,9 +42,21 @@ public class StoreCarDTO { @ApiModelProperty("支持电池类型(48V标准版/100km,48V超长版/200km等)") private String batteryType; + @ApiModelProperty("最高时速(km/h)") + private Integer maxSpeed; + + @ApiModelProperty("整车重量(kg)") + private BigDecimal weight; + @ApiModelProperty("门店车辆状态") private String storeCarStatus; @ApiModelProperty("逾期天数") private Integer overdueDays; + + @ApiModelProperty("订单号") + private String orderNo; + + @ApiModelProperty("订单状态") + private String orderStatus; } diff --git a/src/main/resources/mapper/CarMapper.xml b/src/main/resources/mapper/CarMapper.xml index c953cec..2fdecbb 100644 --- a/src/main/resources/mapper/CarMapper.xml +++ b/src/main/resources/mapper/CarMapper.xml @@ -31,7 +31,11 @@ zom.order_status, zom.order_no, zc.update_time, - zc.store_id + zc.store_id, + zc.iot_code, + zc.iot_status, + zcm.max_speed, + zcm.weight from zc_car zc left join (