骑行前绕车检查

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());

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")

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,

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;

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();

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();

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;
 }

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"
             <if test="returnMode != null and returnMode != ''">return_mode,</if>
             <if test="returnLon != null ">return_lon,</if>
             <if test="returnLat != null">return_lat,</if>
+            <if test="checkVideo != null">check_video,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -162,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="returnMode != null and returnMode != ''">#{returnMode},</if>
             <if test="returnLon != null">#{returnLon},</if>
             <if test="returnLat != null">#{returnLat},</if>
+            <if test="checkVideo != null">#{checkVideo},</if>
          </trim>
     </insert>
 
@@ -195,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.returnMode != null and data.returnMode != ''">return_mode = #{data.returnMode},</if>
         <if test="data.returnLon != null">return_lon = #{data.returnLon},</if>
         <if test="data.returnLat != null">return_lat = #{data.returnLat},</if>
+        <if test="data.checkVideo != null">check_video = #{data.checkVideo},</if>
     </sql>
 
     <delete id="deleteOrderDeviceById" parameterType="Long">