Commit ce9bf946 by 陶光胜

观云台小程序

parent 9f04b92d
......@@ -6,10 +6,15 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.dto.DataAuthDTO;
import com.gic.cloud.service.DataAuthApiService;
import com.gic.cloud.web.vo.MbrVo;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.member.config.api.dto.OwnerMemberCardDTO;
import com.gic.member.config.api.service.MemberCardApiService;
import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreSearchDTO;
import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -17,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
......@@ -30,6 +36,8 @@ public class DataAuthUtils {
private StoreWidgetApiService storeWidgetApiService;
@Autowired
private StoreApiService storeApiService;
@Autowired
private MemberCardApiService memberCardApiService;
public StoreAuth getStoreAuth(Integer userId, Integer enterpriseId){
ServiceResponse<DataAuthDTO> response = this.dataAuthApiService.ggetDataAuthByUserId(enterpriseId, userId);
......@@ -77,4 +85,24 @@ public class DataAuthUtils {
}
public List<MbrVo> getMbrArea(Integer userId, Integer enterpriseId){
ServiceResponse<DataAuthDTO> response = this.dataAuthApiService.ggetDataAuthByUserId(enterpriseId, userId);
if(response.isSuccess() && response.getResult() != null){
ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
List<String> cards = Arrays.asList(response.getResult().getMemberCardAuth().split("_"));
if(result.isSuccess() && CollectionUtils.isNotEmpty(result.getResult())){
return result.getResult().stream().map(ownerMemberCardDTO -> {
if(cards.contains(ownerMemberCardDTO.getId().toString())){
MbrVo vo = new MbrVo();
vo.setMbrAreaId(ownerMemberCardDTO.getId().toString());
vo.setMbrAreaName(ownerMemberCardDTO.getCardName());
return vo;
}
return null;
}).collect(Collectors.toList());
}
}
return new ArrayList<>();
}
}
package com.gic.cloud.web.controller;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.service.IndexApiService;
import com.gic.cloud.web.qo.DateTypeQo;
import com.gic.cloud.web.vo.index.IndexSalesVo;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.data.api.dto.IndexSalesDTO;
import com.gic.data.api.service.IndexSalesApiService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
public class IndexController {
@Autowired
private IndexSalesApiService indexSalesApiService;
@Autowired
private StoreSearchUtils storeSearchUtils;
@RequestMapping("index-mbr")
public RestResponse indexMbr(Integer enterpriseId, Integer userId){
}
@RequestMapping("index-sales")
public RestResponse indexSales(Integer userId, Integer enterpriseId, String searchJSON,
DateTypeQo dateTypeQo, String mbrAreaId, Integer dataType){
List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
ServiceResponse<IndexSalesDTO> indexSales = this.indexSalesApiService.getIndexSales(enterpriseId, list, onLine,
StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null, dateTypeQo.getType(), dateTypeQo.getDate(), dataType);
return RestResponse.success(EntityUtil.changeEntityByJSON(IndexSalesVo.class, indexSales.getResult()));
}
}
......@@ -146,20 +146,31 @@ public class StoreSearchUtils {
}
}
public List<Integer> getChildrenStoreGroupIdList(Integer storeGroupId){
List<StoreGroupDTO> result = this.storeGroupApiService.listStoreGroupAndChildren(storeGroupId).getResult();
if(CollectionUtils.isNotEmpty(result)){
return result.stream().map(storeGroupDTO -> storeGroupDTO.getStoreGroupId()).collect(Collectors.toList());
}else {
return new ArrayList<>();
}
}
private void getOnlineStoreIds(String searchJson, OnLineAuth onlineStoreAuth, List<String> list, Integer channel){
StoreSearchQo searchQo = JSON.parseObject(searchJson).getObject(channel.toString(), StoreSearchQo.class);
log.info("getOnlineStoreIds:{},{}", searchJson, JSON.toJSONString(searchQo));
if(searchQo != null){
if(searchQo.getAll() == 1){
onlineStoreAuth.getList().stream().filter(s -> {
if(s.getChannel() == channel){
list.addAll(s.getStoreIdList());
if(StringUtils.isNotBlank(searchJson)){
StoreSearchQo searchQo = JSON.parseObject(searchJson).getObject(channel.toString(), StoreSearchQo.class);
log.info("getOnlineStoreIds:{},{}", searchJson, JSON.toJSONString(searchQo));
if(searchQo != null){
if(searchQo.getAll() == 1){
onlineStoreAuth.getList().stream().filter(s -> {
if(s.getChannel() == channel){
list.addAll(s.getStoreIdList());
}
return false;
});
}else {
if(StringUtils.isNotBlank(searchQo.getStoreGroupIds())){
list.addAll(Arrays.asList(searchQo.getStoreGroupIds().split(",")));
}
return false;
});
}else {
if(StringUtils.isNotBlank(searchQo.getStoreGroupIds())){
list.addAll(Arrays.asList(searchQo.getStoreGroupIds().split(",")));
}
}
}
......
package com.gic.cloud.web.vo;
public class MbrVo {
private String mbrAreaId;
private String mbrAreaName;
public String getMbrAreaId() {
return mbrAreaId;
}
public void setMbrAreaId(String mbrAreaId) {
this.mbrAreaId = mbrAreaId;
}
public String getMbrAreaName() {
return mbrAreaName;
}
public void setMbrAreaName(String mbrAreaName) {
this.mbrAreaName = mbrAreaName;
}
}
package com.gic.cloud.web.vo.index;
public class IndexConsume {
private String memberRate;
private String oldRate;
private String birthRate;
private String memberHb;
private String oldHb;
private String birthHb;
public String getMemberRate() {
return memberRate;
}
public void setMemberRate(String memberRate) {
this.memberRate = memberRate;
}
public String getOldRate() {
return oldRate;
}
public void setOldRate(String oldRate) {
this.oldRate = oldRate;
}
public String getBirthRate() {
return birthRate;
}
public void setBirthRate(String birthRate) {
this.birthRate = birthRate;
}
public String getMemberHb() {
return memberHb;
}
public void setMemberHb(String memberHb) {
this.memberHb = memberHb;
}
public String getOldHb() {
return oldHb;
}
public void setOldHb(String oldHb) {
this.oldHb = oldHb;
}
public String getBirthHb() {
return birthHb;
}
public void setBirthHb(String birthHb) {
this.birthHb = birthHb;
}
}
package com.gic.cloud.web.vo.index;
public class IndexMemberVo {
private String newMember;
private String totalMember;
private String posMember;
private String szMember;
private String tb;
private String hb;
public String getNewMember() {
return newMember;
}
public void setNewMember(String newMember) {
this.newMember = newMember;
}
public String getTotalMember() {
return totalMember;
}
public void setTotalMember(String totalMember) {
this.totalMember = totalMember;
}
public String getPosMember() {
return posMember;
}
public void setPosMember(String posMember) {
this.posMember = posMember;
}
public String getSzMember() {
return szMember;
}
public void setSzMember(String szMember) {
this.szMember = szMember;
}
public String getTb() {
return tb;
}
public void setTb(String tb) {
this.tb = tb;
}
public String getHb() {
return hb;
}
public void setHb(String hb) {
this.hb = hb;
}
}
package com.gic.cloud.web.vo.index;
public class IndexSalesVo {
private String totalSales;
private String perf;
private String tb;
private String hb;
private String scrAch;
private String tolAch;
public String getTotalSales() {
return totalSales;
}
public void setTotalSales(String totalSales) {
this.totalSales = totalSales;
}
public String getPerf() {
return perf;
}
public void setPerf(String perf) {
this.perf = perf;
}
public String getTb() {
return tb;
}
public void setTb(String tb) {
this.tb = tb;
}
public String getHb() {
return hb;
}
public void setHb(String hb) {
this.hb = hb;
}
public String getScrAch() {
return scrAch;
}
public void setScrAch(String scrAch) {
this.scrAch = scrAch;
}
public String getTolAch() {
return tolAch;
}
public void setTolAch(String tolAch) {
this.tolAch = tolAch;
}
}
......@@ -9,10 +9,10 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
<context:component-scan base-package="com.gic.enterprise"/>
<context:component-scan base-package="com.gic.cloud"/>
<!-- 应用名称 -->
<dubbo:application name="gic-platform-enterprise-web"/>
<dubbo:application name="gic-data-cloud-wxapp"/>
<dubbo:reference interface="com.gic.store.service.StoreRegionApiService" id="storeRegionApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.store.service.StoreBrandApiService" id="storeBrandApiService" timeout="60000" retries="0"/>
......@@ -143,4 +143,5 @@
<dubbo:reference interface="com.gic.store.service.StoreTagApiService" id="storeTagApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.cloud.service.StoreAttentionApiService" id="storeAttentionApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.cloud.service.TempStoreConditionApiService" id="tempStoreConditionApiService" timeout="6000" retries="0"/>
<dubbo:reference interface="com.gic.data.api.service.IndexSalesApiService" id="indexSalesApiService" timeout="6000" retries="0"/>
</beans>
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