资源组

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.setGoodsResource(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().getGoodsResource());
+            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/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/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;
+    }
 }