新增旅游订单接口

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

@@ -50,39 +50,32 @@ import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("baseOrder")
-@Api(value="订单",tags={"订单"})
+@Api(value = "订单", tags = {"订单"})
 @Slf4j
 public class BaseOrderController extends CommonBaseController {
 
+    public static final Integer STATUS_SUCCESS = 1;
     @Autowired
     BaseOrderBiz baseOrderBiz;
-
     @Autowired
     ThirdFeign thirdFeign;
-
     @Autowired
     UserFeign userFeign;
-
     @Resource
     VehicleFeign vehicleFeign;
-
     @Value("${gateway.host}")
     String host;
-
     @Value("${gateway.order}")
     String order;
-
     String notifyUrl = "/baseOrder/app/unauth/notifyUrl";
 
-    public static final Integer STATUS_SUCCESS = 1;
-
-    @RequestMapping(value = "/page",method = RequestMethod.GET)
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单列表")
     @IgnoreClientToken
-    public ObjectRestResponse<PageDataVO<OrderPageVO>> list(QueryOrderDTO dto){
+    public ObjectRestResponse<PageDataVO<OrderPageVO>> list(QueryOrderDTO dto) {
         //查询列表数据
-        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
         dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
@@ -90,22 +83,22 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())));
     }
 
-    @RequestMapping(value = "/list",method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单列表")
     @IgnoreClientToken
-    public ObjectRestResponse<PageDataVO<OrderPageVO>> getOrderList(QueryOrderDTO dto){
+    public ObjectRestResponse<PageDataVO<OrderPageVO>> getOrderList(QueryOrderDTO dto) {
         Query query = new Query(dto);
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.selectListAll()));
     }
 
