Merge branch 'developer' into 'master'

Developer

See merge request !8

gic-platform-auth-api/src/main/java/com/gic/auth/service/CollaboratorApiService.java

@@ -50,17 +50,6 @@ public interface CollaboratorApiService {
     ServiceResponse<List<AppDTO>> listApp(Integer enterpriseId);
 
     /**
-     * 查询子应用
-     * @Title: listSubApp

-     * @Description:
-    
 * @author guojuxing
-     * @param appId 父级应用ID
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.AppDTO>>

-    
 */
-    ServiceResponse<List<AppDTO>> listSubApp(String appId, Integer enterpriseId);
-
-    /**
      * 查询详情
      * @Title: getDetail

      * @Description:

gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceApiService.java

@@ -101,4 +101,14 @@ public interface ResourceApiService {
      * @throws
      */
     ServiceResponse<OrderResourceDTO> getOrderResourceByUserId(Integer userId);
+
+    /**
+     * @Title: getUserResourceByUserId
+     * @Description:
+     * @author zhiwj
+     * @param userId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.OrderResourceDTO> 返回null表示没有授权  返回 -1 表示全部
+     * @throws
+     */
+    ServiceResponse<Long> getUserResourceByUserId(Integer userId);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuditorApiServiceImpl.java

@@ -85,6 +85,16 @@ public class AuditorApiServiceImpl implements AuditorApiService {
         if (auditedGroupIsNotExist) {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR);
         }
+        if (auditorDTO.getUserId() != null) {
+            TabSysUser user = userService.getUserById(auditorDTO.getUserId());
+            if (user == null) {
+                return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+            }
+            if (!StringUtils.equals(auditorDTO.getPhone(), user.getPhoneNumber())) {
+                return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "关联管理员手机号不一致");
+            }
+        }
+
         auditorDTO.setIsUse(auditorDTO.getUserId() == null ? 0 : 1);
         // 这里进来的 不会去修改openid，所以把openid设为null
         auditorDTO.setOpenid(null);
@@ -167,7 +177,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
                     String nickname = userDTO.getNickname();
                     auditorDTO.setWeChatNickName(nickname);
                 } else {
-                    logger.info("openid:{}, enterpriseId:{} 查询不到会员", auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
+                    logger.info("openid:{}, enterpriseId:{} 查询不到该openid对应的信息", auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
                 }
             }else{
                 logger.warn("调用serviceUserApiService.getByOpenid 服务失败,openid:{}, msg:{}", auditorDTO.getOpenid(), service.getMessage());
@@ -209,6 +219,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
                         AuditorDTO auditorDTO = new AuditorDTO();
                         auditorDTO.setAuditorId(auditorId);
                         auditorDTO.setOpenid(openid);
+                        auditorDTO.setIsUse(1);
                         this.auditorService.update(auditorDTO);
                     }
                 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/CollaboratorApiServiceImpl.java

 package com.gic.auth.service.outer.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.gic.auth.constant.AccountGroupMemberTypeEnum;
-import com.gic.auth.dto.MenuDTO;
-import com.gic.auth.entity.TabSysAccountGroupRel;
-import com.gic.auth.service.*;
-import com.gic.enterprise.dto.EnterpriseDTO;
-import com.gic.enterprise.service.EnterpriseApiService;
-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.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.constant.AccountGroupMemberTypeEnum;
 import com.gic.auth.constant.SignConstants;
 import com.gic.auth.dto.AppDTO;
 import com.gic.auth.dto.CollaboratorDTO;
 import com.gic.auth.dto.CollaboratorListDTO;
+import com.gic.auth.dto.MenuDTO;
+import com.gic.auth.entity.TabSysAccountGroupRel;
 import com.gic.auth.entity.TabSysCollaborator;
 import com.gic.auth.entity.TabSysCollaboratorRoleRel;
 import com.gic.auth.qo.CollaboratorListQO;
+import com.gic.auth.service.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.enterprise.utils.valid.ValidParamsUtils;
 import com.gic.open.api.dto.ApplicationDTO;
-import com.gic.open.api.dto.ApplicationSubDTO;
 import com.gic.open.api.service.AppTokenApiService;
-import com.gic.open.api.service.ApplicationSubApiService;
+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.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service("collaboratorApiService")
 public class CollaboratorApiServiceImpl implements CollaboratorApiService {
@@ -44,8 +41,6 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
     @Autowired
     private AppTokenApiService appTokenApiService;
     @Autowired
-    private ApplicationSubApiService applicationSubApiService;
-    @Autowired
     private CollaboratorRoleRelService collaboratorRoleRelService;
     @Autowired
     private EnterpriseApiService enterpriseApiService;
@@ -111,26 +106,6 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
     }
 
     @Override
-    public ServiceResponse<List<AppDTO>> listSubApp(String appId, Integer enterpriseId) {
-        ServiceResponse<List<ApplicationSubDTO>> subAppResult = applicationSubApiService.listSubApp(enterpriseId,
-                Long.valueOf(appId));
-        if (subAppResult.isSuccess()) {
-            List<ApplicationSubDTO> subAppList = subAppResult.getResult();
-            if (CollectionUtils.isNotEmpty(subAppList)) {
-                List<AppDTO> result = new ArrayList<>(subAppList.size());
-                for (ApplicationSubDTO subApp : subAppList) {
-                    AppDTO temp = new AppDTO();
-                    temp.setAppId(subApp.getApplicationId().toString());
-                    temp.setAppName(subApp.getSubAppName());
-                    result.add(temp);
-                }
-                return ServiceResponse.success(result);
-            }
-        }
-        return ServiceResponse.success(new ArrayList<>());
-    }
-
-    @Override
     public ServiceResponse<CollaboratorDTO> getDetail(Integer collaboratorId) {
         TabSysCollaborator record = collaboratorService.getById(collaboratorId);
         if (record == null) {

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

 package com.gic.auth.service.outer.impl;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.gic.auth.entity.TabSysBusinessFrontRes;
 import com.gic.enterprise.dto.EnterpriseDTO;
@@ -83,13 +84,14 @@ public class MenuApiServiceImpl implements MenuApiService {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "超级管理员拥有全部");
         }
         List<TabSysMenu> menuList = getUserMenuList(userId);
-        Set<String> resultSet = new HashSet<>();
+        Set<String> resultSet;
         if (CollectionUtils.isNotEmpty(menuList)) {
-            for (TabSysMenu record : menuList) {
-                if (record.getLevel().intValue() == 1) {
-                    resultSet.add(record.getProject());
-                }
-            }
+            resultSet = new HashSet<>(menuList.stream()
+                    .filter(e -> !e.getProject().equals("gic"))
+                    .filter(e -> e.getLevel().intValue() == 1)
+                    .map(e -> e.getProject()).collect(Collectors.toList()));
+        } else {
+            resultSet = new HashSet<>();
         }
         return ServiceResponse.success(resultSet);
     }
@@ -981,7 +983,7 @@ public class MenuApiServiceImpl implements MenuApiService {
                             && menu.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT);
                 } else {
                     isMapMenu = menu.getMenuType().intValue() == MenuTypeEnum.PAGE.getCode()
-                            && !menu.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT);
+                            && menu.getProject().equals(versionCode);
                 }
                 if (isMapMenu) {
                     menuIdList.add(menu.getMenuId());
@@ -1118,6 +1120,8 @@ public class MenuApiServiceImpl implements MenuApiService {
                 authItemIdList.add(menu.getMenuId());
             }
         }
+        //如果是gic菜单，需要去判断版本code
+        boolean isNeedValidVersionCode = MenuProjectConstants.DEFAULT_PROJECT_CODE == projectCode;
 
         List<MenuDTO> resultList = new ArrayList<>();
         Map<String, Object> operationItemMap = new HashMap<>(16);
