资源组

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/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/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

@@ -60,7 +60,7 @@ public class ResourceController {
         GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class, resourceQO.getGoodsResource());
         ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.saveGoodsRightsSelector(goodsRightsSelectorDTO);
         if(goodsResponse.isSuccess()){
-            resourceDTO.setGoodsResource(goodsResponse.getResult().getGoodsRightsSelectorId());
+            resourceDTO.setGoodsResourceId(goodsResponse.getResult().getGoodsRightsSelectorId());
         }
             // 订单资源
         if (CollectionUtils.isNotEmpty(resourceQO.getOrderResourceJSON())) {
@@ -134,7 +134,7 @@ public class ResourceController {
                 List<AppResourceVO> appResourceList = JSON.parseArray(dto.getAppResourceJson(), AppResourceVO.class);
                 vo.setAppResourceJSON(appResourceList);
             }
-            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResource());
+            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());
             if(goodsResponse.isSuccess()){
                 if(goodsResponse.getResult() != null){
                     vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));

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

@@ -55,7 +55,7 @@ public class ResourceQO implements Serializable {
     /**
      * 商品资源
      */
-    private Long goodsResourceId;
+//    private Long goodsResourceId;
 
     private GoodsResouceQO goodsResource;
 
@@ -138,13 +138,13 @@ public class ResourceQO implements Serializable {
         this.appResourceJSON = appResourceJSON;
     }
 
-    public Long getGoodsResourceId() {
-        return goodsResourceId;
-    }
-
-    public void setGoodsResourceId(Long goodsResourceId) {
-        this.goodsResourceId = goodsResourceId;
-    }
+//    public Long getGoodsResourceId() {
+//        return goodsResourceId;
+//    }
+//
+//    public void setGoodsResourceId(Long goodsResourceId) {
+//        this.goodsResourceId = goodsResourceId;
+//    }
 
     public GoodsResouceQO getGoodsResource() {
         return goodsResource;