Commit 5d26cad3 by guojuxing

会员分布

parent 4260845d
...@@ -58,7 +58,7 @@ public class ConsumeStructureController { ...@@ -58,7 +58,7 @@ public class ConsumeStructureController {
log.info("消费构成-消费年龄-区域参数:{}", JSON.toJSONString(params)); log.info("消费构成-消费年龄-区域参数:{}", JSON.toJSONString(params));
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()));
if (params.getLevel() != null) { if (params.getLevel() == null) {
params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel()); params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
} }
params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId())); params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
...@@ -87,7 +87,7 @@ public class ConsumeStructureController { ...@@ -87,7 +87,7 @@ public class ConsumeStructureController {
log.info("消费构成-等级-区域参数:{}", JSON.toJSONString(params)); log.info("消费构成-等级-区域参数:{}", JSON.toJSONString(params));
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()));
if (params.getLevel() != null) { if (params.getLevel() == null) {
params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel()); params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
} }
params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId())); params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
...@@ -132,7 +132,7 @@ public class ConsumeStructureController { ...@@ -132,7 +132,7 @@ public class ConsumeStructureController {
log.info("消费构成-生日会员-区域参数:{}", JSON.toJSONString(params)); log.info("消费构成-生日会员-区域参数:{}", JSON.toJSONString(params));
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()));
if (params.getLevel() != null) { if (params.getLevel() == null) {
params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel()); params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
} }
params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId())); params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
...@@ -171,7 +171,7 @@ public class ConsumeStructureController { ...@@ -171,7 +171,7 @@ public class ConsumeStructureController {
log.info("消费构成-新老会员-区域参数:{}", JSON.toJSONString(params)); log.info("消费构成-新老会员-区域参数:{}", JSON.toJSONString(params));
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()));
if (params.getLevel() != null) { if (params.getLevel() == null) {
params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel()); params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
} }
params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId())); params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
...@@ -210,7 +210,7 @@ public class ConsumeStructureController { ...@@ -210,7 +210,7 @@ public class ConsumeStructureController {
log.info("消费构成-是否会员-区域参数:{}", JSON.toJSONString(params)); log.info("消费构成-是否会员-区域参数:{}", JSON.toJSONString(params));
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()));
if (params.getLevel() != null) { if (params.getLevel() == null) {
params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel()); params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
} }
params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId())); params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
......
...@@ -46,7 +46,7 @@ public class MemberCloudDataController { ...@@ -46,7 +46,7 @@ public class MemberCloudDataController {
log.info("会员分布-区域参数:{}", JSON.toJSONString(params)); log.info("会员分布-区域参数:{}", JSON.toJSONString(params));
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()));
if (params.getLevel() != null) { if (params.getLevel() == null) {
params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel()); params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
} }
params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId())); params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
......
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