新增汽车预定时间信息表

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderVehicaleCrosstown.java

@@ -114,9 +114,11 @@ public class OrderVehicaleCrosstown {
     /**
      * 是否有扣除项
      */
-    private Boolean isDed;
+    private Boolean deduction;
     /**
-     * 扣除项明细
+     * 扣除项明细 json
+     *  deductions: 扣除项
+     *  cost:费用
      */
     private String dedDetail;
 
@@ -129,4 +131,14 @@ public class OrderVehicaleCrosstown {
      *  1、交车， 2、还车
      */
     private Integer type;
+
+    /**
+     * 合计扣除费用
+     */
+    private Integer deductionCost;
+
+    /**
+     * 剩余押金
+     */
+    private Integer restDeposit;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/XxlJobConfig.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xuxueli 2017-04-28
  */
 @Slf4j
-//@Configuration
+@Configuration
 public class XxlJobConfig {
 
     @Value("${xxl.job.admin.addresses}")

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/HttpJobHandler.java

@@ -4,24 +4,31 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHandler;
 import com.xxl.job.core.log.XxlJobLogger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.io.BufferedReader;
-
 /**
  * 跨平台Http任务
  *
  * @author xuxueli 2018-09-16 03:48:34
  */
-//@JobHandler(value = "httpJobHandler")
-//@Component
+@JobHandler(value = "httpJobHandler")
+@Component
+@Slf4j
 public class HttpJobHandler extends IJobHandler {
 
     @Override
     public ReturnT<String> execute(String param) throws Exception {
         try {
+            for(int i =0; i < 10; i++) {
                 XxlJobLogger.log("helloword");
-            return SUCCESS;
+                log.info("helloword");
+            }
+            ReturnT returnT = new ReturnT();
+            returnT.setCode(100);
+            returnT.setMsg("成功");
+            returnT.setContent(param);
+            return returnT;
         } catch (Exception e) {
             XxlJobLogger.log(e);
             return FAIL;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -84,18 +84,9 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())));
     }
 
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
-    @ApiOperation(value = "订单列表")
-    @IgnoreClientToken
-    public ObjectRestResponse<PageDataVO<OrderPageVO>> getOrderList(QueryOrderDTO dto) {
-        Query query = new Query(dto);
-        return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.selectListAll()));
-    }
-
     @RequestMapping(value = "/getOrderList", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "订单列表")
