Commit 2efffb84 authored by 周健威's avatar 周健威

修改

parent 09d2041b
...@@ -310,7 +310,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp ...@@ -310,7 +310,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
ShuntApply shuntApply = baseBiz.selectById(dto.getApplyId()); ShuntApply shuntApply = baseBiz.selectById(dto.getApplyId());
if(null == shuntApply || shuntApply.getStatus() != STATUS_CRT) { if(null == shuntApply || shuntApply.getStatus() != STATUS_CRT) {
throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE,Sets.newSet("该需求已失效")); throw new BaseException("该需求已失效", ResultCode.PARAM_ILLEGAL_CODE);
} }
RentVehicleBO detail = new RentVehicleBO(); RentVehicleBO detail = new RentVehicleBO();
...@@ -335,7 +335,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp ...@@ -335,7 +335,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
orderRentVehicleService.acquireVehicle(detail, null , null); orderRentVehicleService.acquireVehicle(detail, null , null);
}catch (Exception e) { }catch (Exception e) {
getLog().error(e.getMessage(), e); getLog().error(e.getMessage(), e);
throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE,Sets.newSet("无法选择该车辆")); throw new BaseException("无法选择该车辆", ResultCode.PARAM_ILLEGAL_CODE);
} }
shuntApply.setVehicleId(dto.getVehicleId()); shuntApply.setVehicleId(dto.getVehicleId());
......
...@@ -110,14 +110,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia ...@@ -110,14 +110,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
} }
@RequestMapping(value = "/app/pageList", method = RequestMethod.GET) @RequestMapping(value = "/app/unauth/app/pageList", method = RequestMethod.GET)
@ResponseBody @ResponseBody
@ApiOperation(value = "分页查询可参加特惠租车") @ApiOperation(value = "分页查询可参加特惠租车")
@IgnoreUserToken
public ObjectRestResponse<SpecialRentVO> pageList(QueryDTO dto) { public ObjectRestResponse<SpecialRentVO> pageList(QueryDTO dto) {
//查询列表数据 //查询列表数据
if (StrUtil.isBlank(getCurrentUserId())) {
throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
}
Query query = new Query(dto); Query query = new Query(dto);
PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> { PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
w.andIn(SpecialRent::getStatus, CollUtil.newArrayList(STATUS_CRT, STATUS_AUTOCNL_ORDER, STATUS_AUTOCNL_TOPAY, STATUS_AUTOCNL_PAYED)); w.andIn(SpecialRent::getStatus, CollUtil.newArrayList(STATUS_CRT, STATUS_AUTOCNL_ORDER, STATUS_AUTOCNL_TOPAY, STATUS_AUTOCNL_PAYED));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment