diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaConverterImpl.java index 048f259..c2e0b4b 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaConverterImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaConverterImpl.java @@ -25,6 +25,7 @@ public class AreaConverterImpl implements AreaConverter { po.setAreaTimeEnd(data.getAreaTimeEnd()); // 骑行设置 + po.setNeedCheckVideo(data.getNeedCheckVideo()); po.setUndercharge(data.getUndercharge()); po.setAuthentication(data.getAuthentication()); po.setMsgSwitch(data.getMsgSwitch()); @@ -68,6 +69,7 @@ public class AreaConverterImpl implements AreaConverter { po.setAreaTimeEnd(data.getAreaTimeEnd()); // 骑行设置 + po.setNeedCheckVideo(data.getNeedCheckVideo()); po.setUndercharge(data.getUndercharge()); po.setAuthentication(data.getAuthentication()); po.setMsgSwitch(data.getMsgSwitch()); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/DeviceVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/DeviceVO.java index 38f5d47..518d346 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/DeviceVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/DeviceVO.java @@ -71,6 +71,8 @@ public class DeviceVO extends Device { private BigDecimal areaVehicleManagementFee; @ApiModelProperty("是否必须停车点还车") private Boolean areaParkingReturn; + @ApiModelProperty("是否需要检查视频") + private Boolean areaNeedCheckVideo; // 订单设备 @ApiModelProperty("当前订单ID") diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml index 027d8ee..4e42585 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml @@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ba.dispatch_fee as area_dispatch_fee, ba.vehicle_management_fee as area_vehicle_managerment_fee, ba.parking_return as area_parking_return, + ba.need_check_video as area_need_check_video, basu.point as area_user_point, basu.nick_name as area_user_name, basu.agent_id as area_agent_id, diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/dto/OrderCreateDTO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/dto/OrderCreateDTO.java index 58fa33f..2cc0216 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/dto/OrderCreateDTO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/dto/OrderCreateDTO.java @@ -36,6 +36,9 @@ public class OrderCreateDTO implements LogBizParam { @ApiModelProperty("挂账用户ID") private Long creditUserId; + @ApiModelProperty("绕车检查视频") + private String checkVideo; + @Override public Object logBizId() { return suitId; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderConverterImpl.java index 03c6d71..bef5754 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderConverterImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderConverterImpl.java @@ -238,6 +238,12 @@ public class OrderConverterImpl implements OrderConverter{ return null; } OrderDevice orderDevice = new OrderDevice(); + + OrderCreateDTO dto = bo.getDto(); + // 参数 + if (dto != null) { + orderDevice.setCheckVideo(dto.getCheckVideo()); + } // 设备 DeviceVO device = bo.getDevice(); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderValidatorImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderValidatorImpl.java index 323c3cf..f0c0528 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderValidatorImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderValidatorImpl.java @@ -78,6 +78,8 @@ public class OrderValidatorImpl implements OrderValidator{ // 设备 DeviceVO device = bo.getDevice(); this.canUseDevice(device, null); + boolean needCheckVideo = device.getAreaNeedCheckVideo() != null && device.getAreaNeedCheckVideo(); + ServiceUtil.assertion(needCheckVideo && StringUtils.isBlank(dto.getCheckVideo()), "请上传绕车检查视频:设备ID=" + device.getId()); // 套餐 SuitVO suit = bo.getSuit(); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDevice.java b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDevice.java index 2c0154a..ee73a0c 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDevice.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDevice.java @@ -107,4 +107,8 @@ public class OrderDevice extends BaseEntity @ApiModelProperty("还车纬度") private BigDecimal returnLat; + + @Excel(name = "骑行前检查视频") + @ApiModelProperty("骑行前检查视频") + private String checkVideo; } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml index 55eaad0..da1eb9d 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bod.return_mode, bod.return_lon, bod.return_lat, + bod.check_video, bo.no as order_no, bo.user_id as order_user_id, bo.start_time as order_start_time, @@ -138,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" return_mode, return_lon, return_lat, + check_video, #{id}, @@ -162,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{returnMode}, #{returnLon}, #{returnLat}, + #{checkVideo}, @@ -195,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" return_mode = #{data.returnMode}, return_lon = #{data.returnLon}, return_lat = #{data.returnLat}, + check_video = #{data.checkVideo},