+    @ApiOperation(value = "获取后台订单列表")
     @IgnoreClientToken
     public ObjectRestResponse<PageDataVO<OrderPageVO>> selectByUser(QueryOrderList dto) {
         if (dto.getStartTime() != null) {
@@ -130,7 +121,7 @@ public class BaseOrderController extends CommonBaseController {
 
     @RequestMapping(value = "/getVehicleList", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "交还车订单列表")
+    @ApiOperation(value = "交还车租车订单列表")
     @IgnoreClientToken
     public ObjectRestResponse<List<OrderPageVO>> getVehicleList(QueryOrderList dto) {
         if (dto.getStartTime() != null) {
@@ -146,7 +137,7 @@ public class BaseOrderController extends CommonBaseController {
 
     @RequestMapping(value = "/getTourList", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "交还车订单列表")
+    @ApiOperation(value = "交还车旅游订单列表")
     @IgnoreClientToken
     public ObjectRestResponse<List<OrderPageVO>> getTourList(QueryOrderList dto) {
         if (dto.getStartTime() != null) {

xx-order/xx-order-server/src/main/resources/mapper/OrderVehicaleCrosstownMapper.xml

@@ -24,9 +24,11 @@
     <result column="upd_time" jdbcType="BIGINT" property="updTime" />
     <result column="vehicle_key" jdbcType="LONGVARCHAR" property="vehicleKey"/>
     <result column="license_id_card" jdbcType="VARCHAR" property="licenseIdCard"/>
-    <result column="is_ded" jdbcType="BIT" property="isDeD" />
+    <result column="deduction" jdbcType="BIT" property="deduction" />
     <result column="ded_detail" jdbcType="LONGVARCHAR" property="dedDetail" />
     <result column="type" jdbcType="INTEGER" property="type"/>
+      <result column="deduction_cost" jdbcType="INTEGER" property="deductionCost"/>
+      <result column="rest_deposit" jdbcType="INTEGER" property="restDeposit"/>
   </resultMap>
 
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.entity.OrderVehicaleCrosstown" resultMap="BaseResultMap">

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookHourInfo.java

+package com.xxfc.platform.vehicle.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Table(name = "vehicle_book_hour_info")
+public class VehicleBookHourInfo {
+    @Id
+    private Integer id;
+
+    @Column(name = "vehicle_id")
+    private String vehicleId;
+
+    @Column(name = "year_month_day")
+    private String yearMonthDay;
+
+    @Column(name = "booked_hour")
+    private Integer bookedHour;
+
+    @Column(name = "create_time")
+    private Date createTime;
+
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return vehicle_id
+     */
+    public String getVehicleId() {
+        return vehicleId;
+    }
+
+    /**
+     * @param vehicleId
+     */
+    public void setVehicleId(String vehicleId) {
+        this.vehicleId = vehicleId;
+    }
+
+    /**
+     * @return year_month_day
+     */
+    public String getYearMonthDay() {
+        return yearMonthDay;
+    }
+
+    /**
+     * @param yearMonthDay
+     */
+    public void setYearMonthDay(String yearMonthDay) {
+        this.yearMonthDay = yearMonthDay;
+    }
+
+    /**
+     * @return booked_hour
+     */
+    public Integer getBookedHour() {
+        return bookedHour;
+    }
+
+    /**
+     * @param bookedHour
+     */
+    public void setBookedHour(Integer bookedHour) {
+        this.bookedHour = bookedHour;
+    }
+
+    /**
+     * @return create_time
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * @param createTime
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * @return update_time
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * @param updateTime
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -37,4 +37,10 @@ public interface VehicleFeign {
 
     @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
     public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);
+
+    @RequestMapping(value = "/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
+    public RestResponse<Integer> unbookVehicle(@PathVariable Long bookRecordId);
+
+    @RequestMapping(value = "/book/4employee/prove/{bookRecordId}", method = RequestMethod.PUT)
+    public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookHourInfoMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleBookHourInfo;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface VehicleBookHourInfoMapper extends Mapper<VehicleBookHourInfo> {
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -202,6 +202,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      * @return
      */
     @RequestMapping(value = "/book/4employee/prove/{bookRecordId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "预定车辆审核通过")
     public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
@@ -215,6 +216,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      * @return
      */
     @RequestMapping(value = "/book/4employee/reject/{bookRecordId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "拒绝预定车辆")
     public RestResponse<Integer> rejectVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
@@ -242,6 +244,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      * @return
      */
     @RequestMapping(value = "/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "取消预定车辆")
     public RestResponse<Integer> unbookVehicle(@PathVariable Long bookRecordId) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
@@ -249,6 +252,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
     }
 
     @RequestMapping(value = "/bookedRecord/{bookEndDate}/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取预定记录")
     public RestResponse<QueryVehicleBookRecordVo> getBookedRecord(@PathVariable String bookEndDate, @PathVariable Long id) throws Exception {
         try {
             return RestResponse.codeAndData(RestResponse.SUC_CODE, vehicleBookRecordBiz.getById(id, DateTime.parse(bookEndDate, DEFAULT_FORMATTER)));
@@ -262,6 +266,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
 
     @RequestMapping(value = "/bookedRecord", method = RequestMethod.GET)
+    @ApiOperation(value = "获取多个预定记录")
     public RestResponse<PageDataVO<QueryVehicleBookRecordVo>> getBookedRecord(@RequestParam String vehicleBookRecordQueryVoJson) throws Exception {
 
         VehicleBookRecordQueryVo vehicleBookRecordQueryVo = null;
@@ -283,6 +288,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      * @return
      */
     @RequestMapping(value = "/book/4employee/lift", method = RequestMethod.PUT)
+    @ApiOperation(value = "提车")
     public RestResponse<Integer> liftVehicle(@RequestBody LiftVehicleVo liftVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
@@ -296,6 +302,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      * @return
      */
     @RequestMapping(value = "/book/4employee/ret", method = RequestMethod.PUT)
+    @ApiOperation(value = "还车")
     public RestResponse<Integer> retVehicle(@RequestBody RetVehicleVo retVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();

xx-vehicle/xx-vehicle-server/src/main/resources/builder/generatorConfig.xml

@@ -15,9 +15,9 @@
         </plugin>
 
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://localhost:3306/vehicle?useUnicode=true&amp;characterEncoding=UTF8"
+                        connectionURL="jdbc:mysql://10.5.52.3:3306/vehicle?useUnicode=true&amp;characterEncoding=UTF8"
                         userId="root"
-                        password="xx2019fc">
+                        password="sslcloud123*()">
         </jdbcConnection>
 
         <javaModelGenerator targetPackage="${targetModelPackage}" targetProject="${targetJavaProject}"/>
@@ -37,7 +37,7 @@
 <!--        </table>-->
 <!--        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
 <!--        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
-        <table tableName="vehicle_upkeep_item" domainObjectName="VehicleUpkeepItem"></table>
-        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>
+        <table tableName="vehicle_book_hour_info" domainObjectName="VehicleBookHourInfo"></table>
+<!--        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
     </context>
 </generatorConfiguration>
\ No newline at end of file