tab_store&tab_store_field_rel&tab_store_region_rel&tab_store_brand_ref own_type改成owner_flag

gic-data-cloud-web/src/main/resources/dubbo-gic-data-cloud-web.xml

@@ -76,8 +76,6 @@
     <!--首页配置-->
     <dubbo:reference interface="com.gic.enterprise.service.IndexModuleApiService" id="indexModuleApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.HelpCenterApiService" id="helpCenterApiService" timeout="6000" />
-    <!--待办事项-->
-    <dubbo:reference interface="com.gic.enterprise.service.TodoItemApiService" id="todoItemApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.PushMessageApiService" id="pushMessageApiService" timeout="6000" />
     <!--自定义页面装修-->
     <dubbo:reference interface="com.gic.enterprise.service.AppletCustomPageApiService" id="appletCustomPageApiService" timeout="6000" />

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/auth/DataAuthUtils.java

 package com.gic.cloud.web.auth;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.auth.dto.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+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.gic.auth.dto.CustomUserAreaDTO;
+import com.gic.auth.dto.ResourceGroupDTO;
+import com.gic.auth.dto.ResourceGroupDataDTO;
+import com.gic.auth.dto.StoreResourceDTO;
 import com.gic.auth.service.ResourceGroupApiService;
 import com.gic.auth.service.UserResourceApiService;
-import com.gic.cloud.dto.DataAuthDTO;
-import com.gic.cloud.service.DataAuthApiService;
 import com.gic.cloud.web.constant.StoreChannelEnum;
 import com.gic.cloud.web.vo.MbrVo;
 import com.gic.enterprise.dto.WmStoreDTO;
 import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
 import com.gic.enterprise.service.UnionEnterpriseAuthApiService;
 import com.gic.enterprise.service.WmStoreApiService;
-import com.gic.enterprise.utils.UserDetailUtils;
-import com.gic.mall.share.api.service.ShopApiService;
 import com.gic.member.config.api.dto.AreaSearchDTO;
 import com.gic.member.config.api.dto.ChannelAreaInfoDTO;
-import com.gic.member.config.api.dto.OwnerMemberCardDTO;
 import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.UserListFieldApiService;
 import com.gic.platform.member.constant.enums.CuTypeEnum;
 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;
