修改订单

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java

@@ -32,6 +32,15 @@ public class DriverCarInfoController {
         return driverCarInfoService.selectCar(driverCarInfo);
     }
 
+    /**
+     * 司机车辆列表
+     * @return
+     */
+    @GetMapping("/selectDriverCar")
+    public List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo){
+        return driverCarInfoService.selectDriverCar(driverCarInfo);
+    }
+
     /**
      * 添加信息
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverCarInfoService.java

@@ -22,6 +22,13 @@ public interface IDriverCarInfoService extends IService<DriverCarInfo> {
      */
     List<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo);
 
+    /**
+     * 司机车辆列表
+     * @param driverCarInfo
+     * @return
+     */
+    List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo);
+
     /**
      * 添加车辆信息
      * @param driverCarInfo

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -44,6 +44,21 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
         return driverCarInfoList;
     }
 
+    /**
+     *司机车辆列表
+     * @param driverCarInfo
+     * @return
+     */
+    @Override
+    public List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo) {
+        EntityWrapper<DriverCarInfo> driverCarInfoEntityWrapper = new EntityWrapper<>();
+        driverCarInfoEntityWrapper
+                .eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .eq(DriverCarInfo.QueryFiles.DRIVER_ID,driverCarInfo.getDriverId());
+        List<DriverCarInfo> driverCarInfoList = this.selectList(driverCarInfoEntityWrapper);
+        return driverCarInfoList;
+    }
+
     /**
      * 添加车辆信息
      * @param driverCarInfo

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -187,8 +187,8 @@
         distance,
         freight,
         billing_method as billingMethod,
-        order_status as orderStatus,
-        order_status_key as orderStatusKey,
+        cargo_owner_status as cargoOwnerStatus,
+        cargo_owner_status_key as cargoOwnerStatusKey,
         create_date as createDate,
         update_date as updateDate
         FROM order_info