-    @RequestMapping(value = "/getOrderList",method = RequestMethod.GET)
+    @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) {
+    public ObjectRestResponse<PageDataVO<OrderPageVO>> selectByUser(QueryOrderList dto) {
+        if (dto.getStartTime() != null) {
+            if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
             }
         }
@@ -114,18 +107,18 @@ public class BaseOrderController extends CommonBaseController {
         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()) {
+        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) {
+                log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
+                if (restResponse.getData() != null) {
                     orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
                 }
             }
@@ -139,21 +132,32 @@ public class BaseOrderController extends CommonBaseController {
     @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) {
+        if (dto.getStartTime() != null) {
+            if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
             }
         }
+        dto.setType(1);
         Query query = new Query(dto);
-        PageDataVO pageDataVO =  PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
+        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
+    @RequestMapping(value = "/getTourList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "交还车订单列表")
+    @IgnoreClientToken
+    public ObjectRestResponse<List<OrderPageVO>> getTourList(QueryOrderList dto) {
+        if (dto.getStartTime() != null) {
+            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()));
+        return new ObjectRestResponse<>().data(pageDataVO);
+    }
 
 //    @RequestMapping(value = "/company/page",method = RequestMethod.GET)
 //    @ResponseBody
@@ -170,36 +174,36 @@ public class BaseOrderController extends CommonBaseController {
 //    }
 
     @ApiOperation("订单详情")
-    @RequestMapping(value = "/{no}",method = RequestMethod.GET)
+    @RequestMapping(value = "/{no}", method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<OrderPageVO> get(@PathVariable String no){
+    public ObjectRestResponse<OrderPageVO> get(@PathVariable String no) {
         //查询列表数据
-        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
 
         Query query = initQuery(no);
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
-        if(page.getData().isEmpty()) {
+        if (page.getData().isEmpty()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
     @ApiOperation("结合后台人员所属公司查询订单详情")
-    @RequestMapping(value = "/company/{no}",method = RequestMethod.GET)
+    @RequestMapping(value = "/company/{no}", method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<OrderPageVO> companyGet(@PathVariable String no){
+    public ObjectRestResponse<OrderPageVO> companyGet(@PathVariable String no) {
         //查询列表数据
-        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
 
         Query query = initCompanyQuery(no);
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
-        if(page.getData().isEmpty()) {
+        if (page.getData().isEmpty()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
         return new ObjectRestResponse<>().data(page.getData().get(0));
@@ -244,23 +248,23 @@ public class BaseOrderController extends CommonBaseController {
         return query;
     }
 
-    @RequestMapping(value = "/pay",method = RequestMethod.POST)
+    @RequestMapping(value = "/pay", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "订单支付")
     @IgnoreClientToken
-    public ObjectRestResponse pay(@RequestBody RentVehicleOrderPayVO vo){
+    public ObjectRestResponse pay(@RequestBody RentVehicleOrderPayVO vo) {
         //查询列表数据
-        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
 
         OrderPayVo orderPayVo = BeanUtil.toBean(vo, OrderPayVo.class);
 
-        BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
+        BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
             setNo(vo.getOrderNo());
         }});
 
-        if(null == baseOrder || !OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
+        if (null == baseOrder || !OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
             throw new BaseException("订单不可支付", ResultCode.EXCEPTION_CODE);
         }
 
@@ -268,26 +272,26 @@ public class BaseOrderController extends CommonBaseController {
         orderPayVo.setBody(baseOrder.getName());
         orderPayVo.setBuyerIp(StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)));
         orderPayVo.setChannel(PayChannelEnum.ORDER_CRT.getCode());
-        orderPayVo.setNotifyUrl(host+ order+ notifyUrl+ "?orderNo="+ baseOrder.getNo());
+        orderPayVo.setNotifyUrl(host + order + notifyUrl + "?orderNo=" + baseOrder.getNo());
         orderPayVo.setSubject(baseOrder.getName());
         orderPayVo.setUserId(baseOrder.getUserId());
         ObjectRestResponse response = BeanUtil.toBean(thirdFeign.wx(orderPayVo), ObjectRestResponse.class);
         return response;
     }
 
-    @RequestMapping(value = "/cancel/{no}",method = RequestMethod.POST)
+    @RequestMapping(value = "/cancel/{no}", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "取消订单")
     @IgnoreClientToken
-    public ObjectRestResponse cancel(@PathVariable String no, @RequestBody CancelOrderDTO cancelOrderDto){
+    public ObjectRestResponse cancel(@PathVariable String no, @RequestBody CancelOrderDTO cancelOrderDto) {
         //查询列表数据
-        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
-        BaseOrder dbBaseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
+        BaseOrder dbBaseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
             setNo(no);
         }});
-        if(null == dbBaseOrder || !BaseContextHandler.getUserID().equals(dbBaseOrder.getUserId().toString())) {
+        if (null == dbBaseOrder || !BaseContextHandler.getUserID().equals(dbBaseOrder.getUserId().toString())) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
         dbBaseOrder.setCancelReason(cancelOrderDto.getCancelReason());
@@ -295,31 +299,43 @@ public class BaseOrderController extends CommonBaseController {
         return ObjectRestResponse.succ();
     }
 
-    @RequestMapping(value = "/app/unauth/notifyUrl",method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/notifyUrl", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单支付回调")
     @IgnoreClientToken
     @IgnoreUserToken
-    public ObjectRestResponse notifyUrl(NotifyUrlDTO dto){
+    public ObjectRestResponse notifyUrl(NotifyUrlDTO dto) {
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
-        if(StrUtil.isNotBlank(dto.getOrderNo())){
-            BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
+        if (StrUtil.isNotBlank(dto.getOrderNo())) {
+            BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
                 setNo(dto.getOrderNo());
             }});
 
-            if(OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
+            if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
                 baseOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
                 baseOrder.setOutTradeNo(dto.getTradeNo());
                 baseOrderBiz.updateById(baseOrder);
-            }else {
+            } else {
                 log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
             }
-        }else {
+        } else {
             log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
         }
         return new ObjectRestResponse().rel(true);
     }
 
+    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();
+    }
+
     /**
      * 订单查询类
      */
@@ -363,10 +379,12 @@ public class BaseOrderController extends CommonBaseController {
         private Integer startZoneId;
 
         private Integer userId;
+
+        private Integer type;
     }
 
     @Data
-    public class NotifyUrlDTO{
+    public class NotifyUrlDTO {
         //订单号
         @ApiModelProperty(value = "订单号")
         private String orderNo;
@@ -376,16 +394,4 @@ public class BaseOrderController extends CommonBaseController {
         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

@@ -15,7 +15,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping(value = "/orderVehicle")
-@Api(value="交还车记录",tags={"交还车记录"})
+@Api(value = "交还车记录", tags = {"交还车记录"})
 @Slf4j
 public class OrderVehicleCrosstownController {
 
@@ -26,13 +26,13 @@ public class OrderVehicleCrosstownController {
     @ApiOperation(value = "添加交还车记录")
     public ObjectRestResponse<?> add(OrderVehicaleCrosstown orderVehicaleCrosstown) {
         log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicaleCrosstown);
-        if(orderVehicaleCrosstown == null) {
+        if (orderVehicaleCrosstown == null) {
             return ObjectRestResponse.createFailedResult(500, "参数为空！");
         }
-        if(orderVehicaleCrosstown.getId() != null) {
+        if (orderVehicaleCrosstown.getId() != null) {
             OrderVehicaleCrosstown oldValue = orderVehicalCrosstownBiz.get(orderVehicaleCrosstown.getId());
-            if(oldValue != null) {
-                BeanUtil.copyProperties(orderVehicaleCrosstown,oldValue,CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            if (oldValue != null) {
+                BeanUtil.copyProperties(orderVehicaleCrosstown, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 orderVehicalCrosstownBiz.updateSelectiveById(oldValue);
                 return ObjectRestResponse.succ();
             }
@@ -54,10 +54,10 @@ public class OrderVehicleCrosstownController {
     @GetMapping(value = "/getByOrderId")
     @ApiOperation(value = "根据订单Id获取所有记录信息")
     public ObjectRestResponse<List<OrderVehicaleCrosstown>> getByOrderId(OrderVehicaleCrosstown orderVehicaleCrosstown) {
-        if(orderVehicaleCrosstown == null) {
+        if (orderVehicaleCrosstown == null) {
             return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
         }
-        return  ObjectRestResponse.succ( orderVehicalCrosstownBiz.selectByOrderId(orderVehicaleCrosstown));
+        return ObjectRestResponse.succ(orderVehicalCrosstownBiz.selectByOrderId(orderVehicaleCrosstown));
     }
 
 }

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

@@ -102,7 +102,6 @@
             <if test="status != null">
                 and b.status = #{status}
             </if>
-                and b.type = 1
             <if test="no != null">
                 and no like CONCAT ("%", #{no}, "%")
             </if>