Skip to content

G
gic-data-cloud
Commit 49024381 by 陶光胜
Options

门店控件修复

parent 7264701f
Showing with 38 additions and 38 deletions
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java
...@@ -85,14 +85,14 @@ public class ConsumeStructureController { ...@@ -85,14 +85,14 @@ public class ConsumeStructureController {
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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<AgeConsumeAreaDTO>> response1 = consumeStructureApiService.pageAgeConsumeArea(params); ServiceResponse<Page<AgeConsumeAreaDTO>> ageConsumeAreaResponse = consumeStructureApiService.pageAgeConsumeArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(ageConsumeAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
//无归属 //无归属
params.setCountType(3); params.setCountType(3);
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<AgeConsumeAreaDTO>> response2 = consumeStructureApiService.pageAgeConsumeArea(params); ServiceResponse<Page<AgeConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageAgeConsumeArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
...@@ -131,14 +131,14 @@ public class ConsumeStructureController { ...@@ -131,14 +131,14 @@ public class ConsumeStructureController {
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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<GradeConsumeAreaDTO>> response1 = consumeStructureApiService.pageGradeConsumeArea(params); ServiceResponse<Page<GradeConsumeAreaDTO>> gradeConsumeAreaResponse = consumeStructureApiService.pageGradeConsumeArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(gradeConsumeAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
params.setCountType(3); params.setCountType(3);
//无归属 //无归属
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<GradeConsumeAreaDTO>> response2 = consumeStructureApiService.pageGradeConsumeArea(params); ServiceResponse<Page<GradeConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageGradeConsumeArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
...@@ -195,14 +195,14 @@ public class ConsumeStructureController { ...@@ -195,14 +195,14 @@ public class ConsumeStructureController {
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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<BirthConsumeAreaDTO>> response1 = consumeStructureApiService.pageBirthConsumeArea(params); ServiceResponse<Page<BirthConsumeAreaDTO>> birthConsumeAreaResponse = consumeStructureApiService.pageBirthConsumeArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(birthConsumeAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
params.setCountType(3); params.setCountType(3);
//无归属 //无归属
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<BirthConsumeAreaDTO>> response2 = consumeStructureApiService.pageBirthConsumeArea(params); ServiceResponse<Page<BirthConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageBirthConsumeArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
...@@ -251,14 +251,14 @@ public class ConsumeStructureController { ...@@ -251,14 +251,14 @@ public class ConsumeStructureController {
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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<NewOldConsumeAreaDTO>> response1 = consumeStructureApiService.pageNewOldConsumeArea(params); ServiceResponse<Page<NewOldConsumeAreaDTO>> newOldConsumeAreaResponse = consumeStructureApiService.pageNewOldConsumeArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(newOldConsumeAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
params.setCountType(3); params.setCountType(3);
//无归属 //无归属
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<NewOldConsumeAreaDTO>> response2 = consumeStructureApiService.pageNewOldConsumeArea(params); ServiceResponse<Page<NewOldConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageNewOldConsumeArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
...@@ -307,14 +307,14 @@ public class ConsumeStructureController { ...@@ -307,14 +307,14 @@ public class ConsumeStructureController {
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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<WhetherConsumeAreaDTO>> response1 = consumeStructureApiService.pageWhetherConsumeArea(params); ServiceResponse<Page<WhetherConsumeAreaDTO>> whetherConsumeAreaResponse = consumeStructureApiService.pageWhetherConsumeArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(whetherConsumeAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
//无归属 //无归属
params.setCountType(3); params.setCountType(3);
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<WhetherConsumeAreaDTO>> response2 = consumeStructureApiService.pageWhetherConsumeArea(params); ServiceResponse<Page<WhetherConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageWhetherConsumeArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
......
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java
...@@ -98,10 +98,10 @@ public class IndexController { ...@@ -98,10 +98,10 @@ public class IndexController {
onLine.add("-1"); onLine.add("-1");
} }
List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId); List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
ServiceResponse<IndexMemberOrderCntDTO> response1 = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine, ServiceResponse<IndexMemberOrderCntDTO> allMemberOrderCntResponse = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null, StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate(), 1); mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate(), 1);
ServiceResponse<IndexMemberOrderCntDTO> response2 = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine, ServiceResponse<IndexMemberOrderCntDTO> memberOrderCntResponse = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null, StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate(), 2); mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate(), 2);
ServiceResponse<IndexMemberOldOrderCnt> oldOrderCnt = this.indexSalesApiService.getIndexMemberOldOrderCnt(enterpriseId, list, onLine, ServiceResponse<IndexMemberOldOrderCnt> oldOrderCnt = this.indexSalesApiService.getIndexMemberOldOrderCnt(enterpriseId, list, onLine,
...@@ -110,17 +110,17 @@ public class IndexController { ...@@ -110,17 +110,17 @@ public class IndexController {
ServiceResponse<IndexMemberBirthCntDTO> birthOrderCnt = this.indexSalesApiService.getIndexMemberBirthOrderCnt(enterpriseId, list, onLine, ServiceResponse<IndexMemberBirthCntDTO> birthOrderCnt = this.indexSalesApiService.getIndexMemberBirthOrderCnt(enterpriseId, list, onLine,
StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null, StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate()); mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate());
log.info("response1:{}", JSON.toJSONString(response1)); log.info("allMemberOrderCntResponse:{}", JSON.toJSONString(allMemberOrderCntResponse));
log.info("response2:{}", JSON.toJSONString(response2)); log.info("memberOrderCntResponse:{}", JSON.toJSONString(memberOrderCntResponse));
log.info("oldOrderCnt:{}", JSON.toJSONString(oldOrderCnt)); log.info("oldOrderCnt:{}", JSON.toJSONString(oldOrderCnt));
log.info("birthOrderCnt:{}", JSON.toJSONString(birthOrderCnt)); log.info("birthOrderCnt:{}", JSON.toJSONString(birthOrderCnt));
IndexConsume consume = new IndexConsume(); IndexConsume consume = new IndexConsume();
if(response1.isSuccess() && response1.getResult() != null && response2.getResult() != null){ if(allMemberOrderCntResponse.isSuccess() && allMemberOrderCntResponse.getResult() != null && memberOrderCntResponse.getResult() != null){
IndexMemberOrderCntDTO indexMemberOrderCntDto1 = response1.getResult(); IndexMemberOrderCntDTO allMemberOrderCntDto = allMemberOrderCntResponse.getResult();
IndexMemberOrderCntDTO indexMemberOrderCntDto2 = response2.getResult(); IndexMemberOrderCntDTO memberOrderCntDto = memberOrderCntResponse.getResult();
consume.setMemberRate(DataFormatUtils.rate(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCnt())); consume.setMemberRate(DataFormatUtils.rate(memberOrderCntDto.getOrderCnt(), allMemberOrderCntDto.getOrderCnt()));
String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCntHb()), String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(memberOrderCntDto.getOrderCnt(), allMemberOrderCntDto.getOrderCntHb()),
DataFormatUtils.divideDouble(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCntHb())); DataFormatUtils.divideDouble(memberOrderCntDto.getOrderCnt(), allMemberOrderCntDto.getOrderCntHb()));
consume.setMemberHb(divide); consume.setMemberHb(divide);
} }
if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){ if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){
......
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java
...@@ -84,14 +84,14 @@ public class MemberCloudDataController { ...@@ -84,14 +84,14 @@ 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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<MemberDistributionAreaDTO>> response1 = memberCloudDataApiService.pageMemberDistributionArea(params); ServiceResponse<Page<MemberDistributionAreaDTO>> memberDistributionAreaResponse = memberCloudDataApiService.pageMemberDistributionArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(memberDistributionAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
//无归属 //无归属
params.setCountType(3); params.setCountType(3);
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<MemberDistributionAreaDTO>> response2 = memberCloudDataApiService.pageMemberDistributionArea(params); ServiceResponse<Page<MemberDistributionAreaDTO>> wgsResponse = memberCloudDataApiService.pageMemberDistributionArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
...@@ -114,14 +114,14 @@ public class MemberCloudDataController { ...@@ -114,14 +114,14 @@ 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.setValueTotalForArea(params, levelVo); goDownComponent.setValueTotalForArea(params, levelVo);
ServiceResponse<Page<MemberRecruitAreaDTO>> response1 = memberCloudDataApiService.pageMemberRecruitArea(params); ServiceResponse<Page<MemberRecruitAreaDTO>> memberRecruitAreaResponse = memberCloudDataApiService.pageMemberRecruitArea(params);
this.goDownComponent.parseTotal(response1, vo); this.goDownComponent.parseTotal(memberRecruitAreaResponse, vo);
if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){ if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
//无归属 //无归属
params.setCountType(3); params.setCountType(3);
goDownComponent.setValueWgsForArea(params, levelVo); goDownComponent.setValueWgsForArea(params, levelVo);
ServiceResponse<Page<MemberRecruitAreaDTO>> response2 = memberCloudDataApiService.pageMemberRecruitArea(params); ServiceResponse<Page<MemberRecruitAreaDTO>> wgsResponse = memberCloudDataApiService.pageMemberRecruitArea(params);
this.goDownComponent.parseWgs(response2, vo); this.goDownComponent.parseWgs(wgsResponse, vo);
} }
return RestResponse.success(vo); return RestResponse.success(vo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment