bug

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

@@ -10,15 +10,16 @@ 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.*;
+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.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.log.LogUtils;
 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 com.gic.goods.api.dto.GoodsRightsSelectorDTO;
 import com.gic.goods.api.service.GoodsRightsSelectorApiService;
 import com.gic.mall.share.api.dto.shop.ShopDTO;
 import com.gic.mall.share.api.enums.ShopTypeEnum;
@@ -113,13 +114,7 @@ public class ResourceController {
         public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
         ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
         resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        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();
@@ -184,16 +179,6 @@ public class ResourceController {
                         ChannelResourceDTO.class);
                 vo.setChannelResourceJSON(channelResourceDTO);
             }
-            UserDetail userDetail = UserDetailUtils.getUserDetail();
-            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService
-                    .getGoodsRightsSelector(response.getResult().getGoodsResourceId(),
-                            UserDetailUtils.getUserDetail().getEnterpriseId(),
-                            userDetail.getUserInfo().getSuperAdmin());
-            if (goodsResponse.isSuccess()) {
-                if (goodsResponse.getResult() != null) {
-                    vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));
-                }
-            }
             return RestResponse.success(vo);
         }
         return EnterpriseRestResponse.failure(response);
@@ -219,29 +204,4 @@ public class ResourceController {
         ServiceResponse<List<ShopDTO>> serviceResponse = shopApiService.getAllShopByEnterpriseIdAndName(UserDetailUtils.getUserDetail().getEnterpriseId(), null, ShopTypeEnum.MALL_SHOP.getCode());
         return ResultControllerUtils.commonResult(serviceResponse);
     }
-
-//    private StoreResouceVO getStoreResouce(Integer storeWidgetId) {
-//        StoreResouceVO storeResouceVO = null;
-//        ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(storeWidgetId);
-//        if (storeWidget.isSuccess()) {
-//            if (storeWidget.getResult() != null) {
-//                storeResouceVO = new StoreResouceVO();
-//                storeResouceVO.setStoreResourceId(storeWidgetId);
-//                storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
-//                storeResouceVO.setSearchParam(storeWidget.getResult().getSearchParam());
-//                storeResouceVO.setWriteBackParam(storeWidget.getResult().getWriteBackParam());
-//            }
-//        }
-//        return storeResouceVO;
-//    }
-//
-//    private ServiceResponse<Integer> saveStoreWidget(StoreResouceQO storeResouce) {
-//        StoreWidgetDTO storeWidgetDTO = new StoreWidgetDTO();
-//        storeWidgetDTO.setAuthMode(storeResouce.getAuthMode());
-//        storeWidgetDTO.setSearchParam(storeResouce.getSearchParam());
-//        storeWidgetDTO.setStoreWidgetId(storeResouce.getStoreResourceId());
-//        storeWidgetDTO.setWriteBackParam(storeResouce.getWriteBackParam());
-//        return this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
-//    }
-
-}
+ }

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

@@ -48,9 +48,8 @@ public class ResourceQO implements Serializable {
      * 商品资源
      */
 //    private Long goodsResourceId;
-
-    private GoodsResouceQO goodsResource;
-
+//    private GoodsResouceQO goodsResource;
+    private Long goodsResourceId;
     /**
      * 订单资源
      */
@@ -100,12 +99,12 @@ public class ResourceQO implements Serializable {
         this.storeResource = storeResource;
     }
 
-    public GoodsResouceQO getGoodsResource() {
-        return goodsResource;
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
     }
 
-    public void setGoodsResource(GoodsResouceQO goodsResource) {
-        this.goodsResource = goodsResource;
+    public void setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
     }
 
     public List<OrderResourceQO> getOrderResourceJSON() {

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

@@ -43,7 +43,7 @@ public class ResourceVO implements Serializable{
 
     private SmsSignResourceDTO smsResourceJSON;
     private Integer userResourceCount;
-    private GoodsResouceVO goodsResouce;
+    private Long goodsResourceId;
 
     private ChannelResourceDTO channelResourceJSON;
 
@@ -111,12 +111,12 @@ public class ResourceVO implements Serializable{
         this.userResourceCount = userResourceCount;
     }
 
-    public GoodsResouceVO getGoodsResouce() {
-        return goodsResouce;
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
     }
 
-    public void setGoodsResouce(GoodsResouceVO goodsResouce) {
-        this.goodsResouce = goodsResouce;
+    public void setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
     }
 
     public ChannelResourceDTO getChannelResourceJSON() {