Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
a6774a43
Commit
a6774a43
authored
Nov 02, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加代码
parent
e23ab490
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
OrderFeign.java
...c/main/java/com/xxfc/platform/order/feign/OrderFeign.java
+4
-0
SpecialRentController.java
...a/com/xxfc/platform/order/rest/SpecialRentController.java
+16
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
View file @
a6774a43
...
...
@@ -34,4 +34,8 @@ public interface OrderFeign {
@PostMapping
(
value
=
"/count/basebase/findOrdersByorderIdV2"
)
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderIdV2
(
@RequestBody
List
<
Integer
>
orderIds
);
@GetMapping
(
value
=
"/specialRent/app/unauth/checkHasSpecialRentFegin"
)
public
ObjectRestResponse
<
Boolean
>
appBusinessAddRent
(
String
vehicleId
);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java
View file @
a6774a43
...
...
@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
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.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
...
...
@@ -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_TRUE
;
import
static
com
.
xxfc
.
platform
.
order
.
entity
.
SpecialRent
.
STATUS_CRT
;
import
static
com
.
xxfc
.
platform
.
vehicle
.
entity
.
Vehicle
.
STATE_DOWN
;
@RestController
@RequestMapping
(
"specialRent"
)
...
...
@@ -77,6 +79,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
if
(
null
==
vehicle
)
{
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
());
DateTime
startDateTime
=
DateUtil
.
date
(
specialRent
.
getStartTime
());
...
...
@@ -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
public
static
class
SpecialRentVO
extends
SpecialRent
{
Vehicle
vehicle
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment