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
d1544fc3
Commit
d1544fc3
authored
Aug 27, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询设置无归属
parent
f06d03c4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
ConsumeStructureController.java
.../gic/cloud/web/controller/ConsumeStructureController.java
+0
-0
MemberCloudDataController.java
...m/gic/cloud/web/controller/MemberCloudDataController.java
+11
-0
PerformanceOverviewController.java
...c/cloud/web/controller/PerformanceOverviewController.java
+4
-0
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java
View file @
d1544fc3
This diff is collapsed.
Click to expand it.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java
View file @
d1544fc3
...
@@ -54,6 +54,7 @@ public class MemberCloudDataController {
...
@@ -54,6 +54,7 @@ public class MemberCloudDataController {
log
.
info
(
"会员分布-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
log
.
info
(
"会员分布-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberDistributionTrend
(
params
));
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberDistributionTrend
(
params
));
}
}
...
@@ -71,11 +72,13 @@ public class MemberCloudDataController {
...
@@ -71,11 +72,13 @@ public class MemberCloudDataController {
}
}
vo
.
setPage
(
this
.
goDownComponent
.
parseData
(
pageServiceResponse
.
getResult
(),
params
.
getChannel
(),
params
.
getEnterpriseId
(),
params
.
getLevel
(),
maxLevel
));
vo
.
setPage
(
this
.
goDownComponent
.
parseData
(
pageServiceResponse
.
getResult
(),
params
.
getChannel
(),
params
.
getEnterpriseId
(),
params
.
getLevel
(),
maxLevel
));
params
.
setCountType
(
2
);
params
.
setCountType
(
2
);
goDownComponent
.
setValueTotal
(
params
,
levelVo
);
ServiceResponse
<
Page
<
MemberDistributionAreaDTO
>>
response1
=
memberCloudDataApiService
.
pageMemberDistributionArea
(
params
);
ServiceResponse
<
Page
<
MemberDistributionAreaDTO
>>
response1
=
memberCloudDataApiService
.
pageMemberDistributionArea
(
params
);
this
.
goDownComponent
.
parseTotal
(
response1
,
vo
);
this
.
goDownComponent
.
parseTotal
(
response1
,
vo
);
if
(
params
.
getChannel
()
!=
null
&&
params
.
getChannel
()
==
1
&&
params
.
getLevel
()
==
levelVo
.
getLevel
()){
if
(
params
.
getChannel
()
!=
null
&&
params
.
getChannel
()
==
1
&&
params
.
getLevel
()
==
levelVo
.
getLevel
()){
//无归属
//无归属
params
.
setCountType
(
3
);
params
.
setCountType
(
3
);
goDownComponent
.
setValueWgs
(
params
,
levelVo
);
ServiceResponse
<
Page
<
MemberDistributionAreaDTO
>>
response2
=
memberCloudDataApiService
.
pageMemberDistributionArea
(
params
);
ServiceResponse
<
Page
<
MemberDistributionAreaDTO
>>
response2
=
memberCloudDataApiService
.
pageMemberDistributionArea
(
params
);
this
.
goDownComponent
.
parseWgs
(
response2
,
vo
);
this
.
goDownComponent
.
parseWgs
(
response2
,
vo
);
}
}
...
@@ -96,11 +99,13 @@ public class MemberCloudDataController {
...
@@ -96,11 +99,13 @@ public class MemberCloudDataController {
}
}
vo
.
setPage
(
this
.
goDownComponent
.
parseData
(
pageServiceResponse
.
getResult
(),
params
.
getChannel
(),
params
.
getEnterpriseId
(),
params
.
getLevel
(),
maxLevel
));
vo
.
setPage
(
this
.
goDownComponent
.
parseData
(
pageServiceResponse
.
getResult
(),
params
.
getChannel
(),
params
.
getEnterpriseId
(),
params
.
getLevel
(),
maxLevel
));
params
.
setCountType
(
2
);
params
.
setCountType
(
2
);
goDownComponent
.
setValueTotal
(
params
,
levelVo
);
ServiceResponse
<
Page
<
MemberRecruitAreaDTO
>>
response1
=
memberCloudDataApiService
.
pageMemberRecruitArea
(
params
);
ServiceResponse
<
Page
<
MemberRecruitAreaDTO
>>
response1
=
memberCloudDataApiService
.
pageMemberRecruitArea
(
params
);
this
.
goDownComponent
.
parseTotal
(
response1
,
vo
);
this
.
goDownComponent
.
parseTotal
(
response1
,
vo
);
if
(
params
.
getChannel
()
!=
null
&&
params
.
getChannel
()
==
1
&&
params
.
getLevel
()
==
levelVo
.
getLevel
()){
if
(
params
.
getChannel
()
!=
null
&&
params
.
getChannel
()
==
1
&&
params
.
getLevel
()
==
levelVo
.
getLevel
()){
//无归属
//无归属
params
.
setCountType
(
3
);
params
.
setCountType
(
3
);
goDownComponent
.
setValueWgs
(
params
,
levelVo
);
ServiceResponse
<
Page
<
MemberRecruitAreaDTO
>>
response2
=
memberCloudDataApiService
.
pageMemberRecruitArea
(
params
);
ServiceResponse
<
Page
<
MemberRecruitAreaDTO
>>
response2
=
memberCloudDataApiService
.
pageMemberRecruitArea
(
params
);
this
.
goDownComponent
.
parseWgs
(
response2
,
vo
);
this
.
goDownComponent
.
parseWgs
(
response2
,
vo
);
}
}
...
@@ -112,6 +117,7 @@ public class MemberCloudDataController {
...
@@ -112,6 +117,7 @@ public class MemberCloudDataController {
log
.
info
(
"会员基础画像参数:{}"
,
JSON
.
toJSONString
(
params
));
log
.
info
(
"会员基础画像参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberBasicPortrait
(
params
));
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberBasicPortrait
(
params
));
}
}
...
@@ -120,6 +126,7 @@ public class MemberCloudDataController {
...
@@ -120,6 +126,7 @@ public class MemberCloudDataController {
log
.
info
(
"会员画像-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
log
.
info
(
"会员画像-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
getMemberPortraitOverview
(
params
));
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
getMemberPortraitOverview
(
params
));
}
}
...
@@ -128,6 +135,7 @@ public class MemberCloudDataController {
...
@@ -128,6 +135,7 @@ public class MemberCloudDataController {
log
.
info
(
"会员自定义画像参数:{}"
,
JSON
.
toJSONString
(
params
));
log
.
info
(
"会员自定义画像参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberCustomPortrait
(
params
));
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberCustomPortrait
(
params
));
}
}
...
@@ -136,6 +144,7 @@ public class MemberCloudDataController {
...
@@ -136,6 +144,7 @@ public class MemberCloudDataController {
log
.
info
(
"会员概况-会员招募概况参数:{}"
,
JSON
.
toJSONString
(
params
));
log
.
info
(
"会员概况-会员招募概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
getMemberRecruitOverview
(
params
));
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
getMemberRecruitOverview
(
params
));
}
}
...
@@ -144,6 +153,7 @@ public class MemberCloudDataController {
...
@@ -144,6 +153,7 @@ public class MemberCloudDataController {
log
.
info
(
"会员概况-会员招募趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
log
.
info
(
"会员概况-会员招募趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberRecruitTrend
(
params
));
return
ResultControllerUtils
.
commonResult
(
memberCloudDataApiService
.
queryMemberRecruitTrend
(
params
));
}
}
...
@@ -188,6 +198,7 @@ public class MemberCloudDataController {
...
@@ -188,6 +198,7 @@ public class MemberCloudDataController {
Integer
enterpriseId
=
params
.
getEnterpriseId
();
Integer
enterpriseId
=
params
.
getEnterpriseId
();
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
ServiceResponse
<
List
<
MemberCustomPortraitDTO
>>
fieldListRes
=
memberCloudDataApiService
.
listCustomField
(
params
);
ServiceResponse
<
List
<
MemberCustomPortraitDTO
>>
fieldListRes
=
memberCloudDataApiService
.
listCustomField
(
params
);
if
(
fieldListRes
.
isSuccess
())
{
if
(
fieldListRes
.
isSuccess
())
{
List
<
MemberCustomPortraitDTO
>
fieldList
=
fieldListRes
.
getResult
();
List
<
MemberCustomPortraitDTO
>
fieldList
=
fieldListRes
.
getResult
();
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/PerformanceOverviewController.java
View file @
d1544fc3
...
@@ -22,6 +22,9 @@ public class PerformanceOverviewController {
...
@@ -22,6 +22,9 @@ public class PerformanceOverviewController {
private
StoreSearchUtils
storeSearchUtils
;
private
StoreSearchUtils
storeSearchUtils
;
@Autowired
@Autowired
private
DataAuthUtils
dataAuthUtils
;
private
DataAuthUtils
dataAuthUtils
;
@Autowired
private
GoDownComponent
goDownComponent
;
@RequestMapping
(
"get-performance-overview"
)
@RequestMapping
(
"get-performance-overview"
)
public
RestResponse
selectPerformanceOverview
(
PerformanceOverviewQO
params
)
{
public
RestResponse
selectPerformanceOverview
(
PerformanceOverviewQO
params
)
{
...
@@ -29,6 +32,7 @@ public class PerformanceOverviewController {
...
@@ -29,6 +32,7 @@ public class PerformanceOverviewController {
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJson
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
return
ResultControllerUtils
.
commonResult
(
performanceOverviewApiService
.
selectPerformanceOverview
(
params
));
return
ResultControllerUtils
.
commonResult
(
performanceOverviewApiService
.
selectPerformanceOverview
(
params
));
}
}
}
}
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