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
5b07cbcf
Commit
5b07cbcf
authored
Sep 08, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qo名称修改
parent
15ff8926
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
66 deletions
+56
-66
ConsumeStructureController.java
.../gic/cloud/web/controller/ConsumeStructureController.java
+25
-36
GoDownComponent.java
...in/java/com/gic/cloud/web/controller/GoDownComponent.java
+18
-17
MemberCloudDataController.java
...m/gic/cloud/web/controller/MemberCloudDataController.java
+10
-10
PerformanceOverviewController.java
...c/cloud/web/controller/PerformanceOverviewController.java
+3
-3
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java
View file @
5b07cbcf
package
com
.
gic
.
cloud
.
web
.
controller
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.cloud.web.constant.StoreChannelEnum
;
import
com.gic.cloud.web.utils.LevelUtil
;
import
com.gic.cloud.web.vo.BaseSalesVo
;
import
com.gic.cloud.web.vo.LevelVo
;
import
com.gic.data.api.dto.BaseSalesDTO
;
import
com.gic.data.api.dto.consumestructure.*
;
import
com.gic.enterprise.dto.WmStoreDTO
;
import
com.gic.enterprise.service.WmStoreApiService
;
import
com.gic.mall.share.api.dto.shop.ShopDTO
;
import
com.gic.mall.share.api.enums.ShopTypeEnum
;
import
com.gic.mall.share.api.service.ShopApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -21,13 +7,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.cloud.web.auth.DataAuthUtils
;
import
com.gic.cloud.web.vo.BaseSalesVo
;
import
com.gic.cloud.web.vo.LevelVo
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.data.api.dto.consumestructure.*
;
import
com.gic.data.api.qo.consumestructure.*
;
import
com.gic.data.api.service.consumestructure.ConsumeStructureApiService
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
java.util.List
;
/**
* 业绩构成
* @ClassName: ConsumeStructureController
...
...
@@ -56,7 +45,7 @@ public class ConsumeStructureController {
* @return com.gic.commons.webapi.reponse.RestResponse
*/
@RequestMapping
(
"get-age-consume-share"
)
public
RestResponse
queryAgeConsumeShare
(
AgeConsumeShareQ
O
params
)
{
public
RestResponse
queryAgeConsumeShare
(
AgeConsumeShareQ
oAbstract
params
)
{
log
.
info
(
"消费构成-消费年龄-年龄消费占比参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -66,7 +55,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-age-consume-survey"
)
public
RestResponse
queryAgeConsumeSurvey
(
AgeConsumeShareQ
O
params
)
{
public
RestResponse
queryAgeConsumeSurvey
(
AgeConsumeShareQ
oAbstract
params
)
{
log
.
info
(
"消费构成-消费年龄-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -76,14 +65,14 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-age-consume-group"
)
public
RestResponse
listAgeConsumeGroup
(
AgeConsumeAreaQ
O
params
)
{
public
RestResponse
listAgeConsumeGroup
(
AgeConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-消费年龄-年龄段参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
return
ResultControllerUtils
.
commonResult
(
consumeStructureApiService
.
listAgeConsumeGroup
(
params
));
}
@RequestMapping
(
"get-age-consume-area"
)
public
RestResponse
queryAgeConsumeArea
(
AgeConsumeAreaQ
O
params
)
{
public
RestResponse
queryAgeConsumeArea
(
AgeConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-消费年龄-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
BaseSalesVo
vo
=
new
BaseSalesVo
();
LevelVo
levelVo
=
this
.
goDownComponent
.
setValue
(
params
,
vo
);
...
...
@@ -109,7 +98,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-grade-consume-trend"
)
public
RestResponse
getGradeConsumeTrend
(
GradeConsumeTrendQ
O
params
)
{
public
RestResponse
getGradeConsumeTrend
(
GradeConsumeTrendQ
oAbstract
params
)
{
log
.
info
(
"消费构成-等级-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -119,7 +108,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-grade-consume-survey"
)
public
RestResponse
getGradeConsumeSurvey
(
GradeConsumeTrendQ
O
params
)
{
public
RestResponse
getGradeConsumeSurvey
(
GradeConsumeTrendQ
oAbstract
params
)
{
log
.
info
(
"消费构成-等级-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -129,7 +118,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-grade-consume-area"
)
public
RestResponse
queryGradeConsumeArea
(
GradeConsumeAreaQ
O
params
)
{
public
RestResponse
queryGradeConsumeArea
(
GradeConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-等级-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
BaseSalesVo
vo
=
new
BaseSalesVo
();
LevelVo
levelVo
=
this
.
goDownComponent
.
setValue
(
params
,
vo
);
...
...
@@ -155,7 +144,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-grade-consume-group"
)
public
RestResponse
queryAgeConsumeShare
(
GradeConsumeAreaQ
O
params
)
{
public
RestResponse
queryAgeConsumeShare
(
GradeConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-等级-等级段参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
goDownComponent
.
setValueTotal
(
params
);
...
...
@@ -163,7 +152,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-birth-consume-rate"
)
public
RestResponse
getBirthConsumeRate
(
BirthConsumeRateQ
O
params
)
{
public
RestResponse
getBirthConsumeRate
(
BirthConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-生日会员-占比参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -173,7 +162,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-birth-consume-trend"
)
public
RestResponse
getBirthConsumeTrend
(
BirthConsumeRateQ
O
params
)
{
public
RestResponse
getBirthConsumeTrend
(
BirthConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-生日会员-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -183,7 +172,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-birth-consume-survey"
)
public
RestResponse
getBirthConsumeSurvey
(
BirthConsumeRateQ
O
params
)
{
public
RestResponse
getBirthConsumeSurvey
(
BirthConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-生日会员-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -193,7 +182,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-birth-consume-area"
)
public
RestResponse
pageWhetherConsumeArea
(
BirthConsumeAreaQ
O
params
)
{
public
RestResponse
pageWhetherConsumeArea
(
BirthConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-生日会员-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
BaseSalesVo
vo
=
new
BaseSalesVo
();
LevelVo
levelVo
=
this
.
goDownComponent
.
setValue
(
params
,
vo
);
...
...
@@ -219,7 +208,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-old-consume-rate"
)
public
RestResponse
getOldConsumeRate
(
NewOldConsumeRateQ
O
params
)
{
public
RestResponse
getOldConsumeRate
(
NewOldConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-新老会员-占比参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -229,7 +218,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-old-consume-trend"
)
public
RestResponse
queryOldConsumeTrend
(
NewOldConsumeRateQ
O
params
)
{
public
RestResponse
queryOldConsumeTrend
(
NewOldConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-新老会员-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -239,7 +228,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-old-consume-survey"
)
public
RestResponse
getBirthConsumeSurvey
(
NewOldConsumeRateQ
O
params
)
{
public
RestResponse
getBirthConsumeSurvey
(
NewOldConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-新老会员-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -249,7 +238,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-old-consume-area"
)
public
RestResponse
queryGradeConsumeArea
(
NewOldConsumeAreaQ
O
params
)
{
public
RestResponse
queryGradeConsumeArea
(
NewOldConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-新老会员-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
BaseSalesVo
vo
=
new
BaseSalesVo
();
LevelVo
levelVo
=
this
.
goDownComponent
.
setValue
(
params
,
vo
);
...
...
@@ -275,7 +264,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-whether-consume-rate"
)
public
RestResponse
getWhetherConsumeRate
(
WhetherConsumeRateQ
O
params
)
{
public
RestResponse
getWhetherConsumeRate
(
WhetherConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-是否会员-占比参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -285,7 +274,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-whether-consume-trend"
)
public
RestResponse
queryWhetherConsumeTrend
(
WhetherConsumeRateQ
O
params
)
{
public
RestResponse
queryWhetherConsumeTrend
(
WhetherConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-是否会员-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -295,7 +284,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-whether-consume-survey"
)
public
RestResponse
queryWhetherConsumeSurvey
(
WhetherConsumeRateQ
O
params
)
{
public
RestResponse
queryWhetherConsumeSurvey
(
WhetherConsumeRateQ
oAbstract
params
)
{
log
.
info
(
"消费构成-是否会员-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -305,7 +294,7 @@ public class ConsumeStructureController {
}
@RequestMapping
(
"get-whether-consume-area"
)
public
RestResponse
pageWhetherConsumeArea
(
WhetherConsumeAreaQ
O
params
)
{
public
RestResponse
pageWhetherConsumeArea
(
WhetherConsumeAreaQ
oAbstract
params
)
{
log
.
info
(
"消费构成-是否会员-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
BaseSalesVo
vo
=
new
BaseSalesVo
();
LevelVo
levelVo
=
this
.
goDownComponent
.
setValue
(
params
,
vo
);
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/GoDownComponent.java
View file @
5b07cbcf
package
com
.
gic
.
cloud
.
web
.
controller
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
...
...
@@ -11,7 +23,7 @@ import com.gic.cloud.web.vo.LevelVo;
import
com.gic.commons.util.CollectionUtil
;
import
com.gic.data.api.dto.BaseDTO
;
import
com.gic.data.api.dto.BaseSalesDTO
;
import
com.gic.data.api.qo.common.
CommonQO
;
import
com.gic.data.api.qo.common.
AbstractCommonQo
;
import
com.gic.enterprise.dto.WmStoreDTO
;
import
com.gic.enterprise.service.WmStoreApiService
;
import
com.gic.mall.share.api.dto.shop.ShopDTO
;
...
...
@@ -19,17 +31,6 @@ import com.gic.mall.share.api.enums.ShopTypeEnum;
import
com.gic.mall.share.api.service.ShopApiService
;
import
com.gic.store.dto.ClerkDTO
;
import
com.gic.store.service.ClerkApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 工具
* @ClassName: GoDownComponent
...
...
@@ -85,7 +86,7 @@ public class GoDownComponent {
}
}
public
LevelVo
setValue
(
CommonQO
params
,
BaseSalesVo
vo
){
public
LevelVo
setValue
(
AbstractCommonQo
params
,
BaseSalesVo
vo
){
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
...
...
@@ -124,7 +125,7 @@ public class GoDownComponent {
}
public
void
setValueTotal
(
CommonQO
params
,
LevelVo
levelVo
){
public
void
setValueTotal
(
AbstractCommonQo
params
,
LevelVo
levelVo
){
Integer
wgs
=
storeSearchUtils
.
isWgs
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
());
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
boolean
isContainNoOwnership
=
(
params
.
getChannel
()
==
null
||
(
params
.
getChannel
()
==
StoreChannelEnum
.
OFFLINE
.
getChannel
().
intValue
()
&&
params
.
getLevel
().
intValue
()
==
levelVo
.
getLevel
()))
&&
wgs
==
1
;
...
...
@@ -140,7 +141,7 @@ public class GoDownComponent {
}
}
public
void
setValueTotal
(
CommonQO
params
){
public
void
setValueTotal
(
AbstractCommonQo
params
){
Integer
wgs
=
storeSearchUtils
.
isWgs
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
());
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
if
(
wgs
==
1
){
...
...
@@ -155,7 +156,7 @@ public class GoDownComponent {
}
}
public
void
setValueWgs
(
CommonQO
params
,
LevelVo
levelVo
){
public
void
setValueWgs
(
AbstractCommonQo
params
,
LevelVo
levelVo
){
Integer
wgs
=
storeSearchUtils
.
isWgs
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
());
if
(
params
.
getChannel
()
!=
null
&&
params
.
getChannel
()
==
1
&&
params
.
getLevel
()
==
levelVo
.
getLevel
().
intValue
()
&&
wgs
==
1
){
params
.
setChannel
(
null
);
...
...
@@ -172,7 +173,7 @@ public class GoDownComponent {
}
}
public
void
setValueWgs
(
CommonQO
params
){
public
void
setValueWgs
(
AbstractCommonQo
params
){
Integer
wgs
=
storeSearchUtils
.
isWgs
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
());
if
(
wgs
==
1
){
params
.
setChannel
(
null
);
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java
View file @
5b07cbcf
...
...
@@ -56,7 +56,7 @@ public class MemberCloudDataController {
* @return com.gic.commons.webapi.reponse.RestResponse
*/
@RequestMapping
(
"get-member-distribution-trend"
)
public
RestResponse
queryMemberDistributionTrend
(
MemberDistributionTrendQ
O
params
)
{
public
RestResponse
queryMemberDistributionTrend
(
MemberDistributionTrendQ
oAbstract
params
)
{
log
.
info
(
"会员分布-趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setMemberCardIdList
(
dataAuthUtils
.
getMbrAreaId
(
params
.
getUserId
(),
params
.
getEnterpriseId
()));
...
...
@@ -66,7 +66,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-distribution-area"
)
public
RestResponse
pageMemberDistributionArea
(
MemberDistributionAreaQ
O
params
)
{
public
RestResponse
pageMemberDistributionArea
(
MemberDistributionAreaQ
oAbstract
params
)
{
log
.
info
(
"会员分布-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
...
...
@@ -95,7 +95,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-recruit-area"
)
public
RestResponse
pageMemberRecruitArea
(
MemberRecruitAreaQ
O
params
)
{
public
RestResponse
pageMemberRecruitArea
(
MemberRecruitAreaQ
oAbstract
params
)
{
log
.
info
(
"会员招募-区域参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
...
...
@@ -123,7 +123,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-portrait"
)
public
RestResponse
queryMemberBasicPortrait
(
MemberPortraitQ
O
params
)
{
public
RestResponse
queryMemberBasicPortrait
(
MemberPortraitQ
oAbstract
params
)
{
log
.
info
(
"会员基础画像参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -133,7 +133,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-portrait-overview"
)
public
RestResponse
getMemberPortraitOverview
(
MemberPortraitQ
O
params
)
{
public
RestResponse
getMemberPortraitOverview
(
MemberPortraitQ
oAbstract
params
)
{
log
.
info
(
"会员画像-概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -143,7 +143,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-custom-portrait"
)
public
RestResponse
queryMemberCustomPortrait
(
MemberCustomPortraitQ
O
params
)
{
public
RestResponse
queryMemberCustomPortrait
(
MemberCustomPortraitQ
oAbstract
params
)
{
log
.
info
(
"会员自定义画像参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -153,7 +153,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-recruit-overview"
)
public
RestResponse
getMemberRecruitOverview
(
MemberOverviewQ
O
params
)
{
public
RestResponse
getMemberRecruitOverview
(
MemberOverviewQ
oAbstract
params
)
{
log
.
info
(
"会员概况-会员招募概况参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -163,7 +163,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-recruit-trend"
)
public
RestResponse
queryMemberRecruitTrend
(
MemberOverviewQ
O
params
)
{
public
RestResponse
queryMemberRecruitTrend
(
MemberOverviewQ
oAbstract
params
)
{
log
.
info
(
"会员概况-会员招募趋势参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
@@ -208,7 +208,7 @@ public class MemberCloudDataController {
@RequestMapping
(
"get-member-custom-portrait-field"
)
public
RestResponse
getMemberCustomPortraitField
(
MemberCustomPortraitQ
O
params
)
{
public
RestResponse
getMemberCustomPortraitField
(
MemberCustomPortraitQ
oAbstract
params
)
{
log
.
info
(
"会员自定义画像-字段筛选参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
new
ArrayList
<>());
Integer
enterpriseId
=
params
.
getEnterpriseId
();
...
...
@@ -230,7 +230,7 @@ public class MemberCloudDataController {
}
@RequestMapping
(
"get-member-basic-portrait-field"
)
public
RestResponse
getMemberBasicPortraitField
(
MemberCustomPortraitQ
O
params
)
{
public
RestResponse
getMemberBasicPortraitField
(
MemberCustomPortraitQ
oAbstract
params
)
{
log
.
info
(
"会员基础画像-字段筛选参数:{}"
,
JSON
.
toJSONString
(
params
));
Integer
enterpriseId
=
params
.
getEnterpriseId
();
List
<
EnterprisePortraitRelDTO
>
list
=
new
ArrayList
<>(
6
);
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/PerformanceOverviewController.java
View file @
5b07cbcf
package
com
.
gic
.
cloud
.
web
.
controller
;
import
com.gic.cloud.web.auth.DataAuthUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -8,8 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.cloud.web.auth.DataAuthUtils
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.data.api.qo.performanceoverview.PerformanceOverviewQ
O
;
import
com.gic.data.api.qo.performanceoverview.PerformanceOverviewQ
oAbstract
;
import
com.gic.data.api.service.performanceoverview.PerformanceOverviewApiService
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
/**
...
...
@@ -33,7 +33,7 @@ public class PerformanceOverviewController {
@RequestMapping
(
"get-performance-overview"
)
public
RestResponse
selectPerformanceOverview
(
PerformanceOverviewQ
O
params
)
{
public
RestResponse
selectPerformanceOverview
(
PerformanceOverviewQ
oAbstract
params
)
{
log
.
info
(
"业绩概览参数:{}"
,
JSON
.
toJSONString
(
params
));
params
.
setOnlineStoreIdList
(
storeSearchUtils
.
onLineStoreSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
params
.
setStoreInfoIdList
(
storeSearchUtils
.
storeSearch
(
params
.
getUserId
(),
params
.
getEnterpriseId
(),
params
.
getSearchJSON
()));
...
...
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