Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

# Conflicts:
#	ace-modules/ace-generator/src/main/resources/generator.properties

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java

@@ -46,7 +46,9 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(BaseException.class)
     public BaseResponse baseExceptionHandler(HttpServletResponse response, BaseException ex) {
         logger.error(ex.getMessage(),ex);
+        if(0 == ex.getStatus()) {
             response.setStatus(500);
+        }
         return new BaseResponse(ex.getStatus(), ex.getMessage());
     }
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/ObjectRestResponse.java

 package com.github.wxiaoqi.security.common.msg;
 
+import com.github.wxiaoqi.security.common.constant.RestCode;
+
 /**
  * Created by Ace on 2017/6/11.
  */
@@ -45,4 +47,7 @@ public class ObjectRestResponse<T> extends BaseResponse {
         this.data = data;
     }
 
+    public static ObjectRestResponse success() {
+        return new ObjectRestResponse().status(RestCode.SUCCESS.getStatus()).msg(RestCode.SUCCESS.getMsg()).rel(true);
+    }
 }

ace-modules/ace-generator/src/main/resources/generator.properties

 #代码生成器，配置信息
 
 #包名
+<<<<<<< HEAD
 package=com.xxfc.platform.tour
+=======
+package=com.xxfc.platform.order
+>>>>>>> 31d78b508ffcffdbbd8def10acf3d953fbc0c855
 #作者
 author=zjw
 #Email

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderStatusEnum.java

@@ -20,13 +20,6 @@ public enum OrderStatusEnum {
     private String desc;
 
     private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
-            //Maps.newHashMap();
-
-//    static{
-//        for(VehicleBookRecordStatus constantType : VehicleBookRecordStatus.values()){
-//            codeAndDesc.put(constantType.getCode(),constantType.getDesc());
-//        }
-//    }
 
     OrderStatusEnum(Integer code, String desc){
         this.code=code;

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

@@ -97,6 +97,13 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "名称")
 	private String name;
 
+	/**
+	 * 取消原因
+	 */
+	@Column(name = "cancel_reason")
+	@ApiModelProperty(value = "取消原因")
+	private String cancelReason;
+	
 	    //创建时间
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )

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

+package com.xxfc.platform.order.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 费用明细
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-04 22:14:33
+ */
+@Data
+@Table(name = "order_template")
+public class OrderTemplate implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    //主键
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    //模板名称
+    @Column(name = "name")
+	@ApiModelProperty(value = "模板名称")
+    private String name;
+	
+	    //模板内容
+    @Column(name = "template")
+	@ApiModelProperty(value = "模板内容")
+    private String template;
+	
+	    //代号
+    @Column(name = "code")
+	@ApiModelProperty(value = "代号")
+    private String code;
+	
+	    //
+    @Column(name = "param_key")
+	@ApiModelProperty(value = "")
+    private String paramKey;
+	
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/AddRentVehicleDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddRentVehicleDTO.java

-package com.xxfc.platform.order.vo;
+package com.xxfc.platform.order.pojo;
 
-import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 
 @Data
 public class AddRentVehicleDTO{

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/CancelOrderDTO.java

+package com.xxfc.platform.order.pojo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CancelOrderDTO {
+    @ApiModelProperty(value = "取消原因")
+    private String cancelReason;
+}
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/order/OrderDetailVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderDetailVO.java

-package com.xxfc.platform.order.vo.order;
+package com.xxfc.platform.order.pojo.order;
 
-import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import lombok.Data;
 
-import java.util.Map;
-
 @Data
 public class OrderDetailVO extends OrderPageVO {
     VehicleModel vehicleModel;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/order/OrderPageVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

-package com.xxfc.platform.order.vo.order;
+package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.BaseOrder;
 import lombok.Data;
 
-import java.util.List;
 import java.util.Map;
 
 @Data

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/order/RentVehicleBO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

-package com.xxfc.platform.order.vo.order;
+package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.vo.price.RentVehiclePriceVO;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import lombok.Data;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/pay/RentVehicleOrderPayVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/pay/RentVehicleOrderPayVO.java

-package com.xxfc.platform.order.vo.pay;
+package com.xxfc.platform.order.pojo.pay;
 
-import com.xxfc.platform.universal.vo.OrderPayVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/price/OrderPriceVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/OrderPriceVO.java

-package com.xxfc.platform.order.vo.price;
+package com.xxfc.platform.order.pojo.price;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/price/RentVehiclePriceVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/RentVehiclePriceVO.java

-package com.xxfc.platform.order.vo.price;
+package com.xxfc.platform.order.pojo.price;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.math.BigDecimal;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

 package com.xxfc.platform.order.biz;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
-import com.xxfc.platform.order.vo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +27,23 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     public List<OrderPageVO> pageByParm(Map<String, Object> paramMap){
         return mapper.pageByParm(paramMap);
     }
+    private static Map<Integer, List<Integer>> cancelAble;
+    static {
+        cancelAble = new HashMap<Integer, List<Integer>>();
+        cancelAble.put(OrderTypeEnum.RentVehicle.getCode(), new LinkedList<Integer>(){{
+            add(OrderStatusEnum.ORDER_UNPAY.getCode());
+        }});
+    }
+
+    public void cancel(BaseOrder baseOrder) {
+        if(cancelAble.get(baseOrder.getType()).contains(baseOrder.getStatus())) {
+            this.updateSelectiveById(new BaseOrder(){{
+                setId(baseOrder.getId());
+                setStatus(OrderStatusEnum.ORDER_CANCEL.getCode());
+                setCancelReason(baseOrder.getCancelReason());
+            }});
+        }else {
+            throw new BaseException(ResultCode.FAILED_CODE);
+        }
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java

+package com.xxfc.platform.order.biz;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.extra.template.Template;
+import cn.hutool.extra.template.TemplateEngine;
+import cn.hutool.extra.template.TemplateUtil;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.OrderTemplate;
+import com.xxfc.platform.order.mapper.OrderTemplateMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 费用明细
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-04 22:14:33
+ */
+@Service
+public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate> {
+
+    public String result (OrderTemplate orderTemplate, Dict dict) {
+//        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
+//        OrderCostDetail orderCostDetail = orderCostDetailBiz.selectById(OrderCostEnum.RentVehicle.getCode());
+//        Template template = engine.getTemplate(orderCostDetail.getTemplate());
+//        String result = template.render(Dict.parse(pojo));
+//        pojo.setCostDetail(result);
+        List<OrderTemplate> all = this.selectListAll();
+        Map<String, Object> allCodeMap = all.parallelStream().collect(Collectors.toMap(item -> "tem_"+ item.getCode(), OrderTemplate::getTemplate));
+        List<String> codes = all.parallelStream().map(OrderTemplate::getCode).collect(Collectors.toList());
+
+        String result = "";
+        TemplateEngine engine = TemplateUtil.createEngine();
+        //匹配模板 ParamKey() 判断是否存在别的模板
+        List<String> list = Arrays.asList(orderTemplate.getParamKey().split(",")).parallelStream().filter(item -> codes.contains(item)).collect(Collectors.toList());
+        if(list.size() > 0) {
+            allCodeMap.remove("tem_0101");
+            Template template = engine.getTemplate(orderTemplate.getTemplate());
+            result = template.render(new Dict(allCodeMap));
+        }
+
+        //匹配参数 填充参数
+        return result;
+    }
+
+//    public Map<String, OrderTemplate> allCodeMap() {
+//       return this.selectListAll().parallelStream().collect(Collectors.toMap(OrderTemplate::getCode, template -> template));
+//    }
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.config;
+
+
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class PlatformExceptionHandler {
+
+    @ExceptionHandler(BaseException.class)
+    public BaseResponse baseExceptionHandler(BaseException e) {
+        return new BaseResponse(e.getStatus(), e.getMessage());
+    }
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.vo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderTemplateMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderTemplate;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 费用明细
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-04 22:14:33
+ */
+public interface OrderTemplateMapper extends Mapper<OrderTemplate> {
+	
+}

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

@@ -17,13 +17,13 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.inter.OrderDetail;
-import com.xxfc.platform.order.vo.order.OrderDetailVO;
-import com.xxfc.platform.order.vo.order.OrderPageVO;
-import com.xxfc.platform.order.vo.pay.RentVehicleOrderPayVO;
+import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO;
 import com.xxfc.platform.universal.constant.enumerate.PayChannelEnum;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderPayVo;
+import com.xxfc.platform.vehicle.entity.VehicleCata;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
 
@@ -73,7 +75,6 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query.getPage(), query.getLimit(), baseOrderBiz.pageByParm(query.getSuper())));
     }
 
-
     @ApiOperation("订单详情")
     @RequestMapping(value = "/{no}",method = RequestMethod.GET)
     @IgnoreClientToken
@@ -125,7 +126,26 @@ public class BaseOrderController extends CommonBaseController {
         orderPayVo.setUserId(baseOrder.getUserId());
         ObjectRestResponse response = BeanUtil.toBean(thirdFeign.wx(orderPayVo), ObjectRestResponse.class);
         return response;
-                //.data(PageDataVO.pageInfo(query.getPage(), query.getLimit(), baseOrderBiz.pageByParm(query.getSuper())));
+    }
+
+    @RequestMapping(value = "/cancel/{no}",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "取消订单")
+    @IgnoreClientToken
+    public ObjectRestResponse cancel(@PathVariable String no, @RequestBody CancelOrderDTO cancelOrderDto){
+        //查询列表数据
+        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+        BaseOrder dbBaseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
+            setNo(no);
+        }});
+        if(null == dbBaseOrder || !BaseContextHandler.getUserID().equals(dbBaseOrder.getUserId().toString())) {
+            throw new BaseException(ResultCode.NOTEXIST_CODE);
+        }
+        dbBaseOrder.setCancelReason(cancelOrderDto.getCancelReason());
+        baseOrderBiz.cancel(dbBaseOrder);
+        return ObjectRestResponse.success();
     }
 
     @RequestMapping(value = "/app/unauth/notifyUrl",method = RequestMethod.GET)

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

