新增交还车接口

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

 package com.github.wxiaoqi.security.admin.feign;
 
 
+import com.github.wxiaoqi.security.admin.entity.AppUser;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -38,6 +41,9 @@ public interface UserFeign {
     @RequestMapping(value = "/member/levels", method = RequestMethod.GET)
     public List<BaseUserMemberLevel> levels();
 
+    @RequestMapping(value = "/app/user/findByUserId",method = RequestMethod.GET)
+    public ObjectRestResponse<AppUserDetail> findByUserId(@RequestParam(value="id")Integer id);
 
-
+    @RequestMapping(value = "/app/user/getByUserIds", method = RequestMethod.GET)
+    public ObjectRestResponse<List<AppUserDetail>> getByUserIds(@RequestParam("ids")List<Integer> ids);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -45,7 +45,6 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return null;
     }
 
-
     public AppUserVo getUserInfoById(Integer userid){
         return mapper.getUserInfo(userid);
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
 import com.github.wxiaoqi.security.admin.entity.AppUser;
@@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -128,5 +130,26 @@ public class AppUserController extends CommonBaseController {
         return ObjectRestResponse.succ();
     }
 
+    @GetMapping("/findByUserId")
+    public ObjectRestResponse<AppUserDetail> findByUserId(Integer id) {
+        if(id == null || id < 0) {
+            return ObjectRestResponse.createFailedResult(500, "参数id为空");
+        }
+        AppUserDetail appUserDetail = userDetailBiz.getUserByUserid(id);
+        return ObjectRestResponse.succ(appUserDetail);
+    }
+
+    @GetMapping("/getByUserIds")
+    public ObjectRestResponse<List<AppUserDetail>> getByUserIds(@RequestParam("ids") List<Integer> ids) {
+        if(ids == null) {
+            return ObjectRestResponse.createFailedResult(500, "参数id为空");
+        }
+        List<AppUserDetail> appUserDetails = new ArrayList<>();
+        for (Integer id : ids) {
+            AppUserDetail appUserDetail = userDetailBiz.getUserByUserid(id);
+            appUserDetails.add(appUserDetail);
+        }
 
+        return ObjectRestResponse.succ(appUserDetails);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java

@@ -104,6 +104,7 @@ public class UserController extends CommonBaseController {
         }
     }
 
+
     @RequestMapping(value = "/front/menus", method = RequestMethod.GET)
     public @ResponseBody
     List<MenuTree> getMenusByUsername(String token) throws Exception {

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

@@ -9,8 +9,8 @@ import lombok.Data;
 
 
 /**
- * 
- * 
+ *
+ *
  * @author zjw
  * @email nishijjo@qq.com
  * @date 2019-06-15 11:35:33
@@ -19,7 +19,7 @@ import lombok.Data;
 @Table(name = "base_order")
 public class BaseOrder implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
 	    /**
     *  主键
    */
@@ -27,35 +27,35 @@ public class BaseOrder implements Serializable {
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("主键")
     private Integer id;
-	
+
 	    /**
      *  订单号
      */
     @Column(name = "no")
 	@ApiModelProperty(value = "订单号")
     private String no;
-	
+
 	    /**
      *  名称
      */
     @Column(name = "name")
 	@ApiModelProperty(value = "名称")
     private String name;
-	
+
 	    /**
      *  订单类型 1--租车；2--旅游
      */
     @Column(name = "type")
 	@ApiModelProperty(value = "订单类型 1--租车；2--旅游")
     private Integer type;
-	
+
 	    /**
      *  订单详情id
      */
     @Column(name = "detail_id")
 	@ApiModelProperty(value = "订单详情id")
     private Integer detailId;
-	
+
 	    /**
      *  订单状态
 0--删除
@@ -76,112 +76,112 @@ public class BaseOrder implements Serializable {
 +"5--出行中（进行中）"
 +"6--已完成")
     private Integer status;
-	
+
 	    /**
      *  商品价格
      */
     @Column(name = "goods_amount")
 	@ApiModelProperty(value = "商品价格")
     private BigDecimal goodsAmount;
-	
+
 	    /**
      *  订单价格
      */
     @Column(name = "order_amount")
 	@ApiModelProperty(value = "订单价格")
     private BigDecimal orderAmount;
-	
+
 	    /**
      *  实际价格
      */
     @Column(name = "real_amount")
 	@ApiModelProperty(value = "实际价格")
     private BigDecimal realAmount;
-	
+
 	    /**
      *  第三方类型（支付渠道）
      */
     @Column(name = "third_type")
 	@ApiModelProperty(value = "第三方类型（支付渠道）")
     private Integer thirdType;
-	
+
 	    /**
      *  流水号
      */
     @Column(name = "out_trade_no")
 	@ApiModelProperty(value = "流水号")
     private String outTradeNo;
-	
+
 	    /**
      *  订单图片
      */
     @Column(name = "picture")
 	@ApiModelProperty(value = "订单图片")
     private String picture;
-	
+
 	    /**
      *  创建时间
      */
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Date crtTime;
-	
+
 	    /**
      *  创建者id
      */
     @Column(name = "crt_user")
 	@ApiModelProperty(value = "创建者id")
     private String crtUser;
-	
+
 	    /**
      *  创建者名称
      */
     @Column(name = "crt_name")
 	@ApiModelProperty(value = "创建者名称")
     private String crtName;
-	
+
 	    /**
      *  用户id
      */
     @Column(name = "user_id")
 	@ApiModelProperty(value = "用户id")
     private Integer userId;
-	
+
 	    /**
      *  更新时间
      */
     @Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Date updTime;
-	
+
 	    /**
      *  创建者ip
      */
     @Column(name = "crt_host")
 	@ApiModelProperty(value = "创建者ip")
     private String crtHost;
-	
+
 	    /**
      *  取消原因
      */
     @Column(name = "cancel_reason")
 	@ApiModelProperty(value = "取消原因")
     private String cancelReason;
-	
+
 	    /**
      *  退款流水号
      */
     @Column(name = "refund_trade_no")
 	@ApiModelProperty(value = "退款流水号")
     private String refundTradeNo;
-	
+
 	    /**
      *  支付时间
      */
     @Column(name = "pay_time")
 	@ApiModelProperty(value = "支付时间")
     private Long payTime;
-	
+
 	    /**
      *  退款时间
      */
@@ -195,4 +195,10 @@ public class BaseOrder implements Serializable {
 	@Column(name = "has_discount")
 	@ApiModelProperty(value = "是否有优惠")
 	private Long hasDiscount;
+
+	@Transient
+	private String username;
+
+	@Transient
+	private String vehicalNumberPlat;
 }

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

@@ -2,7 +2,6 @@ package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

xx-order/xx-order-server/pom.xml

@@ -25,7 +25,6 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -50,6 +49,11 @@
                         <version>5.1.30</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>commons-beanutils</groupId>
+                        <artifactId>commons-beanutils</artifactId>
+                        <version>1.9.3</version>
+                    </dependency>
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>

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

@@ -30,6 +30,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     public List<OrderPageVO> listOrder(Map<String, Object> paramMap){
         return mapper.listOrder(paramMap);
     }
+    public List<OrderPageVO> getRentVehicle (Map<String, Object> paramMap) {
+        return mapper.getRentVehicle(paramMap);
+    }
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();

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

+package com.xxfc.platform.order.biz;
+
+import com.ace.cache.annotation.Cache;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.OrderVehicaleCrosstown;
+import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapper, OrderVehicaleCrosstown> {
+
+    public OrderVehicaleCrosstown get(Integer id){
+        return selectById(id);
+    }
+
+    public List<OrderVehicaleCrosstown> selectByOrderId(OrderVehicaleCrosstown orderVehicaleCrosstown) {
+        return mapper.selectByOrderId(orderVehicaleCrosstown);
+    }
+}

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

+package com.xxfc.platform.order.config;
+
+import feign.RequestInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+/**
+ * 自定义的请求头处理类，处理服务发送时的请求头；
+ * 将服务接收到的请求头中的uniqueId和token字段取出来，并设置到新的请求头里面去转发给下游服务
+ * 比如A服务收到一个请求，请求头里面包含uniqueId和token字段，A处理时会使用Feign客户端调用B服务
+ * 那么uniqueId和token这两个字段就会添加到请求头中一并发给B服务；
+ *
+ * @author mozping
+ * @version 1.0
+ * @date 2018/6/27 14:13
+ * @see FeignHeadConfiguration
+ * @since JDK1.8
+ */
+@Configuration
+@Slf4j
+public class FeignHeadConfiguration {
+
+    @Bean
+    public RequestInterceptor requestInterceptor() {
+        return requestTemplate -> {
+            ServletRequestAttributes attrs = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (attrs != null) {
+                HttpServletRequest request = attrs.getRequest();
+                Enumeration<String> headerNames = request.getHeaderNames();
+                if (headerNames != null) {
+                    while (headerNames.hasMoreElements()) {
+                        String name = headerNames.nextElement();
+                        String value = request.getHeader(name);
+                        /**
+                         * 遍历请求头里面的属性字段，将logId和token添加到新的请求头中转发到下游服务
+                         * */
+                        if ("Authorization".equalsIgnoreCase(name)) {
+                            log.debug("添加自定义请求头key:" + name + ",value:" + value);
+                            requestTemplate.header(name, value);
+                        } else {
+                            log.debug("FeignHeadConfiguration", "非自定义请求头key:" + name + ",value:" + value + "不需要添加!");
+                        }
+                    }
+                } else {
+                    log.warn("FeignHeadConfiguration", "获取请求头失败！");
+                }
+            }
+        };
+    }
+
+}

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

@@ -17,4 +17,5 @@ import java.util.Map;
 public interface BaseOrderMapper extends Mapper<BaseOrder> {
 	public List<OrderPageVO> pageByParm(Map<String, Object> paramMap);
 	public List<OrderPageVO> listOrder(Map<String, Object> paramMap);
+	public List<OrderPageVO> getRentVehicle(Map<String, Object> paramMap);
 }

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

@@ -3,8 +3,9 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.github.pagehelper.PageHelper;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
@@ -26,6 +27,9 @@ 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.common.RestResponse;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -37,7 +41,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("baseOrder")
@@ -54,6 +63,9 @@ public class BaseOrderController extends CommonBaseController {
     @Autowired
     UserFeign userFeign;
 
+    @Resource
+    VehicleFeign vehicleFeign;
+
     @Value("${gateway.host}")
     String host;
 
@@ -87,13 +99,59 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.selectListAll()));
     }
 
-    @RequestMapping(value = "/selectByUser",method = RequestMethod.GET)
+    @RequestMapping(value = "/getOrderList",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单列表")
     @IgnoreClientToken
     public ObjectRestResponse<PageDataVO<OrderPageVO>> selectByUser(QueryOrderList dto){
+        if(dto.getStartTime() != null) {
+            if(dto.getEndTime() == null) {
+                dto.setEndTime(new Date().getTime());
+            }
+        }
+        Query query = new Query(dto);
+        PageDataVO pageDataVO =  PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
+        List<OrderPageVO> list = pageDataVO.getData();
+        List<Integer> userIds = list.stream().map(OrderPageVO::getUserId).distinct().collect(Collectors.toList());
+        ObjectRestResponse<List<AppUserDetail>> objectRestResponse  = userFeign.getByUserIds(userIds);
+        for(OrderPageVO orderPageVO : list) {
+           if(objectRestResponse.getData() != null && objectRestResponse.getData().size() >0) {
+               for(AppUserDetail appUserDetail : objectRestResponse.getData() ) {
+                  if(appUserDetail != null && appUserDetail.getUserid() == orderPageVO.getUserId()) {
+                      orderPageVO.setUsername(appUserDetail.getNickname());
+                  }
+               }
+           }
+            if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
+                RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
+                log.info("获取车辆信息返回消息：{}",restResponse.getMessage());
+                if(restResponse.getData() != null) {
+                    orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+                }
+            }
+       }
+
+        return new ObjectRestResponse<>().data(pageDataVO);
+    }
+
+    @RequestMapping(value =  "/getVehicleList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "交还车订单列表")
+    @IgnoreClientToken
+    public ObjectRestResponse<List<OrderPageVO>> getVehicleList(QueryOrderList dto) {
+        AppUserDTO appUserDTO = getUserDetail();
+        if(appUserDTO == null) {
+            return ObjectRestResponse.createFailedResult(40101,"User token is null or empty!");
+        }
+        dto.setUserId(appUserDTO.getUserid());
+        if(dto != null && dto.getStartTime() != null) {
+            if(dto.getEndTime() == null) {
+                dto.setEndTime(new Date().getTime());
+            }
+        }
         Query query = new Query(dto);
-        return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper())));
+        PageDataVO pageDataVO =  PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
+        return new ObjectRestResponse<>().data(pageDataVO);
     }
 
 
