Commit a6774a43 authored by 周健威's avatar 周健威

添加代码

parent e23ab490
...@@ -34,4 +34,8 @@ public interface OrderFeign { ...@@ -34,4 +34,8 @@ public interface OrderFeign {
@PostMapping(value = "/count/basebase/findOrdersByorderIdV2") @PostMapping(value = "/count/basebase/findOrdersByorderIdV2")
ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody List<Integer> orderIds); ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody List<Integer> orderIds);
@GetMapping(value = "/specialRent/app/unauth/checkHasSpecialRentFegin")
public ObjectRestResponse<Boolean> appBusinessAddRent(String vehicleId);
} }
...@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil; ...@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
import com.github.wxiaoqi.security.admin.feign.UserFeign; import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO; import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface; import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.exception.BaseException; import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
...@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
import static com.xxfc.platform.order.entity.SpecialRent.STATUS_CRT; import static com.xxfc.platform.order.entity.SpecialRent.STATUS_CRT;
import static com.xxfc.platform.vehicle.entity.Vehicle.STATE_DOWN;
@RestController @RestController
@RequestMapping("specialRent") @RequestMapping("specialRent")
...@@ -77,6 +79,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia ...@@ -77,6 +79,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
if(null == vehicle) { if(null == vehicle) {
throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE); throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
} }
//判断车辆是否下架、是否已经存在一个特惠租车
if(STATE_DOWN == vehicle.getStatus() || baseBiz.checkHasSpecialRent(vehicle.getId())) {
throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
}
specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString()); specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString());
DateTime startDateTime = DateUtil.date(specialRent.getStartTime()); DateTime startDateTime = DateUtil.date(specialRent.getStartTime());
...@@ -207,6 +215,14 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia ...@@ -207,6 +215,14 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
} }
@RequestMapping(value = "/app/unauth/checkHasSpecialRentFegin", method = RequestMethod.GET)
@ResponseBody
@IgnoreUserToken
@ApiOperation(value = "判断车辆是否有进行中的特惠租车")
public ObjectRestResponse appBusinessAddRent(String vehicleId) {
return ObjectRestResponse.succ(baseBiz.checkHasSpecialRent(vehicleId));
}
@Data @Data
public static class SpecialRentVO extends SpecialRent{ public static class SpecialRentVO extends SpecialRent{
Vehicle vehicle; Vehicle vehicle;
......
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