新增问题模块接口

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

@@ -16,6 +16,8 @@ public class ObjectRestResponse<T> extends BaseResponse {
     private static final String RESULT_SUCCESS_MSG = "操作成功";
     private static final String RESULT_FAIL_MSG = "操作失败";
 
+    private static final String PARAM_IS_EMPTY = "参数为空";
+
     public boolean isRel() {
         return rel;
     }
@@ -73,6 +75,10 @@ public class ObjectRestResponse<T> extends BaseResponse {
         return new ObjectRestResponse().status(code).msg(SystemProperty.getResultConfig(code + "")).rel(false);
     }
 
+    public static ObjectRestResponse paramIsEmpty() {
+        return ObjectRestResponse.createFailedResult(502, ObjectRestResponse.PARAM_IS_EMPTY);
+    }
+
     /**
      * 创建一个异常的调用结果
      * @param message

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

@@ -3,8 +3,10 @@ package com.xxfc.platform.order.pojo.order;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -14,7 +16,7 @@ public class OrderPageVO extends BaseOrder {
 
     OrderRentVehicleDetail orderRentVehicleDetail;
     OrderTourDetail orderTourDetail;
-
+    List<VehicleUserLicense> vehicleUserLicenses;
     private String username;
 
     private String vehicalNumberPlat;

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

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 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.google.common.collect.Lists;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
@@ -15,7 +16,10 @@ import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +55,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    VehicleFeign vehicleFeign;
+
     @Autowired
     ThirdFeign thirdFeign;
 
@@ -69,6 +76,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     public List<OrderPageVO> getRentVehicle (Map<String, Object> paramMap) {
         return mapper.getRentVehicle(paramMap);
     }
+    public List<OrderPageVO> getTourList (Map<String, Object> paramMap) {
+        return mapper.getTourList(paramMap);
+    }
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -85,6 +95,34 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         }});
     }
 
+    /**
+     * 获取订单详情
+     * @param no
+     * @return
+     */
+    public OrderPageVO getOrderDetail(String no) {
+        OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+        String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
+        List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
+        if(StringUtils.isNotBlank(myDriverIds)) {
+           if(myDriverIds.contains(",")) {
+               String[] ids = myDriverIds.split(",");
+             try{
+                 for(String id : ids) {
+                     vehicleUserLicenses.add(vehicleFeign.one(Integer.parseInt(id)).getData());
+                 }
+             }catch (Exception e) {
+             }
+           } else {
+               try {
+                   vehicleUserLicenses.add(vehicleFeign.one(Integer.parseInt(myDriverIds)).getData());
+               }catch (Exception e){}
+           }
+        }
+        orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
+        return orderPageVo;
+    }
+
     /**
      * 取消订单
      * @param baseOrder

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

@@ -15,7 +15,14 @@ import java.util.Map;
  * @date 2019-05-15 21:30:33
  */
 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);
+
+	public List<OrderPageVO> getTourList(Map<String, Object> paramMap);
+
+	public OrderPageVO getOrderDetail(String no);
 }

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

@@ -141,9 +141,8 @@ public class BaseOrderController extends CommonBaseController {
                 dto.setEndTime(new Date().getTime());
             }
         }
-        dto.setType(1);
         Query query = new Query(dto);
-        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
+        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
@@ -156,10 +155,10 @@ public class BaseOrderController extends CommonBaseController {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
             }
+
         }
-        dto.setType(2);
         Query query = new Query(dto);
-        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
+        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getTourList(query.getSuper()));
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
@@ -181,6 +180,18 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
+    @GetMapping(value = "/orderDetail")
+    @ApiOperation(value = "交还车获取订单详情，带驾驶人信息")
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse getOrderDetail(String orderNo) {
+        if(StringUtils.isBlank(orderNo)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        return ObjectRestResponse.succ(baseOrderBiz.getOrderDetail(orderNo));
+    }
+
+
     @ApiOperation("结合后台人员所属公司查询订单详情")
     @RequestMapping(value = "/company/{no}", method = RequestMethod.GET)
     @IgnoreClientToken

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

@@ -95,7 +95,30 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        <where>
+        where b.type = 1
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
+            <if test="status != null">
+                and b.status = #{status}
+            </if>
+            <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>
+        order by b.crt_time desc
+    </select>
+
+    <select id="getTourList" parameterType="Map" resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        LEFT JOIN order_tour_detail r on r.order_id = b.id
+        where b.type = 2
             <if test="userId != null">
                 and b.user_id = #{userId}
             </if>
@@ -111,8 +134,13 @@
             <if test="startCompanyId != null">
                 and r.start_company_id = #{startCompanyId}
             </if>
-        </where>
         order by b.crt_time desc
     </select>
 
+    <select id="getOrderDetail" parameterType="java.lang.String" resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        where no = #{no}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -2,10 +2,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.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -51,5 +48,9 @@ public interface VehicleFeign {
     public  List<BranchCompany>  companyAll(
             @RequestParam(value = "dataAll")Integer dataAll,
             @RequestParam(value = "dataCompany")String dataCompany,
+
             @RequestParam(value = "dataZone")String dataZone);
+
+    @RequestMapping(value = "/user/license/one", method = RequestMethod.GET)
+    public RestResponse<VehicleUserLicense> one(@RequestParam(value="id",defaultValue="0")Integer  id) throws Exception;
 }

xx-vehicle/xx-vehicle-server/pom.xml

@@ -29,6 +29,7 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>

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

@@ -51,7 +51,7 @@ public class VehicleLicenseController extends VehicleBaseController<VehicleLicen
         return RestResponse.suc(baseBiz.getAllByUserid( page,limit,userDTO.getUserid()));
     }
     @RequestMapping(value = "/license/one", method = RequestMethod.GET)
-    public RestResponse one(
+    public RestResponse<VehicleUserLicense> one(
             @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception {
         AppUserDTO userDTO =getUserInfo();
         if(userDTO==null||id==0){