@@ -301,6 +359,10 @@ public class BaseOrderController extends CommonBaseController {
        private Long endTime;
 
        private Integer startCompanyId;
+
+       private Integer startZoneId;
+
+       private Integer userId;
     }
 
     @Data
@@ -313,4 +375,17 @@ public class BaseOrderController extends CommonBaseController {
         @ApiModelProperty(value = "支付订单（流水）号")
         private String tradeNo;
     }
+
+    public AppUserDTO getUserDetail() {
+        String token = request.getHeader("Authorization");
+        if(StringUtils.isBlank(token)) {
+            return null;
+        }
+        ObjectRestResponse<AppUserDTO> objectRestResponse = userFeign.userDetailByToken(token);
+        if(objectRestResponse.getData() == null) {
+            return null;
+        }
+        return objectRestResponse.getData();
+    }
+
 }
\ No newline at end of file

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

+package com.xxfc.platform.order.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.order.biz.OrderVehicalCrosstownBiz;
+import com.xxfc.platform.order.entity.OrderVehicaleCrosstown;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/orderVehicle")
+@Api(value="交还车记录",tags={"交还车记录"})
+@Slf4j
+public class OrderVehicleCrosstownController {
+
+    @Autowired
+    OrderVehicalCrosstownBiz orderVehicalCrosstownBiz;
+
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "添加交还车记录")
+    public ObjectRestResponse<?> add(OrderVehicaleCrosstown orderVehicaleCrosstown) {
+        log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicaleCrosstown);
+        if(orderVehicaleCrosstown == null) {
+            return ObjectRestResponse.createFailedResult(500, "参数为空！");
+        }
+        if(orderVehicaleCrosstown.getId() != null) {
+            OrderVehicaleCrosstown oldValue = orderVehicalCrosstownBiz.get(orderVehicaleCrosstown.getId());
+            if(oldValue != null) {
+                BeanUtil.copyProperties(orderVehicaleCrosstown,oldValue,CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                orderVehicalCrosstownBiz.updateSelectiveById(oldValue);
+                return ObjectRestResponse.succ();
+            }
+            orderVehicalCrosstownBiz.insertSelective(orderVehicaleCrosstown);
+            return ObjectRestResponse.succ();
+        } else {
+            orderVehicalCrosstownBiz.insertSelective(orderVehicaleCrosstown);
+            return ObjectRestResponse.succ();
+        }
+
+    }
+
+    @GetMapping(value = "/{id}")
+    @ApiOperation(value = "查询记录信息")
+    public ObjectRestResponse<OrderVehicaleCrosstown> get(@PathVariable Integer id) {
+        return ObjectRestResponse.succ(orderVehicalCrosstownBiz.get(id));
+    }
+
+    @GetMapping(value = "/getByOrderId")
+    @ApiOperation(value = "根据订单Id获取所有记录信息")
+    public ObjectRestResponse<List<OrderVehicaleCrosstown>> getByOrderId(OrderVehicaleCrosstown orderVehicaleCrosstown) {
+        if(orderVehicaleCrosstown == null) {
+            return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
+        }
+        return  ObjectRestResponse.succ( orderVehicalCrosstownBiz.selectByOrderId(orderVehicaleCrosstown));
+    }
+
+}

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