-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;
 /**
  * 数据权限工具
  * @ClassName: DataAuthUtils

@@ -162,7 +156,7 @@ public class DataAuthUtils {
                 MbrVo vo = new MbrVo();
                 vo.setMbrAreaId(dto.getAreaId().toString());
                 vo.setMbrAreaName(dto.getName());
-                vo.setOwnType(dto.getOwnerFlag());
+                vo.setOwnerFlag(dto.getOwnerFlag());
                 return vo;
             }).collect(Collectors.toList());
         }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/constant/Constants.java

 package com.gic.cloud.web.constant;
-
+/**
+ * 常量
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/28 9:37 AM

+ */
 public class Constants {
     /**
      * 第0层级

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java

@@ -83,7 +83,7 @@ public class BaseSalesController {
         if(isFirstLevel){
             vo.setChangeLevel(1);
         }
-        if(qo.getChannel() == StoreChannelEnum.ALL.getChannel()){
+        if(StoreChannelEnum.ALL.getChannel().equals(qo.getChannel())){
             vo.setLevelName(StoreChannelEnum.ALL.getMessage());
         } else if(StoreChannelEnum.OFFLINE.getChannel().equals(qo.getChannel())){
             vo.setLevelName(LevelUtil.getLevelName(qo.getLevel()));
@@ -98,14 +98,16 @@ public class BaseSalesController {
         dto.setCountType(2);
         Integer wgs = storeSearchUtils.isWgs(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
-        boolean isContainNoOwnership = (qo.getChannel().equals(StoreChannelEnum.ALL.getChannel()) || (StoreChannelEnum.OFFLINE.getChannel().equals(qo.getChannel()) && qo.getLevel() == levelVo.getLevel())) && wgs == 1;
+        boolean isContainNoOwnership = (qo.getChannel().equals(StoreChannelEnum.ALL.getChannel()) || (StoreChannelEnum.OFFLINE.getChannel().equals(qo.getChannel()) && qo.getLevel().equals(levelVo.getLevel()))) && wgs == 1;
         if(isContainNoOwnership){
             dto.getStoreInfoIdList().add(-1);
             dto.getOnLine().add("-1");
         }
         ServiceResponse<Page<BaseSalesDTO>> totalResponse = this.baseSalesApiService.pageBaseSales(dto);
         log.info("totalResponse:{}", JSON.toJSONString(totalResponse));
-        if(qo.getDataType() == 2){
+
+        boolean averageQueryType = qo.getDataType() == 2;
+        if(averageQueryType){
             this.goDownComponent.parseTotal(totalResponse, vo, "均值");
         } else {
             this.goDownComponent.parseTotal(totalResponse, vo);

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/GoDownComponent.java

@@ -98,7 +98,7 @@ public class GoDownComponent {
         /******线下渠道需要点击下钻，该值只会在线下时才会使用********/
         LevelVo levelVo = this.storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         log.info("params:{},,,levelVo:{}", JSON.toJSONString(params), JSON.toJSONString(levelVo));
-        if(params.getLevel() == StoreChannelEnum.ALL.getChannel()){
+        if(StoreChannelEnum.ALL.getChannel().equals(params.getLevel())){
             params.setLevel(levelVo.getLevel());
         }
         if(params.getLevel() > levelVo.getMaxLevel()){
@@ -109,18 +109,18 @@ public class GoDownComponent {
         List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(params.getEnterpriseId(), params.getParentId(), params.getLevel(), params.getChannel());
         params.setGroupIdList(childrenStoreGroupIdList);
         /****首页进入基础页面时，如果渠道为空，根据当前条件判断渠道，channel==null表示多渠道***/
-        if(params.getChannel() == Constants.ZERO){
+        if(Constants.ZERO.equals(params.getChannel())){
             /**********设置层级名称，只有在首次进入页面会展示，下钻均显示返回上一级*********/
             Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
             params.setChannel(newChannel);
         }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
         boolean isFirstLevel = StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel())  && params.getLevel().intValue() == levelVo.getLevel()
-                || (params.getLevel() == Constants.SEV || params.getLevel() == Constants.EIGHT);
+                || (Constants.SEV.equals(params.getLevel()) || Constants.EIGHT.equals(params.getLevel()));
         if(isFirstLevel){
             vo.setChangeLevel(1);
         }
-        if(params.getChannel() == StoreChannelEnum.ALL.getChannel()){
+        if(StoreChannelEnum.ALL.getChannel().equals(params.getChannel())){
             vo.setLevelName(StoreChannelEnum.ALL.getMessage());
         } else if(StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel())){
             vo.setLevelName(LevelUtil.getLevelName(params.getLevel()));
@@ -134,7 +134,7 @@ public class GoDownComponent {
     public void setValueTotal(AbstractCommonQo params, LevelVo levelVo){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
-        boolean isContainNoOwnership = (params.getChannel() == Constants.ZERO || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
+        boolean isContainNoOwnership = (Constants.ZERO.equals(params.getChannel()) || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
         if(isContainNoOwnership){
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
                 params.setStoreInfoIdList(new ArrayList<>());
@@ -149,7 +149,7 @@ public class GoDownComponent {
 
     public void setValueTotalForArea(AbstractCommonQo params, LevelVo levelVo){
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
-        boolean isContainNoOwnership = (params.getChannel() == Constants.ZERO || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel()));
+        boolean isContainNoOwnership = (Constants.ZERO.equals(params.getChannel()) || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel()));
         if(isContainNoOwnership){
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
                 params.setStoreInfoIdList(new ArrayList<>());
@@ -230,7 +230,7 @@ public class GoDownComponent {
 
         int clerkLevel = 8;
         if(page != null && CollectionUtils.isNotEmpty(page.getResult())){
-            if(channel == Constants.ZERO){
+            if(Constants.ZERO.equals(channel)){
                 //全渠道
                 allChannel(page, level);
             }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

 package com.gic.cloud.web.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.MenuDTO;
 import com.gic.auth.dto.UserDTO;
 import com.gic.auth.service.MenuApiService;
 import com.gic.auth.service.UserApiService;
-import com.gic.cloud.dto.FunctionDTO;
-import com.gic.cloud.dto.FunctionModuleDTO;
 import com.gic.cloud.service.FunctionApiService;
-import com.gic.cloud.service.FunctionModuleApiService;
-import com.gic.cloud.service.IndexApiService;
 import com.gic.cloud.web.auth.DataAuthUtils;
 import com.gic.cloud.web.constant.ErrorCode;
 import com.gic.cloud.web.qo.DateTypeQo;
@@ -25,17 +33,6 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.data.api.dto.*;
 import com.gic.data.api.service.IndexSalesApiService;
-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.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 字典
@@ -108,7 +105,6 @@ public class IndexController {
             list.add(-1);
             onLine.add("-1");
         }
-        //List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
         ServiceResponse<IndexMemberOrderCntDTO> allMemberOrderCntResponse = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
                 null, dateTypeQo.getType(), dateTypeQo.getDate(), 1);

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -21,6 +21,7 @@ import com.gic.cloud.web.vo.LevelVo;
 import com.gic.enterprise.dto.WmStoreDTO;
 import com.gic.enterprise.service.WmStoreApiService;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.store.constant.StoreOwnerFlagEnum;
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.dto.StoreGroupDTO;
 import com.gic.store.dto.StoreSearchDTO;
@@ -141,13 +142,13 @@ public class StoreSearchUtils {
             storeSearchDTO.setStoreTags(StringUtils.isBlank(storeSearchQo.getStoreTag()) ? null :storeSearchQo.getStoreTag().replaceAll(",",  " "));
             storeSearchDTO.setStoreBrandIds(StringUtils.isBlank(storeSearchQo.getStoreBrand()) ? null :storeSearchQo.getStoreBrand().replaceAll(",",  " "));
             String resourceType = storeSearchQo.getResourceType();
-            Integer ownType = null;
+            Integer ownerFlag = null;
             if(StringUtils.isNotBlank(resourceType)){
                 if("1".equals(resourceType)){
-                    ownType = 0;
+                    ownerFlag = StoreOwnerFlagEnum.OWNER.getCode();
                 }
                 if("2".equals(resourceType)){
-                    ownType = 1;
+                    ownerFlag = StoreOwnerFlagEnum.OTHER.getCode();
                 }
             }
             if(storeSearchQo.getAttentionStore() == 1){
@@ -165,10 +166,10 @@ public class StoreSearchUtils {
             ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000);
             if(pageServiceResponse.isSuccess() && pageServiceResponse.getResult() != null && CollectionUtils.isNotEmpty(pageServiceResponse.getResult().getResult())){
                 List<StoreDTO> storeDTOList = pageServiceResponse.getResult().getResult();
-                Integer finalOwnType = ownType;
+                Integer finalOwnerFlag = ownerFlag;
                 List<Integer> storeInfoIdList = storeDTOList.stream().filter(storeDTO -> {
-                    if(finalOwnType != null){ //按资源类型进行过滤
-                        if(storeDTO.getOwnType().equals(finalOwnType)){
+                    if(finalOwnerFlag != null){ //按资源类型进行过滤
+                        if(storeDTO.getOwnerFlag().equals(finalOwnerFlag)){
                             return true;
                         }else {
                             return  false;
@@ -295,7 +296,7 @@ public class StoreSearchUtils {
     }
 
     public List<Integer> getChildrenStoreGroupIdList(Integer enterpriseId, Integer parentId, Integer level, Integer channel){
-        if(channel == StoreChannelEnum.OFFLINE.getChannel()){
+        if(StoreChannelEnum.OFFLINE.getChannel().equals(channel)){
             int storeGroupLevel = 7;
             if(level < storeGroupLevel){
                 if(parentId != null){
@@ -314,7 +315,7 @@ public class StoreSearchUtils {
                 }
             }
         }
-        if(channel == StoreChannelEnum.WMMALL.getChannel()){
+        if(StoreChannelEnum.WMMALL.getChannel().equals(channel)){
             List<WeimobStoreGicInfoDTO> list = weimobStoreSiteApiService.listStoreId(parentId).getResult();
             List<Integer> storeInfoIdList = list.stream().map(s -> s.getStoreInfoId()).collect(Collectors.toList());
             return storeInfoIdList;

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreWidgetController.java

@@ -24,6 +24,7 @@ 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 com.gic.store.constant.StoreOwnerFlagEnum;
 import com.gic.store.dto.*;
 import com.gic.store.service.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -177,7 +178,7 @@ public class StoreWidgetController {
                     itemsVo.setIdChain(map.get(dto.getStoreGroupId()).getIdChain() + dto.getStoreInfoId() + "_");
                     itemsVo.setNameChain(map.get(dto.getStoreGroupId()).getNameChain() + dto.getStoreName() + "/");
                     itemsVo.setHasAttention(result.get(dto.getStoreInfoId()) == null ? 0 : 1);
-                    itemsVo.setOwnType(dto.getOwnType() == 1 ? 2 : 1);
+                    itemsVo.setOwnerFlag(dto.getOwnerFlag());
                     items.add(itemsVo);
                 }
                 groupVoPage.setTotalCount(response.getResult().getTotalCount());
@@ -270,7 +271,7 @@ public class StoreWidgetController {
                     StoreTypeVo storeTypeVo = new StoreTypeVo();
                     storeTypeVo.setId(storeBrandDTO.getStoreBrandId()+"");
                     storeTypeVo.setName(storeBrandDTO.getStoreBrandName());
-                    storeTypeVo.setOwnType(storeBrandDTO.getType());
+                    storeTypeVo.setOwnerFlag(storeBrandDTO.getOwnerFlag());
                     list.add(storeTypeVo);
                 });
             }
@@ -340,7 +341,7 @@ public class StoreWidgetController {
                         searchVo.setIdChain((map.get(storeDTO.getStoreGroupId()) != null ? map.get(storeDTO.getStoreGroupId()).getIdChain() : "") + storeDTO.getStoreInfoId()+"_");
                         searchVo.setNameChain((map.get(storeDTO.getStoreGroupId())!= null ? map.get(storeDTO.getStoreGroupId()).getNameChain() : "") + storeDTO.getStoreName() + "/");
                         searchVo.setHasAttention(attentionStoreDtoMap.get(storeDTO.getStoreInfoId()) == null ? 0 : 1);
-                        searchVo.setOwnType(storeDTO.getOwnType() == 1 ? 2 : 1);
+                        searchVo.setOwnerFlag(storeDTO.getOwnerFlag());
                         storeSearchVoList.add(searchVo);
                     }
                 }
@@ -404,7 +405,7 @@ public class StoreWidgetController {
                             storeSearchVo.setIdChain("_" + StoreChannelEnum.WMMALL.getChannel() + "_" + wmStoreDTO.getWmStoreId() +"_");
                             storeSearchVo.setNameChain(StoreChannelEnum.WMMALL.getMessage() + "/" + wmStoreDTO.getWmMainAccount());
                             storeSearchVo.setChannel(StoreChannelEnum.WMMALL.getChannel());
-                            storeSearchVo.setOwnType(wmStoreDTO.getEnterpriseId().equals(enterpriseId) ? 1 : 2);
+                            storeSearchVo.setOwnerFlag(wmStoreDTO.getEnterpriseId().equals(enterpriseId) ? 1 : 0);
                             list.add(storeSearchVo);
                         }
                     }
@@ -483,7 +484,8 @@ public class StoreWidgetController {
                         onLineStoreVo.setName(wmStoreDTO.getWmPidName());
                         onLineStoreVo.setIdChain("_" + type + "_" + wmStoreDTO.getWmStoreId()+"_");
                         onLineStoreVo.setNameChain(StoreChannelEnum.WMMALL.getMessage() + "/" + wmStoreDTO.getWmPidName());
-                        onLineStoreVo.setOwnType(enterpriseId == wmStoreDTO.getEnterpriseId() ? 1: 2);
+                        onLineStoreVo.setOwnerFlag(enterpriseId.equals(wmStoreDTO.getEnterpriseId()) ?
+                                StoreOwnerFlagEnum.OWNER.getCode(): StoreOwnerFlagEnum.OTHER.getCode());
                         list.add(onLineStoreVo);
                     }
                 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/CloudDataServiceInfoVO.java

@@ -59,4 +59,13 @@ public class CloudDataServiceInfoVO implements Serializable{
         this.expireDate = expireDate;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "CloudDataServiceInfoVO{" +
+                "versionName='" + versionName + '\'' +
+                ", expireTime=" + expireTime +
+                ", expireDate='" + expireDate + '\'' +
+                '}';
+    }
 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/MbrVo.java

 package com.gic.cloud.web.vo;
+
+import com.gic.store.constant.StoreOwnerFlagEnum;
+
 /**
  * 会员卡
  * @ClassName: MbrVo

@@ -11,6 +14,11 @@ public class MbrVo {
     private String mbrAreaName;
     private Integer ownType;
 
+    /**
+     * 共享标记 1:自有 0：共享
+     */
+    private Integer ownerFlag;
+
     public String getMbrAreaId() {
         return mbrAreaId;
     }
@@ -28,10 +36,18 @@ public class MbrVo {
     }
 
     public Integer getOwnType() {
-        return ownType;
+        if (StoreOwnerFlagEnum.OTHER.getCode() == ownerFlag) {
+            return 2;
+        }
+        return StoreOwnerFlagEnum.OWNER.getCode();
+    }
+
+    public Integer getOwnerFlag() {
+        return ownerFlag;
     }
 
-    public void setOwnType(Integer ownType) {
-        this.ownType = ownType;
+    public MbrVo setOwnerFlag(Integer ownerFlag) {
+        this.ownerFlag = ownerFlag;
+        return this;
     }
 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/OnLineStoreVo.java

 package com.gic.cloud.web.vo;
+
+import com.gic.store.constant.StoreOwnerFlagEnum;
+
 /**
  * 上线门店
  * @ClassName: OnLineStoreVo

@@ -14,6 +17,11 @@ public class OnLineStoreVo {
     private Integer hasChildren = 0;
     private Integer ownType;
 
+    /**
+     * 共享标记 1:自有 0：共享
+     */
+    private Integer ownerFlag;
+
 
     public Integer getHasChildren() {
         return hasChildren;
@@ -55,11 +63,19 @@ public class OnLineStoreVo {
         this.nameChain = nameChain;
     }
 
-    public Integer getOwnType() {
-        return ownType;
+    public Integer getOwnerFlag() {
+        return ownerFlag;
     }
 
-    public void setOwnType(Integer ownType) {
-        this.ownType = ownType;
+    public OnLineStoreVo setOwnerFlag(Integer ownerFlag) {
+        this.ownerFlag = ownerFlag;
+        return this;
+    }
+
+    public Integer getOwnType() {
+        if (StoreOwnerFlagEnum.OTHER.getCode() == ownerFlag) {
+            return 2;
+        }
+        return StoreOwnerFlagEnum.OWNER.getCode();
     }
 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/StoreGroupItemsVo.java

 package com.gic.cloud.web.vo;
+
+import com.gic.store.constant.StoreOwnerFlagEnum;
+
 /**
  * 门店分组
  * @ClassName: StoreGroupItemsVo

@@ -19,6 +22,11 @@ public class StoreGroupItemsVo {
      */
     private Integer ownType;
 
+    /**
+     * 共享标记 1:自有 0：共享
+     */
+    private Integer ownerFlag;
+
     public Integer getId() {
         return id;
     }
@@ -76,10 +84,18 @@ public class StoreGroupItemsVo {
     }
 
     public Integer getOwnType() {
-        return ownType;
+        if (StoreOwnerFlagEnum.OTHER.getCode() == ownerFlag) {
+            return 2;
+        }
+        return StoreOwnerFlagEnum.OWNER.getCode();
+    }
+
+    public Integer getOwnerFlag() {
+        return ownerFlag;
     }
 
-    public void setOwnType(Integer ownType) {
-        this.ownType = ownType;
+    public StoreGroupItemsVo setOwnerFlag(Integer ownerFlag) {
+        this.ownerFlag = ownerFlag;
+        return this;
     }
 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/StoreSearchVo.java

 package com.gic.cloud.web.vo;
+
+import com.gic.store.constant.StoreOwnerFlagEnum;
+
 /**
  * 门店查询条件
  * @ClassName: StoreSearchVo

@@ -20,6 +23,11 @@ public class StoreSearchVo {
      */
     private Integer ownType;
 
+    /**
+     * 共享标记 1:自有 0：共享
+     */
+    private Integer ownerFlag;
+
     public String getId() {
         return id;
     }
@@ -85,10 +93,18 @@ public class StoreSearchVo {
     }
 
     public Integer getOwnType() {
-        return ownType;
+        if (StoreOwnerFlagEnum.OTHER.getCode() == ownerFlag) {
+            return 2;
+        }
+        return StoreOwnerFlagEnum.OWNER.getCode();
+    }
+
+    public Integer getOwnerFlag() {
+        return ownerFlag;
     }
 
-    public void setOwnType(Integer ownType) {
-        this.ownType = ownType;
+    public StoreSearchVo setOwnerFlag(Integer ownerFlag) {
+        this.ownerFlag = ownerFlag;
+        return this;
     }
 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/StoreTypeVo.java

 package com.gic.cloud.web.vo;
+
+import com.gic.store.constant.StoreOwnerFlagEnum;
+
 /**
  * 门店类型
  * @ClassName: StoreTypeVo

@@ -14,6 +17,13 @@ public class StoreTypeVo {
      */
     private Integer ownType;
 
+    /**
+     * 共享标记 1:自有 0：共享
+     */
+    private Integer ownerFlag;
+
+
+
     public String getId() {
         return id;
     }
@@ -31,10 +41,18 @@ public class StoreTypeVo {
     }
 
     public Integer getOwnType() {
-        return ownType;
+        if (StoreOwnerFlagEnum.OTHER.getCode() == ownerFlag) {
+            return 2;
+        }
+        return StoreOwnerFlagEnum.OWNER.getCode();
+    }
+
+    public Integer getOwnerFlag() {
+        return ownerFlag;
     }
 
-    public void setOwnType(Integer ownType) {
-        this.ownType = ownType;
+    public StoreTypeVo setOwnerFlag(Integer ownerFlag) {
+        this.ownerFlag = ownerFlag;
+        return this;
     }
 }

gic-data-cloud-wxapp/src/main/resources/dubbo-gic-data-cloud-wxapp.xml

@@ -79,7 +79,6 @@
     <dubbo:reference interface="com.gic.enterprise.service.IndexModuleApiService" id="indexModuleApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.HelpCenterApiService" id="helpCenterApiService" timeout="6000" />
     <!--待办事项-->
-    <dubbo:reference interface="com.gic.enterprise.service.TodoItemApiService" id="todoItemApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.PushMessageApiService" id="pushMessageApiService" timeout="6000" />
     <!--自定义页面装修-->
     <dubbo:reference interface="com.gic.enterprise.service.AppletCustomPageApiService" id="appletCustomPageApiService" timeout="6000" />