@@ -1134,8 +1138,9 @@ public class MenuApiServiceImpl implements MenuApiService {
         //当时超级管理员的时候，operationItemMap是没有值的，因此会一直有效。
         if (CollectionUtils.isNotEmpty(operationItemListOfAuthItem)) {
             for (MenuDTO menuDTO : operationItemListOfAuthItem) {
-                if (!operationItemMap.containsKey(menuDTO.getMenuId().toString()) || StringUtils.isBlank(versionCode)
-                        || !menuDTO.getMenuVersion().contains("_" + versionCode + "_")) {
+                if (!operationItemMap.containsKey(menuDTO.getMenuId().toString())
+                        || (isNeedValidVersionCode && StringUtils.isBlank(versionCode))
+                        || (isNeedValidVersionCode && !menuDTO.getMenuVersion().contains("_" + versionCode + "_"))) {
                     //如果不存在，或者操作项的版本不对
                     //则是没有权限的操作项
                     resultList.add(menuDTO);

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java

@@ -342,4 +342,20 @@ public class ResourceApiServiceImpl implements ResourceApiService {
 
         return EnterpriseServiceResponse.success(defaultResource);
     }
+
+    @Override
+    public ServiceResponse<Long> getUserResourceByUserId(Integer userId) {
+        TabSysUser user = userService.getUserById(userId);
+        if (user.getSuperAdmin() == 1) {
+            // 是超管就返回所有
+            return EnterpriseServiceResponse.success(-1L);
+        }
+        List<UserResourceDTO> resourceDTOList = this.userResourceService.listUserResourceByUserId(userId);
+        if (CollectionUtils.isEmpty(resourceDTOList)) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+        UserResourceDTO userResourceDTO = resourceDTOList.get(0);
+        TabSysResource resource = this.resourceService.getResource(userResourceDTO.getResourceId());
+        return EnterpriseServiceResponse.success(resource.getUserResource());
+    }
 }

gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml

@@ -31,7 +31,6 @@
     <dubbo:reference interface="com.gic.open.api.service.ApplicationApiService" id="applicationApiService" timeout="6000" />
     <!--应用市场应用列表-->
     <dubbo:reference interface="com.gic.open.api.service.AppTokenApiService" id="appTokenApiService" timeout="6000" />
-    <dubbo:reference interface="com.gic.open.api.service.ApplicationSubApiService" id="applicationSubApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.open.api.service.ServeApiService" id="serveApiService" timeout="60000" />
     <!--审核员-->
     <dubbo:service interface="com.gic.auth.service.AuditorApiService" ref="auditorApiService" timeout="6000" />

gic-platform-auth-service/src/main/resources/mapper/TabAuditedGroupMapper.xml

@@ -142,14 +142,13 @@
     select
     <include refid="Base_Column_List" />
     from tab_audited_group
-    <where>
-      <if test="enterpriseId != null ">
-          and enterprise_id = #{enterpriseId}
-      </if>
-      <if test="auditedGroupName != null and auditedGroupName != '' ">
-          and audited_group_name like concat('%', #{auditedGroupName}, '%')
-      </if>
-    </where>
+    where status = 1
+    <if test="enterpriseId != null ">
+        and enterprise_id = #{enterpriseId}
+    </if>
+    <if test="auditedGroupName != null and auditedGroupName != '' ">
+        and audited_group_name like concat('%', #{auditedGroupName}, '%')
+    </if>
   </select>
   <select id="countByAuditedGroupIds" resultType="java.lang.Integer">
     select count(1)

gic-platform-auth-service/src/main/resources/mapper/TabAuditorMapper.xml

@@ -201,6 +201,7 @@
         #{item}
       </foreach>
     </if>
+    order by create_time desc
   </select>
   <select id="getAuditorByOpenid" resultMap="BaseResultMap">
     select

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/AuthCodeController.java

@@ -36,10 +36,11 @@ public class AuthCodeController {
 
     @RequestMapping("send-auth-code")
     public RestResponse sendAuthCode(Integer eid){
-        if(eid == null){
-            return RestResponse.failure(ErrorCode.NOTEXISTS.getCode(), "商户不存在");
-        }
+//        if(eid == null){
+//            return RestResponse.failure(ErrorCode.NOTEXISTS.getCode(), "商户不存在");
+//        }
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        eid = enterpriseId;
         String code = CreateRandomUtils.getStringRandom(4);
         AuthCodeDTO authCodeDTO = new AuthCodeDTO();
         authCodeDTO.setAuthCode(code);

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/CollaboratorController.java

 package com.gic.auth.web.controller;
 
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.fastjson.JSON;
-import com.gic.auth.web.vo.TestObj;
-import com.gic.download.qo.HeaderQO;
-import com.gic.enterprise.context.RequestContext;
-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.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.constant.MenuLevelConstants;
@@ -27,14 +12,24 @@ import com.gic.auth.qo.MenuListQO;
 import com.gic.auth.service.CollaboratorApiService;
 import com.gic.auth.service.MenuApiService;
 import com.gic.auth.web.vo.CollaboratorDetailVO;
+import com.gic.auth.web.vo.TestObj;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.*;
 import com.gic.download.utils.log.LogUtils;
+import com.gic.enterprise.context.RequestContext;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetail;
 import com.gic.enterprise.utils.UserDetailUtils;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 @RestController
 @RequestMapping("/collaborator")
@@ -130,12 +125,6 @@ public class CollaboratorController extends DownloadUtils{
         return RestResponse.success(reportId);
     }
 
-    @RequestMapping("/list-sub-app")
-    public RestResponse listSubApp(String appId) {
-        return ResultControllerUtils.commonResult(
-                collaboratorApiService.listSubApp(appId, UserDetailUtils.getUserDetail().getEnterpriseId()));
-    }
-
     @RequestMapping("/get-detail")
     public RestResponse getDetail(Integer collaboratorId) {
         LogUtils.createLog("获取协作人明细", "北丐测试");

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -3,17 +3,12 @@ package com.gic.auth.web.controller;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.auth.dto.ChannelResourceDTO;
 import com.gic.auth.dto.ResourceDTO;
-import com.gic.auth.dto.SmsSignResourceDTO;
 import com.gic.auth.service.ResourceApiService;
 import com.gic.auth.web.qo.OrderResourceQO;
 import com.gic.auth.web.qo.PageQO;
 import com.gic.auth.web.qo.ResourceQO;
-import com.gic.auth.web.vo.ApplicationSubVO;
-import com.gic.auth.web.vo.ApplicationVO;
-import com.gic.auth.web.vo.OrderResourceVO;
-import com.gic.auth.web.vo.ResourceVO;
+import com.gic.auth.web.vo.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.log.LogUtils;
@@ -32,7 +27,6 @@ import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
-
 import com.gic.open.api.service.AppTokenApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +35,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -140,13 +133,13 @@ public class ResourceController {
                 vo.setOrderResourceJSON(orderResourceList);
             }
             if (StringUtils.isNotBlank(dto.getSmsSignResourceJson())) {
-                SmsSignResourceDTO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(),
-                        SmsSignResourceDTO.class);
+                SmsSignResourceVO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(),
+                        SmsSignResourceVO.class);
                 vo.setSmsResourceJSON(smsSignResourceDTO);
             }
             if (StringUtils.isNotBlank(dto.getChannelResourceJson())) {
-                ChannelResourceDTO channelResourceDTO = JSON.parseObject(dto.getChannelResourceJson(),
-                        ChannelResourceDTO.class);
+                ChannelResourceVO channelResourceDTO = JSON.parseObject(dto.getChannelResourceJson(),
+                        ChannelResourceVO.class);
                 vo.setChannelResourceJSON(channelResourceDTO);
             }
             return RestResponse.success(vo);
@@ -163,9 +156,9 @@ public class ResourceController {
         List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService
                 .listValidServiceConfigAppId(enterpriseId).getResult();
         Map<String, Object> map = new HashMap<>(4);
-        map.put("memberCardList", memberCardList);
-        map.put("appletList", appletList);
-        map.put("serviceList", serviceList);
+        map.put("memberCardList", EntityUtil.changeEntityListByJSON(OwnerMemberCardVO.class, memberCardList));
+        map.put("appletList", EntityUtil.changeEntityListByJSON(AppletsConfigSimpleOutputVO.class, appletList));
+        map.put("serviceList", EntityUtil.changeEntityListByJSON(ServiceConfigSimpleOutputVO.class, serviceList));
         return RestResponse.success(map);
     }
 

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/AppletsConfigSimpleOutputVO.java

+package com.gic.auth.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-04-28 11:32
+ */
+public class AppletsConfigSimpleOutputVO implements Serializable {
+    private static final long serialVersionUID = -579110975175375897L;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long appletConfigId;
+    private String appletConfigName;
+    private String img;
+    private String appId;
+    private Integer enterpriseId;
+    private Integer statusFlag;
+    private String appletUserName;
+
+    public Long getAppletConfigId() {
+        return appletConfigId;
+    }
+
+    public void setAppletConfigId(Long appletConfigId) {
+        this.appletConfigId = appletConfigId;
+    }
+
+    public String getAppletConfigName() {
+        return appletConfigName;
+    }
+
+    public void setAppletConfigName(String appletConfigName) {
+        this.appletConfigName = appletConfigName;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public String getAppletUserName() {
+        return appletUserName;
+    }
+
+    public void setAppletUserName(String appletUserName) {
+        this.appletUserName = appletUserName;
+    }
+}

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ChannelResourceVO.java

 package com.gic.auth.web.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -11,8 +13,11 @@ import java.util.List;
 public class ChannelResourceVO implements Serializable {
     private static final long serialVersionUID = -7372101518056686792L;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> cardConfigIdList;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> appletConfigIdList;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> serviceConfigIdList;
 
     public List<Long> getCardConfigIdList() {

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/OrderResourceVO.java

 package com.gic.auth.web.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -21,10 +23,10 @@ public class OrderResourceVO implements Serializable {
     /**
      * channel:2 或者 channel:3时 传店铺ids，
      */
-//    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> storeContent;
 
-//    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long storeWidgetId;
 
     public Integer getChannel() {

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/OwnerMemberCardVO.java

+package com.gic.auth.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-04-28 11:32
+ */
+public class OwnerMemberCardVO implements Serializable {
+    private static final long serialVersionUID = -8599285249416045174L;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cardConfigId;
+    private Integer ownerId;
+    private String cardCode;
+    private String cardName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCardConfigId() {
+        return cardConfigId;
+    }
+
+    public void setCardConfigId(Long cardConfigId) {
+        this.cardConfigId = cardConfigId;
+    }
+
+    public Integer getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(Integer ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getCardCode() {
+        return cardCode;
+    }
+
+    public void setCardCode(String cardCode) {
+        this.cardCode = cardCode;
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+}

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java

 package com.gic.auth.web.vo;
 
-import com.gic.auth.dto.ChannelResourceDTO;
-import com.gic.auth.dto.SmsSignResourceDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.util.List;
@@ -29,11 +28,13 @@ public class ResourceVO implements Serializable{
      */
     private Integer enterpriseId;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userResource;
 
     /**
      * 门店资源
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long storeResource;
 
     /**
@@ -41,11 +42,13 @@ public class ResourceVO implements Serializable{
      */
     private List<OrderResourceVO> orderResourceJSON;
 
-    private SmsSignResourceDTO smsResourceJSON;
+    private SmsSignResourceVO smsResourceJSON;
     private Integer userResourceCount;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long goodsResourceId;
 
-    private ChannelResourceDTO channelResourceJSON;
+    private ChannelResourceVO channelResourceJSON;
 
     public Integer getResourceId() {
         return resourceId;
@@ -95,11 +98,11 @@ public class ResourceVO implements Serializable{
         this.orderResourceJSON = orderResourceJSON;
     }
 
-    public SmsSignResourceDTO getSmsResourceJSON() {
+    public SmsSignResourceVO getSmsResourceJSON() {
         return smsResourceJSON;
     }
 
-    public void setSmsResourceJSON(SmsSignResourceDTO smsResourceJSON) {
+    public void setSmsResourceJSON(SmsSignResourceVO smsResourceJSON) {
         this.smsResourceJSON = smsResourceJSON;
     }
 
@@ -119,11 +122,11 @@ public class ResourceVO implements Serializable{
         this.goodsResourceId = goodsResourceId;
     }
 
-    public ChannelResourceDTO getChannelResourceJSON() {
+    public ChannelResourceVO getChannelResourceJSON() {
         return channelResourceJSON;
     }
 
-    public void setChannelResourceJSON(ChannelResourceDTO channelResourceJSON) {
+    public void setChannelResourceJSON(ChannelResourceVO channelResourceJSON) {
         this.channelResourceJSON = channelResourceJSON;
     }
 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ServiceConfigSimpleOutputVO.java

+package com.gic.auth.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-04-28 11:33
+ */
+public class ServiceConfigSimpleOutputVO implements Serializable {
+    private static final long serialVersionUID = -5886163288126799201L;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long serviceConfigId;
+    private String serviceConfigName;
+    private String appId;
+
+    public Long getServiceConfigId() {
+        return serviceConfigId;
+    }
+
+    public void setServiceConfigId(Long serviceConfigId) {
+        this.serviceConfigId = serviceConfigId;
+    }
+
+    public String getServiceConfigName() {
+        return serviceConfigName;
+    }
+
+    public void setServiceConfigName(String serviceConfigName) {
+        this.serviceConfigName = serviceConfigName;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+}

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/SmsSignResourceVO.java

+package com.gic.auth.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-17 16:46
+ */
+public class SmsSignResourceVO implements Serializable {
+    private static final long serialVersionUID = -6009818220117316815L;
+    private String ids;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private List<Long> idList;
+    // 1：全部   2：部分
+    private Integer type;
+
+    public String getIds() {
+        return ids;
+    }
+
+    public void setIds(String ids) {
+        this.ids = ids;
+    }
+
+    public List<Long> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml

@@ -64,7 +64,6 @@
 
     <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000"/>
     <!--应用-->
-    <dubbo:reference interface="com.gic.open.api.service.ApplicationSubApiService" id="applicationSubApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.open.api.service.AppTokenApiService" id="appTokenApiService" timeout="6000"/>
     <!--运营管理员-->
     <dubbo:reference interface="com.gic.auth.service.OperationUserApiService" id="operationUserApiService" timeout="6000" />