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
63a5103a
Commit
63a5103a
authored
Jul 23, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单权限
parent
e5ac89d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+20
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
63a5103a
...
@@ -18,6 +18,7 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
...
@@ -18,6 +18,7 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
import
com.github.wxiaoqi.security.common.util.Query
;
import
com.github.wxiaoqi.security.common.util.Query
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.activity.user.UserInfoBiz
;
import
com.xxfc.platform.order.biz.BaseOrderBiz
;
import
com.xxfc.platform.order.biz.BaseOrderBiz
;
import
com.xxfc.platform.order.biz.OrderMemberDetailBiz
;
import
com.xxfc.platform.order.biz.OrderMemberDetailBiz
;
import
com.xxfc.platform.order.biz.OrderUserLicenseBiz
;
import
com.xxfc.platform.order.biz.OrderUserLicenseBiz
;
...
@@ -48,12 +49,14 @@ import org.springframework.stereotype.Controller;
...
@@ -48,12 +49,14 @@ import org.springframework.stereotype.Controller;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
com
.
github
.
wxiaoqi
.
security
.
auth
.
common
.
constatns
.
CommonConstants
.
DATA_ALL_FALSE
;
import
static
com
.
xxfc
.
platform
.
universal
.
constant
.
DictionaryKey
.
APP_ORDER
;
import
static
com
.
xxfc
.
platform
.
universal
.
constant
.
DictionaryKey
.
APP_ORDER
;
@Controller
@Controller
...
@@ -74,6 +77,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes
...
@@ -74,6 +77,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes
@Autowired
@Autowired
RabbitProduct
rabbitProduct
;
RabbitProduct
rabbitProduct
;
@Autowired
UserInfoBiz
userInfoBiz
;
@Autowired
@Autowired
OrderMemberDetailBiz
orderMemberDetailBiz
;
OrderMemberDetailBiz
orderMemberDetailBiz
;
@Autowired
@Autowired
...
@@ -150,7 +156,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
...
@@ -150,7 +156,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
@ApiOperation
(
value
=
"获取后台订单列表"
)
@ApiOperation
(
value
=
"获取后台订单列表"
)
@IgnoreClientToken
@IgnoreClientToken
@CrossOrigin
@CrossOrigin
public
ObjectRestResponse
<
PageDataVO
<
OrderListVo
>>
selectByUser
(
QueryOrderList
dto
)
{
public
ObjectRestResponse
<
PageDataVO
<
OrderListVo
>>
selectByUser
(
QueryOrderList
dto
,
HttpServletRequest
request
)
{
if
(
dto
.
getStartTime
()
!=
null
)
{
if
(
dto
.
getStartTime
()
!=
null
)
{
if
(
dto
.
getEndTime
()
==
null
)
{
if
(
dto
.
getEndTime
()
==
null
)
{
dto
.
setEndTime
(
new
Date
().
getTime
());
dto
.
setEndTime
(
new
Date
().
getTime
());
...
@@ -162,6 +168,19 @@ public class BaseOrderController extends CommonBaseController implements UserRes
...
@@ -162,6 +168,19 @@ public class BaseOrderController extends CommonBaseController implements UserRes
dto
.
setUserId
(
appUserLogin
.
getId
());
dto
.
setUserId
(
appUserLogin
.
getId
());
}
}
}
}
UserDTO
userDTO
=
userInfoBiz
.
getAdminUserInfo
();
if
(
userDTO
==
null
)
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
}
if
(
DATA_ALL_FALSE
.
equals
(
userDTO
.
getDataAll
()))
{
//不能获取全部数据
if
(
StringUtils
.
isNotBlank
(
userDTO
.
getDataZone
()))
{
dto
.
setStartZoneId
(
userDTO
.
getZoneId
());
}
if
(
StringUtils
.
isNotBlank
(
userDTO
.
getDataCompany
()))
{
dto
.
setStartCompanyId
(
userDTO
.
getCompanyId
());
}
}
Query
query
=
new
Query
(
dto
);
Query
query
=
new
Query
(
dto
);
PageDataVO
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
listOrder
(
query
.
getSuper
()));
PageDataVO
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
listOrder
(
query
.
getSuper
()));
List
<
OrderListVo
>
list
=
pageDataVO
.
getData
();
List
<
OrderListVo
>
list
=
pageDataVO
.
getData
();
...
...
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