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
8c9e420b
Commit
8c9e420b
authored
Nov 15, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取车辆详情接口
parent
40281c6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+5
-8
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
8c9e420b
...
...
@@ -3,8 +3,6 @@ package com.xxfc.platform.order.rest;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.alibaba.druid.sql.visitor.functions.If
;
import
com.alibaba.fastjson.JSONObject
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.github.wxiaoqi.security.admin.entity.AppUserLogin
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
...
...
@@ -30,7 +28,6 @@ import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
import
com.xxfc.platform.order.contant.enumerate.ItemTypeEnum
;
import
com.xxfc.platform.order.entity.OrderItem
;
import
com.xxfc.platform.order.entity.OrderRentVehicleDetail
;
import
com.xxfc.platform.order.pojo.DetailsOfExpenses
;
import
com.xxfc.platform.order.pojo.OrderAccompanyDTO
;
import
com.xxfc.platform.order.pojo.order.*
;
import
com.xxfc.platform.order.pojo.price.RentVehiclePriceVO
;
...
...
@@ -50,13 +47,11 @@ import io.swagger.annotations.ApiOperation;
import
jodd.util.StringUtil
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.mockito.internal.util.collections.Sets
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
tk.mybatis.mapper.entity.Example
;
import
javax.annotation.Resource
;
import
java.io.IOException
;
...
...
@@ -126,6 +121,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
dto
.
setLimit
(
1
);
dto
.
setType
(
1
);
}
//实名查询
if
(
StringUtils
.
isNotBlank
(
dto
.
getPhone
())
||
StringUtils
.
isNotBlank
(
dto
.
getRealName
()))
{
List
<
AppUserLogin
>
appUserLoins
=
userFeign
.
getOne
(
dto
.
getPhone
(),
dto
.
getRealName
());
if
(
CollectionUtil
.
isNotEmpty
(
appUserLoins
))
{
...
...
@@ -141,12 +137,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
if
(
userDTO
==
null
)
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
}
if
(
dto
.
getType
()
!=
null
&&
dto
.
getType
()
!=
3
)
{
//权限
if
(
userDTO
.
getDataAll
()!=
1
&&
dto
.
getType
()
!=
null
&&
dto
.
getType
()
!=
3
)
{
List
<
BranchCompany
>
branchCompanies
=
vehicleFeign
.
companyAll
(
userDTO
.
getDataAll
(),
userDTO
.
getDataCompany
(),
userDTO
.
getDataZone
());
List
<
Integer
>
companyIds
=
branchCompanies
.
stream
().
map
(
BranchCompany:
:
getId
).
collect
(
Collectors
.
toList
());
dto
.
setCompanyIds
(
companyIds
);
}
//大区查询
if
(
dto
.
getZoneId
()
!=
null
)
{
if
(
userDTO
.
getDataAll
()
!=
1
&&
!
dto
.
getZoneId
().
equals
(
userDTO
.
getZoneId
()))
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
...
...
@@ -156,7 +153,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
dto
.
setZoneIds
(
zoneIds
);
}
}
//根据所属公司查询
if
(
dto
.
getStartCompanyId
()
!=
null
)
{
if
(
userDTO
.
getDataAll
()
!=
1
&&
!
dto
.
getStartCompanyId
().
equals
(
userDTO
.
getId
()))
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
...
...
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