Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
Overview
Overview
Details
Activity
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
base_platform_enterprise
gic-data-cloud
Commits
f0301afc
Commit
f0301afc
authored
Aug 05, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
观云台小程序
parent
51ba90da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
BaseSalesController.java
...ava/com/gic/cloud/web/controller/BaseSalesController.java
+4
-2
BaseSalesVo.java
...wxapp/src/main/java/com/gic/cloud/web/vo/BaseSalesVo.java
+5
-5
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java
View file @
f0301afc
...
...
@@ -50,8 +50,8 @@ public class BaseSalesController {
List
<
Long
>
mbrAreaIdList
=
this
.
dataAuthUtils
.
getMbrAreaId
(
qo
.
getUserId
(),
qo
.
getEnterpriseId
());
Integer
maxLevel
=
0
;
/******线下渠道需要点击下钻,该值只会在线下时才会使用********/
LevelVo
levelVo
=
this
.
storeSearchUtils
.
getLevel
(
qo
.
getUserId
(),
qo
.
getEnterpriseId
(),
qo
.
getSearchJSON
());
if
(
qo
.
getLevel
()
==
null
){
LevelVo
levelVo
=
this
.
storeSearchUtils
.
getLevel
(
qo
.
getUserId
(),
qo
.
getEnterpriseId
(),
qo
.
getSearchJSON
());
qo
.
setLevel
(
levelVo
.
getLevel
());
maxLevel
=
levelVo
.
getMaxLevel
();
}
...
...
@@ -67,7 +67,9 @@ public class BaseSalesController {
vo
.
setLevelName
(
"店铺层级"
);
}
qo
.
setChannel
(
newChannel
);
vo
.
setChannel
(
newChannel
);
}
if
(
qo
.
getChannel
()
==
StoreChannelEnum
.
OFFLINE
.
getChannel
()
&&
qo
.
getLevel
()
==
levelVo
.
getLevel
()){
vo
.
setChangeLevel
(
1
);
}
BaseSalesParamsDTO
dto
=
new
BaseSalesParamsDTO
();
dto
.
setChannel
(
qo
.
getChannel
());
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/BaseSalesVo.java
View file @
f0301afc
...
...
@@ -8,7 +8,7 @@ public class BaseSalesVo {
private
BaseSalesDTO
total
;
private
BaseSalesDTO
wgs
;
private
String
levelName
;
private
Integer
chan
nel
;
private
Integer
chan
geLevel
=
0
;
public
Page
<
BaseSalesDTO
>
getPage
()
{
return
page
;
...
...
@@ -42,11 +42,11 @@ public class BaseSalesVo {
this
.
levelName
=
levelName
;
}
public
Integer
getChan
n
el
()
{
return
chan
n
el
;
public
Integer
getChan
geLev
el
()
{
return
chan
geLev
el
;
}
public
void
setChan
nel
(
Integer
chann
el
)
{
this
.
chan
nel
=
chann
el
;
public
void
setChan
geLevel
(
Integer
changeLev
el
)
{
this
.
chan
geLevel
=
changeLev
el
;
}
}
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