商品资源接口调整

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

@@ -46,7 +46,7 @@ public class UnionEnterpriseController {
     private UserApiService userApiService;
 
     @RequestMapping("save-union-enterprise")
-    public RestResponse saveUnionEnterprise(@RequestBody UnionEnterpriseQO unionEnterpriseQO){
+    public RestResponse saveUnionEnterprise(@RequestBody UnionEnterpriseQO unionEnterpriseQO) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         UnionEnterpriseDTO enterpriseDTO = EntityUtil.changeEntityByJSON(UnionEnterpriseDTO.class, unionEnterpriseQO);
         enterpriseDTO.setEnterpriseId(enterpriseId);
@@ -56,16 +56,18 @@ 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.getGoodsResource());
-        ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.saveGoodsRightsSelector(goodsRightsSelectorDTO);
-        if(storeWidgetResponse.isSuccess()){
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class,
+                unionEnterpriseQO.getGoodsResource());
+        ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService
+                .saveGoodsRightsSelector(goodsRightsSelectorDTO);
+        if (storeWidgetResponse.isSuccess()) {
             enterpriseDTO.setStoreResourceId(storeWidgetResponse.getResult().longValue());
         }
-        if(goodsResponse.isSuccess()){
+        if (goodsResponse.isSuccess()) {
             enterpriseDTO.setGoodsResourceId(goodsResponse.getResult().getGoodsRightsSelectorId());
         }
         ServiceResponse<Integer> response = this.unionEnterpriseApiService.saveUnionEnterprise(enterpriseDTO);
-        if(response.isSuccess()){
+        if (response.isSuccess()) {
             LogUtils.createLog("联合商户创建", unionEnterpriseQO.getUnionEnterpriseName());
             return RestResponse.success(response.getResult());
         }
@@ -73,26 +75,27 @@ public class UnionEnterpriseController {
     }
 
     @RequestMapping("check-auth-code")
-    public RestResponse checkAuthCode(Integer authCodeId, String authCode){
+    public RestResponse checkAuthCode(Integer authCodeId, String authCode) {
         ServiceResponse response = this.authCodeApiService.validateAuthCode(authCodeId, authCode);
         this.authCodeApiService.expireAuthCode(authCodeId);
-        if(response.isSuccess()){
+        if (response.isSuccess()) {
             return RestResponse.success();
         }
         return EnterpriseRestResponse.failure(response);
     }
 
     @RequestMapping("union-enterprise-detail")
-    public RestResponse getUnionEnterpriseDetail(Integer unionId){
-        if(unionId == null){
+    public RestResponse getUnionEnterpriseDetail(Integer unionId) {
+        if (unionId == null) {
             return EnterpriseRestResponse.failure(ErrorCode.MISS_PARAMETER);
         }
         ServiceResponse<UnionEnterpriseDTO> response = this.unionEnterpriseApiService.getUnionEnterpriseById(unionId);
-        if(response.isSuccess()){
+        if (response.isSuccess()) {
             UnionEnterpriseVO vo = EntityUtil.changeEntityByJSON(UnionEnterpriseVO.class, response.getResult());
-            ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(response.getResult().getStoreResourceId().intValue());
-            if(storeWidget.isSuccess()){
-                if(storeWidget.getResult() != null){
+            ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService
+                    .getStoreWidget(response.getResult().getStoreResourceId().intValue());
+            if (storeWidget.isSuccess()) {
+                if (storeWidget.getResult() != null) {
                     StoreResouceVO storeResouceVO = new StoreResouceVO();
                     storeResouceVO.setStoreResourceId(response.getResult().getStoreResourceId().intValue());
                     storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
@@ -101,9 +104,12 @@ public class UnionEnterpriseController {
                     vo.setStoreResouce(storeResouceVO);
                 }
             }
-            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId(), UserDetailUtils.getUserDetail().getEnterpriseId());
-            if(goodsResponse.isSuccess()){
-                if(goodsResponse.getResult() != null){
+            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService
+                    .getGoodsRightsSelector(response.getResult().getGoodsResourceId(),
+                            UserDetailUtils.getUserDetail().getEnterpriseId(),
+                            UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
+            if (goodsResponse.isSuccess()) {
+                if (goodsResponse.getResult() != null) {
                     vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));
                 }
             }
@@ -113,17 +119,18 @@ public class UnionEnterpriseController {
     }
 
     @RequestMapping("del-union-enterprise-resource")
-    public RestResponse delUnionEnterprise(Long resourceId, Integer resourceType){
-        if(resourceId == null){
+    public RestResponse delUnionEnterprise(Long resourceId, Integer resourceType) {
+        if (resourceId == null) {
             return EnterpriseRestResponse.failure(ErrorCode.MISS_PARAMETER);
         }
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        ServiceResponse<Integer> response = this.unionEnterpriseApiService.delUnionEnterpriseSource(resourceId, enterpriseId);
-        if(response.getResult()>0){
+        ServiceResponse<Integer> response = this.unionEnterpriseApiService.delUnionEnterpriseSource(resourceId,
+                enterpriseId);
+        if (response.getResult() > 0) {
             ResourceTypeEnum[] values = ResourceTypeEnum.values();
-            for(ResourceTypeEnum typeEnum : values){
-                if(resourceType == typeEnum.getCode()){
-                    LogUtils.createLog(typeEnum.getMessage(), "资源id："+resourceId);
+            for (ResourceTypeEnum typeEnum : values) {
+                if (resourceType == typeEnum.getCode()) {
+                    LogUtils.createLog(typeEnum.getMessage(), "资源id：" + resourceId);
                 }
             }
             return RestResponse.success();
@@ -132,26 +139,28 @@ public class UnionEnterpriseController {
     }
 
     @RequestMapping("re-authorization-resource")
-    public RestResponse reAuthorizationResouce(Long resourceId, int resourceType){
+    public RestResponse reAuthorizationResouce(Long resourceId, int resourceType) {
         this.unionEnterpriseApiService.reAuthorizationResource(resourceId, resourceType);
         return RestResponse.success();
     }
 
     @RequestMapping("page-union-enterprise")
-    public RestResponse pageUnionEnterprise(String search, Integer authorizationStatus, PageQO pageQO){
+    public RestResponse pageUnionEnterprise(String search, Integer authorizationStatus, PageQO pageQO) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        ServiceResponse<Page<UnionEnterpriseDTO>> pageServiceResponse = this.unionEnterpriseApiService.
-                pageUnionEnterprise(search, enterpriseId, pageQO.getCurrentPage(), pageQO.getPageSize(), authorizationStatus);
+        ServiceResponse<Page<UnionEnterpriseDTO>> pageServiceResponse = this.unionEnterpriseApiService
+                .pageUnionEnterprise(search, enterpriseId, pageQO.getCurrentPage(), pageQO.getPageSize(),
+                        authorizationStatus);
         Page<UnionEnterpriseDTO> result = pageServiceResponse.getResult();
-        if(result != null){
+        if (result != null) {
             List<UnionEnterpriseDTO> list = result.getResult();
-            if(CollectionUtils.isNotEmpty(list)){
-                for(UnionEnterpriseDTO dto : list){
-                    ServiceResponse<List<UnionEnterpriseResourceDTO>> response = this.unionEnterpriseApiService.listResourceByUnionId(dto.getUnionId());
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (UnionEnterpriseDTO dto : list) {
+                    ServiceResponse<List<UnionEnterpriseResourceDTO>> response = this.unionEnterpriseApiService
+                            .listResourceByUnionId(dto.getUnionId());
                     dto.setResourceList(response.getResult());
                     dto.setUnionCompanyName(UserDetailUtils.getUserDetail().getEnterpriseInfo().getCompanyName());
                     ServiceResponse<UserDTO> userResponse = this.userApiService.getUserByEnterpriseId(enterpriseId);
-                    if(userResponse.isSuccess()){
+                    if (userResponse.isSuccess()) {
                         dto.setUnionManagerName(userResponse.getResult().getUserName());
                         dto.setUnionManagerPhone(userResponse.getResult().getPhoneNumber());
                     }