@@ -27,7 +27,7 @@
         <javaClientGenerator targetPackage="${targetMapperPackage}" targetProject="${targetJavaProject}"
                              type="XMLMAPPER"/>
 
-<!--        <table tableName="vehicle" domainObjectName="Vehicle">-->
+<!--        <table tableName="order_vehicle_crosstown" domainObjectName="Vehicle">-->
 <!--        </table>-->
 <!--        <table tableName="vehicle_book_info" domainObjectName="VehicleBookInfo">-->
 <!--        </table>-->
@@ -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="base_order" domainObjectName="baseOrder"></table>
+        <table tableName="order_vehicle_crosstown" domainObjectName="OrderVehicaleCrosstown"></table>
 <!--        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
     </context>
 </generatorConfiguration>
\ No newline at end of file

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

@@ -68,6 +68,9 @@
             </if>
             <if test="status != null">
                 and b.status = #{status}
+            </if>
+             <if test="type != null">
+                and b.type = #{type}
             </if>
             <if test="no != null">
                 and no like CONCAT ("%", #{no}, "%")
@@ -80,6 +83,35 @@
                 and r.start_company_id = #{startCompanyId}
                 or t.start_company_id = #{startCompanyId}
             </if>
+            <if test="startZoneId != null">
+                and r.start_zone_id = #{startZoneId}
+                or t.start_zone_id = #{startZoneId}
+            </if>
+        </where>
+        order by b.crt_time desc
+    </select>
+
+    <select id="getRentVehicle" parameterType="Map" resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
+        <where>
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
+            <if test="status != null">
+                and b.status = #{status}
+            </if>
+                and b.type = 1
+            <if test="no != null">
+                and no like CONCAT ("%", #{no}, "%")
+            </if>
+            <if test="startTime != null">
+                and r.start_time between  #{startTime}  and  #{endTime}
+            </if>
+            <if test="startCompanyId != null">
+                and r.start_company_id = #{startCompanyId}
+            </if>
         </where>
         order by b.crt_time desc
     </select>

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

@@ -2,14 +2,15 @@ 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.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Created by ace on 2017/9/15.
  */
@@ -18,6 +19,15 @@ public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
     public ObjectRestResponse<VehicleModel> get(@PathVariable("id") int id);
 
+    @GetMapping(value = "/vehicleInfo/{id}")
+    public ObjectRestResponse<Vehicle> get(@PathVariable("id") String id);
+
+    @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)
+    public RestResponse<Vehicle> findById(@RequestParam("id")String id);
+
+    @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
+    public RestResponse< List<Vehicle>> getByIds(@RequestParam("ids") List<String> id);
+
     //修改评分
     @RequestMapping(value = "/vehicleModel/app/addScore", method = RequestMethod.GET)
     public RestResponse addScore(@RequestParam(value="id")Integer  id, @RequestParam(value="score")Integer  score);

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ace.cache.annotation.Cache;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -121,6 +122,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),headers, HttpStatus.CREATED);
     }
 