@@ -5,13 +5,13 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
-import com.xxfc.platform.order.vo.AddRentVehicleDTO;
-import com.xxfc.platform.order.vo.order.RentVehicleBO;
-import com.xxfc.platform.order.vo.price.OrderPriceVO;
-import com.xxfc.platform.order.vo.price.RentVehiclePriceVO;
+import com.xxfc.platform.order.pojo.AddRentVehicleDTO;
+import com.xxfc.platform.order.pojo.order.RentVehicleBO;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -19,7 +19,6 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 
 @Controller
 @RequestMapping("orderRentVehicle")
@@ -33,6 +32,9 @@ public class OrderRentVehicleController extends CommonBaseController {
         @Autowired
         OrderRentVehicleBiz orderRentVehicleBiz;
 
+        @Autowired
+        BaseOrderBiz baseOrderBiz;
+
         @RequestMapping(value = "add",method = RequestMethod.POST)
         @ResponseBody
         @ApiOperation(value = "确认租车订单")

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

+package com.xxfc.platform.order.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.OrderTemplateBiz;
+import com.xxfc.platform.order.entity.OrderTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("orderTemplate")
+public class OrderTemplateController extends BaseController<OrderTemplateBiz,OrderTemplate> {
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

 package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.IdUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -12,7 +11,7 @@ import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
-import com.xxfc.platform.order.vo.price.OrderPriceVO;
+import com.xxfc.platform.order.pojo.price.OrderPriceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -8,13 +8,13 @@ import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
+import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderCostEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderCostDetail;
-import com.xxfc.platform.order.vo.order.RentVehicleBO;
-import com.xxfc.platform.order.vo.price.OrderPriceVO;
-import com.xxfc.platform.order.vo.price.RentVehiclePriceVO;
+import com.xxfc.platform.order.pojo.order.RentVehicleBO;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.log4j.Log4j;
@@ -29,6 +29,7 @@ import java.math.BigDecimal;
 public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicleBiz, RentVehicleBO> {
 
     private static BigDecimal DRIVER_PRICE = new BigDecimal("600.00");
+    private static BigDecimal DAMAGE_SAFE = new BigDecimal("100.00"); //车损免赔
     private static Integer DRIVER_TYPE_COMPANY = 1;
     private static BigDecimal DEPOSIT = new BigDecimal("20000.00");
 
@@ -38,6 +39,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     @Autowired
     OrderCostDetailBiz orderCostDetailBiz;
 
+    @Autowired
+    OrderTemplateBiz orderTemplateBiz;
+
     @PostConstruct
     public void init(){
         this.orderTypeEnum = OrderTypeEnum.RentVehicle;
@@ -117,6 +121,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @return
      */
     private String costDetail(RentVehiclePriceVO vo) {
+        //orderTemplateBiz.result(orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode()), Dict.parse(pojo));
         TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
         OrderCostDetail orderCostDetail = orderCostDetailBiz.selectById(OrderCostEnum.RentVehicle.getCode());
         Template template = engine.getTemplate(orderCostDetail.getTemplate());

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

@@ -25,10 +25,10 @@
 <!--        <result property="updHost" column="upd_host"/>-->
 <!--    </resultMap>-->
 
-    <resultMap type="com.xxfc.platform.order.vo.order.OrderPageVO" id="orderPageMap">
+    <resultMap type="com.xxfc.platform.order.pojo.order.OrderPageVO" id="orderPageMap">
         <result javaType="Integer" column="type" property="type"></result>
         <discriminator javaType="Integer" column="type">
-            <case value="1" resultType="com.xxfc.platform.order.vo.order.OrderPageVO">
+            <case value="1" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
                 <association column="id" property="detail" select="com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper.oneByOrderId"></association>
             </case>
         </discriminator>

xx-order/xx-order-server/src/test/java/com/xxfc/platform/order/RegionTest.java

 package com.xxfc.platform.order;
 
-import cn.hutool.core.lang.Dict;
 import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
-import com.xxfc.platform.order.vo.price.OrderPriceVO;
-import com.xxfc.platform.order.vo.price.RentVehiclePriceVO;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.math.BigDecimal;
-
 @Slf4j
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes={OrderApplication.class})

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

@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.feign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.vo.BookVehicleVo;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/AddOrUpdateAccompanyingItem.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateAccompanyingItem.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/AddOrUpdateVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/AddVehicleWarningMsgVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddVehicleWarningMsgVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BookVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BookVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockApplyInfoVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockApplyInfoVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockApplyVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockApplyVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockInfoVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockInfoVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockSearchVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockSearchVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CampsiteVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CampsiteVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CataDto.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CataDto.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 
 import java.util.List;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CataVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CataVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CompanyDetail.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanyDetail.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.SysRegion;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CompanySearchDTO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchDTO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CompanySearchVO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchVO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/ConstantVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/ConstantVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/LiftVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/LiftVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryAccompanyItemVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryAccompanyItemVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryVehicleBookRecordVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleBookRecordVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryVehicleWarningMsgVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleWarningMsgVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/RentVehicleBookDTO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Map;
-
 @Data
 public class RentVehicleBookDTO extends PageParam {
     //根据车型、时间、距离，门店，预定车辆

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/RetVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RetVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/UsableVehicleModelVO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVehicleModelVO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 public class UsableVehicleModelVO {

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/UsableVeicleDTO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
-import static java.time.LocalDateTime.ofEpochSecond;
-
 @Data
 public class UsableVeicleDTO extends PageParam {
         public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VModelDetailVO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VModelDetailVO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleArrivalVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleArrivalVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleBookRecordAndTbNameVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordAndTbNameVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleBookRecordQueryVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleDepartureLogVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureLogVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleDepartureStatisticDataVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureStatisticDataVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleDepartureVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehiclePageQueryVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleRepairVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleRepairVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepEndVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepEndVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepLogItemVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepLogItemVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepLogVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepLogVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUserLicenseVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUserLicenseVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleWarningMsgQueryVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleWarningMsgQueryVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/AccompanyingItemBiz.java

@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper;
-import com.xxfc.platform.vehicle.vo.AddOrUpdateAccompanyingItem;
+import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryAccompanyItemVo;
+import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -14,11 +14,10 @@ import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
-import com.xxfc.platform.vehicle.rest.BranchCompanyController;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.vo.BranchCompanyVo;
-import com.xxfc.platform.vehicle.vo.CompanyDetail;
-import com.xxfc.platform.vehicle.vo.CompanySearchDTO;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockService.java

@@ -14,10 +14,10 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyStockApplyInfoMapper;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper;
 import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CampsiteBiz.java

@@ -14,7 +14,7 @@ import com.xxfc.platform.vehicle.mapper.CampsiteMapper;
 import com.xxfc.platform.vehicle.mapper.ConstantMapper;
 import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.vo.CampsiteVo;
+import com.xxfc.platform.vehicle.pojo.CampsiteVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/ConstantBiz.java

@@ -9,7 +9,7 @@ import com.xxfc.platform.vehicle.constant.ConstantType;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.Constant;
 import com.xxfc.platform.vehicle.mapper.ConstantMapper;
-import com.xxfc.platform.vehicle.vo.ConstantVo;
+import com.xxfc.platform.vehicle.pojo.ConstantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/SysRegionBiz.java

@@ -7,10 +7,8 @@ import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.RegionType;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
-import com.xxfc.platform.vehicle.vo.CompanySearchVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -10,10 +10,10 @@ import com.xxfc.platform.vehicle.entity.VehicleActiveLog;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
 import com.xxfc.platform.vehicle.mapper.*;
-import com.xxfc.platform.vehicle.vo.VehicleArrivalVo;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepEndVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepVo;
+import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepEndVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -19,7 +21,7 @@ import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
@@ -270,7 +272,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
      * @return
      */
     @Transactional
-    public RestResponse applyVehicle4Employee(Integer userId, BookVehicleVo bookVehicleVo, String userName) throws Exception{
+    public void applyVehicle4Employee(Integer userId, BookVehicleVo bookVehicleVo, String userName) throws Exception{
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicle());
         //提取日期和相应的预定目标日期
@@ -285,7 +287,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
             Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicle(),entry.getValue(),entry.getKey());
             if(Boolean.FALSE.equals(rsEach)){
-                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
+                throw new BaseException(ResultCode.FAILED_CODE);
             }
         }
         //加入预定申请记录
@@ -304,6 +306,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
         vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
         vehicleBookRecordMapper.insertSelective(vehicleBookRecord);
+
+        //修改相关车辆预定记录
+        Boolean hasSuc = bookedVehicle(bookVehicleVo);
+        if(!hasSuc){
+            throw new BaseException(ResultCode.FAILED_CODE);
+        }
+
+        //添加随车物品
         List<Map<String,Object>> params = Lists.newArrayList();
         if(MapUtils.isNotEmpty(bookVehicleVo.getSelectedAccItem())){
             for(Map.Entry<Integer,Integer> idAndAmount : bookVehicleVo.getSelectedAccItem().entrySet()){
@@ -315,7 +325,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             }
             bookRecordAccItemMapper.batchAdd(params);
         }
-        return RestResponse.suc();
     }
 
     @Transactional
@@ -362,13 +371,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         BeanUtils.copyProperties(bookVehicleVo,vehicleBookRecord);
         bookVehicleVo.setBookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
         bookVehicleVo.setBookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        //审核通过的话，需要修改相关车辆预定记录
-        if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
-            Boolean hasSuc = bookedVehicle(bookVehicleVo);
-            if(!hasSuc){
-                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
-            }
-        }
+//        //审核通过的话，需要修改相关车辆预定记录
+//        if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
+//            Boolean hasSuc = bookedVehicle(bookVehicleVo);
+//            if(!hasSuc){
+//                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
+//            }
+//        }
         //成功后修改预定记录状态
         Map<String,Object> updateParam = Maps.newHashMap();
         updateParam.put("id",bookRecordId);
@@ -426,8 +435,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         return RestResponse.suc();
     }
 
-
-
     /**
      * 获取预定车辆相关与操作参数
      * @return

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -16,7 +16,7 @@ import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java

@@ -8,8 +8,8 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureLogVo;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureStatisticDataVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureStatisticDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleLicenseBiz.java

@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.mapper.VehicleLicenseMapper;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.VehicleUserLicenseVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUserLicenseVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
-import com.xxfc.platform.vehicle.vo.CataVo;
+import com.xxfc.platform.vehicle.pojo.CataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleUpkeepService.java

@@ -5,8 +5,8 @@ import com.github.pagehelper.PageInfo;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogItemVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleWarningMsgBiz.java

@@ -15,9 +15,9 @@ import com.xxfc.platform.vehicle.mapper.VehicleMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper;
 import com.xxfc.platform.vehicle.util.JSUtil;
-import com.xxfc.platform.vehicle.vo.AddVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.AddVehicleWarningMsgVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.vo.QueryVehicleBookRecordVo;
-import com.xxfc.platform.vehicle.vo.VehicleBookRecordAndTbNameVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleBookRecordVo;
+import com.xxfc.platform.vehicle.pojo.VehicleBookRecordAndTbNameVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.vo.AddOrUpdateVehicleVo;
-import com.xxfc.platform.vehicle.vo.QueryVehicleVo;
-import com.xxfc.platform.vehicle.vo.UsableVehicleModelVO;
+import com.xxfc.platform.vehicle.pojo.AddOrUpdateVehicleVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleVo;
+import com.xxfc.platform.vehicle.pojo.UsableVehicleModelVO;
 import org.springframework.data.repository.query.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogItemVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleWarningMsg;
-import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

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

@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
-import com.xxfc.platform.vehicle.vo.AddOrUpdateAccompanyingItem;
+import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryAccompanyItemVo;
+import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -9,16 +9,14 @@ import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.BranchCompanyVo;
-import com.xxfc.platform.vehicle.vo.CompanyDetail;
-import com.xxfc.platform.vehicle.vo.CompanySearchDTO;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

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

@@ -6,9 +6,9 @@ import com.xxfc.platform.vehicle.biz.BranchCompanyStockService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

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

@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Campsite;
 import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.CampsiteVo;
+import com.xxfc.platform.vehicle.pojo.CampsiteVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,7 +7,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ConstantType;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Constant;
-import com.xxfc.platform.vehicle.vo.ConstantVo;
+import com.xxfc.platform.vehicle.pojo.ConstantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import com.xxfc.platform.vehicle.biz.VehicleActiveService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

 package com.xxfc.platform.vehicle.rest;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
-import com.xxfc.platform.vehicle.biz.VehicleBiz;
-import com.xxfc.platform.vehicle.biz.VehicleBookRecordBiz;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
-import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.common.VehicleBaseController;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.entity.VehicleCata;
-import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
-import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 @RestController
 @RequestMapping("/cata")

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

@@ -7,8 +7,6 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
-import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
@@ -21,11 +19,10 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
-import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -38,8 +35,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.ArrayList;
@@ -160,7 +155,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
     public RestResponse<Integer> applyVehicle(@RequestBody BookVehicleVo bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        return RestResponse.suc();
     }
 
     /**
@@ -218,7 +214,6 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
     @RequestMapping(value = "/bookedRecord/{bookEndDate}/{id}", method = RequestMethod.GET)
     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)));
         } catch (JSONException ex) {
@@ -310,7 +305,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      */
     @ApiOperation("租车触发的申请预定车辆")
     @RequestMapping(value = "/rent/book/vehicle", method = RequestMethod.POST)
-    public RestResponse<String> rentApplyVehicle(@RequestBody RentVehicleBookDTO dto) throws Exception {
+    public ObjectRestResponse<Integer> rentApplyVehicle(@RequestBody RentVehicleBookDTO dto) throws Exception {
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = BaseContextHandler.getName();
@@ -322,6 +317,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
         PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
         bookVehicleVo.setVehicle(pageDataVO.getData().get(0).getId());
 
-        return baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+
+        return ObjectRestResponse.success();
     }
 }

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

@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.VehicleUserLicenseVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUserLicenseVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -5,29 +5,18 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
-import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
-import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
-import com.xxfc.platform.vehicle.vo.VModelDetailVO;
+import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Controller
 @RequestMapping("vehicleModel")
 @Api(value="车型controller",tags={"车型操作接口"})

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

@@ -3,16 +3,15 @@ package com.xxfc.platform.vehicle.rest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.xxfc.platform.vehicle.biz.VehicleWarningMsgBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleWarningMsg;
-import com.xxfc.platform.vehicle.vo.AddVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.AddVehicleWarningMsgVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;