Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceDTO.java

@@ -48,7 +48,7 @@ public class ResourceDTO implements Serializable {
     /**
      * 商品资源
      */
-    private Long goodsResource;
+    private Long goodsResourceId;
 
     /**
      * 订单资源
@@ -137,12 +137,12 @@ public class ResourceDTO implements Serializable {
         this.storeResource = storeResource;
     }
 
-    public Long getGoodsResource() {
-        return goodsResource;
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
     }
 
-    public void setGoodsResource(Long goodsResource) {
-        this.goodsResource = goodsResource;
+    public void setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
     }
 
     public Long getOrderResource() {

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditedGroupUserRelMapper.java

@@ -2,6 +2,7 @@ package com.gic.auth.dao.mapper;
 
 import com.gic.auth.dto.AuditedGroupUserRelDTO;
 import com.gic.auth.entity.TabAuditedGroupUserRel;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -62,7 +63,8 @@ public interface TabAuditedGroupUserRelMapper {
 
     Integer updateStatusByUserIds(@Param("enterpriseId") Integer enterpriseId, @Param("auditedGroupId") Integer auditedGroupId, @Param("ids") List<Integer> userIdList);
 
-    List<Map<Integer,Object>> getUserCountByAuditedGroup(@Param("ids") List<Integer> auditedGroupIds);
+    @MapKey("auditedGroupId")
+    Map<Integer, Map<Integer,Long>> getUserCountByAuditedGroup(@Param("ids") List<Integer> auditedGroupIds);
 
     List<TabAuditedGroupUserRel> listAuditedGroup(AuditedGroupUserRelDTO groupUserRel);
 

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorProjectItemRelMapper.java

 package com.gic.auth.dao.mapper;
 
 import com.gic.auth.entity.TabAuditorProjectItemRel;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -63,7 +64,8 @@ public interface TabAuditorProjectItemRelMapper {
 
     List<TabAuditorProjectItemRel> listRelByAuditorId(TabAuditorProjectItemRel auditorProjectItemRel);
 
-    List<Map<String,Object>> getCountByAuditorIds(@Param("ids") List<Integer> auditorIdList);
+    @MapKey("auditorId")
+    Map<Integer, Map<Integer,Long>> getCountByAuditorIds(@Param("ids") List<Integer> auditorIdList);
 
     List<Integer> listAuditorIdByProjectId(@Param("enterpriseId") Integer enterpriseId, @Param("projectId") Integer projectId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserResourceMapper.java

 package com.gic.auth.dao.mapper;
 
 import com.gic.auth.entity.TabSysUserResource;
-import com.gic.auth.entity.TabSysUserRole;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -58,7 +58,8 @@ public interface TabSysUserResourceMapper {
 
     TabSysUserResource existUserResource(@Param("enterpriseId") Integer enterpriseId, @Param("resourceId") Integer resourceId);
 
-    List<Map<String, Object>> countByResourceIds(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> resourceIds);
+    @MapKey("resourceId")
+    Map<Integer, Map<Integer, Long>> countByResourceIds(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> resourceIds);
 
     /**
      * 删除用户关联数据

gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysResource.java

@@ -44,7 +44,7 @@ public class TabSysResource {
     /**
      * 商品资源
      */
-    private Long goodsResource;
+    private Long goodsResourceId;
 
     /**
      * 订单资源  
@@ -143,12 +143,12 @@ public class TabSysResource {
         this.storeResource = storeResource;
     }
 
-    public Long getGoodsResource() {
-        return goodsResource;
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
     }
 
-    public void setGoodsResource(Long goodsResource) {
-        this.goodsResource = goodsResource;
+    public void setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
     }
 
     public Integer getOrderResource() {

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

@@ -51,10 +51,11 @@ public class AuditedGroupUserRelServiceImpl implements AuditedGroupUserRelServic
 
     @Override
     public Map<Integer, Integer> getUserCountByAuditedGroup(List<Integer> auditedGroupIds) {
-        List<Map<Integer, Object>> mapList = tabAuditedGroupUserRelMapper.getUserCountByAuditedGroup(auditedGroupIds);
+        Map<Integer, Map<Integer, Long>> mapList = tabAuditedGroupUserRelMapper.getUserCountByAuditedGroup(auditedGroupIds);
         Map<Integer, Integer> resultMap = new HashMap<>(auditedGroupIds.size());
-        for (Map<Integer, Object> map : mapList) {
-            resultMap.put(Integer.valueOf(map.get("auditedGroupId").toString()), Integer.valueOf(map.get("userCount").toString()));
+        for (Map.Entry<Integer, Map<Integer, Long>> entry : mapList.entrySet()) {
+            Integer auditedGroupId = entry.getKey();
+            resultMap.put(auditedGroupId, entry.getValue().get("userCount").intValue());
         }
         return resultMap;
     }

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

@@ -56,10 +56,11 @@ public class AuditorProjectItemRelServiceImpl implements AuditorProjectItemRelSe
 
     @Override
     public Map<Integer, Integer> getCountByAuditorIds(List<Integer> auditorIdList) {
-        List<Map<String, Object>> mapList = tabAuditorProjectItemRelMapper.getCountByAuditorIds(auditorIdList);
+        Map<Integer, Map<Integer, Long>> mapList = tabAuditorProjectItemRelMapper.getCountByAuditorIds(auditorIdList);
         HashMap<Integer, Integer> resultMap = new HashMap<>(mapList.size());
-        for (Map<String, Object> map : mapList) {
-            resultMap.put(Integer.valueOf(map.get("auditorId").toString()), Integer.valueOf(map.get("projectItemCount").toString()));
+        for (Map.Entry<Integer, Map<Integer, Long>> entry : mapList.entrySet()) {
+            Integer auditorId = entry.getKey();
+            resultMap.put(auditorId, entry.getValue().get("projectItemCount").intValue());
         }
         return resultMap;
     }

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

 package com.gic.auth.service.impl;
 
-import java.util.*;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.gic.auth.dao.mapper.TabSysUserResourceMapper;
 import com.gic.auth.dto.UserResourceDTO;
 import com.gic.auth.entity.TabSysUserResource;
 import com.gic.auth.service.UserResourceService;
 import com.gic.commons.util.EntityUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+
 /**
  *
  * @Description:
@@ -36,9 +35,10 @@ public class UserResourceServiceImpl implements UserResourceService {
         if (CollectionUtils.isNotEmpty(resourceIds)) {
             //
             Map<Integer, Integer> map = new HashMap<>();
-            List<Map<String, Object>> list = tabSysUserResourceMapper.countByResourceIds(enterpriseId, resourceIds);
-            for (Map<String, Object> integerIntegerMap : list) {
-                map.put(Integer.valueOf(integerIntegerMap.get("resourceId").toString()), Integer.valueOf(integerIntegerMap.get("userResourceCount").toString()));
+            Map<Integer, Map<Integer, Long>> mapMap = tabSysUserResourceMapper.countByResourceIds(enterpriseId, resourceIds);
+            for (Map.Entry<Integer, Map<Integer, Long>> entry : mapMap.entrySet()) {
+                Integer resourceId = entry.getKey();
+                map.put(resourceId, entry.getValue().get("userResourceCount").intValue());
             }
             return map;
         } else {

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

@@ -9,7 +9,7 @@
     <result column="fwh_resource" jdbcType="BIGINT" property="fwhResource" />
     <result column="applet_resource" jdbcType="BIGINT" property="appletResource" />
     <result column="store_resource" jdbcType="BIGINT" property="storeResource" />
-    <result column="goods_resource" jdbcType="BIGINT" property="goodsResource" />
+    <result column="goods_resource_id" jdbcType="BIGINT" property="goodsResourceId" />
     <result column="order_resource" jdbcType="VARCHAR" property="orderResource" />
     <result column="app_resource" jdbcType="VARCHAR" property="appResource" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -18,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     resource_id, resource_name, enterprise_id, member_card_resource, fwh_resource, applet_resource, 
-    store_resource, goods_resource, order_resource, app_resource, create_time, update_time, 
+    store_resource, goods_resource_id, order_resource, app_resource, create_time, update_time, 
     status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -34,12 +34,12 @@
   <insert id="insert" parameterType="com.gic.auth.entity.TabSysResource">
     insert into tab_sys_resource (resource_id, resource_name, enterprise_id, 
       member_card_resource, fwh_resource, applet_resource, 
-      store_resource, goods_resource, order_resource, 
+      store_resource, goods_resource_id, order_resource, 
       app_resource, create_time, update_time, 
       status)
     values (#{resourceId,jdbcType=INTEGER}, #{resourceName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
       #{memberCardResource,jdbcType=BIGINT}, #{fwhResource,jdbcType=BIGINT}, #{appletResource,jdbcType=BIGINT}, 
-      #{storeResource,jdbcType=BIGINT}, #{goodsResource,jdbcType=BIGINT}, #{orderResource,jdbcType=VARCHAR}, 
+      #{storeResource,jdbcType=BIGINT}, #{goodsResourceId,jdbcType=BIGINT}, #{orderResource,jdbcType=VARCHAR}, 
       #{appResource,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=INTEGER})
   </insert>
@@ -67,8 +67,8 @@
       <if test="storeResource != null">
         store_resource,
       </if>
-      <if test="goodsResource != null">
-        goods_resource,
+      <if test="goodsResourceId != null">
+        goods_resource_id,
       </if>
       <if test="orderResource != null">
         order_resource,
@@ -108,8 +108,8 @@
       <if test="storeResource != null">
         #{storeResource,jdbcType=BIGINT},
       </if>
-      <if test="goodsResource != null">
-        #{goodsResource,jdbcType=BIGINT},
+      <if test="goodsResourceId != null">
+        #{goodsResourceId,jdbcType=BIGINT},
       </if>
       <if test="orderResource != null">
         #{orderResource,jdbcType=VARCHAR},
@@ -149,8 +149,8 @@
       <if test="storeResource != null">
         store_resource = #{storeResource,jdbcType=BIGINT},
       </if>
-      <if test="goodsResource != null">
-        goods_resource = #{goodsResource,jdbcType=BIGINT},
+      <if test="goodsResourceId != null">
+        goods_resource_id = #{goodsResourceId,jdbcType=BIGINT},
       </if>
       <if test="orderResource != null">
         order_resource = #{orderResource,jdbcType=VARCHAR},
@@ -178,7 +178,7 @@
       fwh_resource = #{fwhResource,jdbcType=BIGINT},
       applet_resource = #{appletResource,jdbcType=BIGINT},
       store_resource = #{storeResource,jdbcType=BIGINT},
-      goods_resource = #{goodsResource,jdbcType=BIGINT},
+      goods_resource_id = #{goodsResourceId,jdbcType=BIGINT},
       order_resource = #{orderResource,jdbcType=VARCHAR},
       app_resource = #{appResource,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},

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

@@ -12,15 +12,14 @@ 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.qo.StoreResouceQO;
-import com.gic.auth.web.vo.AppResourceVO;
-import com.gic.auth.web.vo.OrderResourceVO;
-import com.gic.auth.web.vo.ResourceVO;
-import com.gic.auth.web.vo.StoreResouceVO;
+import com.gic.auth.web.vo.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
+import com.gic.goods.api.service.GoodsRightsSelectorApiService;
 import com.gic.store.dto.StoreWidgetDTO;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
@@ -46,6 +45,8 @@ public class ResourceController {
     private ResourceApiService resourceApiService;
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
+    @Autowired
+    private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
 
     @RequestMapping("/save-resource")
     public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
@@ -53,41 +54,44 @@ public class ResourceController {
         resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         // 门店资源
         ServiceResponse<Integer> storeWidgetResponse = saveStoreWidget(resourceQO.getStoreResouceJSON());
-        if(storeWidgetResponse.isSuccess()){
+        if(storeWidgetResponse.isSuccess()) {
             resourceDTO.setStoreResource(storeWidgetResponse.getResult().longValue());
+        }
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class, resourceQO.getGoodsResource());
+        ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.saveGoodsRightsSelector(goodsRightsSelectorDTO);
+        if(goodsResponse.isSuccess()){
+            resourceDTO.setGoodsResourceId(goodsResponse.getResult().getGoodsRightsSelectorId());
+        }
             // 订单资源
-            if (CollectionUtils.isNotEmpty(resourceQO.getOrderResourceJSON())) {
-                List<OrderResourceQO> orderResource = resourceQO.getOrderResourceJSON();
-                JSONArray orderResourceArray = new JSONArray();
-                for (OrderResourceQO orderResourceQO : orderResource) {
-                    List<Integer> storeIds;
-                    if (OrderResourceChannelEnum.OFFLINE.getCode().equals(orderResourceQO.getChannel())) {
-                        ServiceResponse<Integer> widgetResponse = saveStoreWidget(orderResourceQO.getStoreResouceJSON());
-                        Integer storeId = widgetResponse.getResult();
-                        storeIds = Collections.singletonList(storeId);
-                    } else {
-                        storeIds = orderResourceQO.getStoreContent();
-                    }
-                    JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("channel", orderResourceQO.getChannel());
-                    jsonObject.put("storeContent", storeIds);
-                    orderResourceArray.add(jsonObject);
+        if (CollectionUtils.isNotEmpty(resourceQO.getOrderResourceJSON())) {
+            List<OrderResourceQO> orderResource = resourceQO.getOrderResourceJSON();
+            JSONArray orderResourceArray = new JSONArray();
+            for (OrderResourceQO orderResourceQO : orderResource) {
+                List<Integer> storeIds;
+                if (OrderResourceChannelEnum.OFFLINE.getCode().equals(orderResourceQO.getChannel())) {
+                    ServiceResponse<Integer> widgetResponse = saveStoreWidget(orderResourceQO.getStoreResouceJSON());
+                    Integer storeId = widgetResponse.getResult();
+                    storeIds = Collections.singletonList(storeId);
+                } else {
+                    storeIds = orderResourceQO.getStoreContent();
                 }
-                resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResourceArray));
-            }
-            // 应用资源
-            if (CollectionUtils.isNotEmpty(resourceQO.getAppResourceJSON())) {
-                resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResourceJSON()));
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("channel", orderResourceQO.getChannel());
+                jsonObject.put("storeContent", storeIds);
+                orderResourceArray.add(jsonObject);
             }
+            resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResourceArray));
+        }
+        // 应用资源
+        if (CollectionUtils.isNotEmpty(resourceQO.getAppResourceJSON())) {
+            resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResourceJSON()));
+        }
 
-            ServiceResponse<Integer> response = resourceApiService.saveOrUpdateResource(resourceDTO);
-            if(response.isSuccess()){
-                return RestResponse.success(response.getResult());
-            }
-            return EnterpriseRestResponse.failure(response);
+        ServiceResponse<Integer> response = resourceApiService.saveOrUpdateResource(resourceDTO);
+        if(response.isSuccess()){
+            return RestResponse.success(response.getResult());
         }
-        // 订单资源
-        return EnterpriseRestResponse.failure(storeWidgetResponse);
+        return EnterpriseRestResponse.failure(response);
     }
 
     @RequestMapping("/del-resource")
@@ -130,6 +134,12 @@ public class ResourceController {
                 List<AppResourceVO> appResourceList = JSON.parseArray(dto.getAppResourceJson(), AppResourceVO.class);
                 vo.setAppResourceJSON(appResourceList);
             }
+            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());
+            if(goodsResponse.isSuccess()){
+                if(goodsResponse.getResult() != null){
+                    vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));
+                }
+            }
             return RestResponse.success(vo);
         }
         return EnterpriseRestResponse.failure(response);

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

@@ -55,7 +55,7 @@ public class UnionEnterpriseController {
         storeWidgetDTO.setStoreWidgetId(unionEnterpriseQO.getStoreResouce().getStoreResourceId());
         storeWidgetDTO.setWriteBackParam(unionEnterpriseQO.getStoreResouce().getWriteBackParam());
         ServiceResponse<Integer> storeWidgetResponse = this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
-        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class, unionEnterpriseQO.getGoodsResouce());
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class, unionEnterpriseQO.getGoodsResource());
         ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.saveGoodsRightsSelector(goodsRightsSelectorDTO);
         if(storeWidgetResponse.isSuccess()){
             enterpriseDTO.setStoreResourceId(storeWidgetResponse.getResult().longValue());

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/GoodsResouceQO.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 public class GoodsResouceQO implements Serializable {
     private Long goodsRightsSelectorId;
     private String goodsRightsSearchValue;
-    private String goodsRightsSearchText;
+    private String goodsRightSearchEdit;
     private Integer hasRights;
 
     public Long getGoodsRightsSelectorId() {
@@ -24,14 +24,6 @@ public class GoodsResouceQO implements Serializable {
         this.goodsRightsSearchValue = goodsRightsSearchValue;
     }
 
-    public String getGoodsRightsSearchText() {
-        return goodsRightsSearchText;
-    }
-
-    public void setGoodsRightsSearchText(String goodsRightsSearchText) {
-        this.goodsRightsSearchText = goodsRightsSearchText;
-    }
-
     public Integer getHasRights() {
         return hasRights;
     }
@@ -39,4 +31,12 @@ public class GoodsResouceQO implements Serializable {
     public void setHasRights(Integer hasRights) {
         this.hasRights = hasRights;
     }
+
+    public String getGoodsRightSearchEdit() {
+        return goodsRightSearchEdit;
+    }
+
+    public void setGoodsRightSearchEdit(String goodsRightSearchEdit) {
+        this.goodsRightSearchEdit = goodsRightSearchEdit;
+    }
 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java

@@ -55,7 +55,9 @@ public class ResourceQO implements Serializable {
     /**
      * 商品资源
      */
-    private Long goodsResource;
+//    private Long goodsResourceId;
+
+    private GoodsResouceQO goodsResource;
 
     /**
      * 订单资源
@@ -120,14 +122,6 @@ public class ResourceQO implements Serializable {
         this.storeResouceJSON = storeResouceJSON;
     }
 
-    public Long getGoodsResource() {
-        return goodsResource;
-    }
-
-    public void setGoodsResource(Long goodsResource) {
-        this.goodsResource = goodsResource;
-    }
-
     public List<OrderResourceQO> getOrderResourceJSON() {
         return orderResourceJSON;
     }
@@ -143,4 +137,20 @@ public class ResourceQO implements Serializable {
     public void setAppResourceJSON(List<AppResourceQO> appResourceJSON) {
         this.appResourceJSON = appResourceJSON;
     }
+
+//    public Long getGoodsResourceId() {
+//        return goodsResourceId;
+//    }
+//
+//    public void setGoodsResourceId(Long goodsResourceId) {
+//        this.goodsResourceId = goodsResourceId;
+//    }
+
+    public GoodsResouceQO getGoodsResource() {
+        return goodsResource;
+    }
+
+    public void setGoodsResource(GoodsResouceQO goodsResource) {
+        this.goodsResource = goodsResource;
+    }
 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/UnionEnterpriseQO.java

@@ -10,7 +10,7 @@ public class UnionEnterpriseQO implements Serializable {
     private Long fwhResourceId;
     private Long appletResourceId;
     private StoreResouceQO storeResouce;
-    private GoodsResouceQO goodsResouce;
+    private GoodsResouceQO goodsResource;
     private Long orderResourceId;
     private Integer authCodeId;
     private Integer unionId;
@@ -95,11 +95,11 @@ public class UnionEnterpriseQO implements Serializable {
         this.storeResouce = storeResouce;
     }
 
-    public GoodsResouceQO getGoodsResouce() {
-        return goodsResouce;
+    public GoodsResouceQO getGoodsResource() {
+        return goodsResource;
     }
 
-    public void setGoodsResouce(GoodsResouceQO goodsResouce) {
-        this.goodsResouce = goodsResouce;
+    public void setGoodsResource(GoodsResouceQO goodsResource) {
+        this.goodsResource = goodsResource;
     }
 }

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

@@ -55,6 +55,7 @@ public class ResourceVO implements Serializable{
 
     private Integer userResourceCount;
     private StoreResouceVO storeResouce;
+    private GoodsResouceVO goodsResouce;
 
     public Integer getResourceId() {
         return resourceId;
@@ -143,4 +144,12 @@ public class ResourceVO implements Serializable{
     public void setStoreResouce(StoreResouceVO storeResouce) {
         this.storeResouce = storeResouce;
     }
+
+    public GoodsResouceVO getGoodsResouce() {
+        return goodsResouce;
+    }
+
+    public void setGoodsResouce(GoodsResouceVO goodsResouce) {
+        this.goodsResouce = goodsResouce;
+    }
 }