+    @Cache(key = "vehical")
     public Vehicle get(String id){
         return mapper.selectByPrimaryKey(id);
     }

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

 package com.xxfc.platform.vehicle.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ace.cache.annotation.Cache;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -94,6 +95,26 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return baseBiz.discard(idList);
     }
 
+    @RequestMapping(value = "/findById", method = RequestMethod.GET)
+    public RestResponse<Vehicle> findById(String id) {
+       Vehicle vehicle =  baseBiz.get(id);
+        return RestResponse.data(vehicle);
+    }
+
+    @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
+    public RestResponse< List<Vehicle>> getByIds(@RequestParam("ids") List<String> ids){
+        if(ids == null) {
+            return RestResponse.codeAndMessage(500, "参数为空！");
+        }
+        List<Vehicle> vehicles = new ArrayList<>();
+        for(String id : ids) {
+            log.info("查询车辆信息Id：{}",id);
+            Vehicle vehicle =  baseBiz.get(id);
+            vehicles.add(vehicle);
+        }
+      return RestResponse.suc(vehicles);
+    }
+
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     public RestResponse<PageDataVO<QueryVehicleVo>> getByPage(@RequestParam String vehiclePageQueryVoJson) throws Exception {
         VehiclePageQueryVo vehiclePageQueryVo = null;