通知详情修改

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -249,7 +249,7 @@ public class IndexModuleController {
     public RestResponse listMember(Integer type, Long cardAreaId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<MemberDataDTO>> response = this.memberDataApiService.listMemberData(enterpriseId, type, cardAreaId, userId);
+        ServiceResponse<List<MemberDataDTO>> response = this.memberDataApiService.listMemberData(enterpriseId, type, cardAreaId, userId, this.getAuthStore());
         return RestResponse.success(EntityUtil.changeEntityListByJSON(MemberDataVO.class, response.getResult()));
     }
 
@@ -257,7 +257,7 @@ public class IndexModuleController {
     public RestResponse getMemberData(Integer type){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<MemberDataDTO> memberData = this.memberDataApiService.getMemberData(enterpriseId, type, userId);
+        ServiceResponse<MemberDataDTO> memberData = this.memberDataApiService.getMemberData(enterpriseId, type, userId, this.getAuthStore());
         return RestResponse.success(EntityUtil.changeEntityByJSON(MemberDataRightVO.class, memberData.getResult()));
     }
 
@@ -265,15 +265,14 @@ public class IndexModuleController {
     public RestResponse listMemberChannelData(Integer type, Long cardConfigId, Long appletConfigId, Long serviceConfigId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<MemberChannelDataDTO>> response = this.memberDataApiService.listMemberChannelData(type,cardConfigId, appletConfigId, serviceConfigId, enterpriseId, userId);
+        ServiceResponse<List<MemberChannelDataDTO>> response = this.memberDataApiService.listMemberChannelData(type,cardConfigId, appletConfigId, serviceConfigId, enterpriseId, userId, this.getAuthStore());
         return RestResponse.success(response.getResult());
     }
 
     @RequestMapping("get-member-channel-data")
     public RestResponse getMemberChannelData(Integer type){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<MemberChannelDataDTO> memberChannelData = this.memberDataApiService.getMemberChannelData(type, enterpriseId, userId);
+        ServiceResponse<AdsGicMbrVennAllDTO> memberChannelData = this.memberDataApiService.getMemberChannelData(enterpriseId);
         return RestResponse.success(memberChannelData.getResult());
     }
 
@@ -281,7 +280,7 @@ public class IndexModuleController {
     public RestResponse listChannelData(Integer type, Integer cuType){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<MemberChannelDataDTO>> listServiceResponse = this.memberDataApiService.listChannelData(type, cuType, enterpriseId, userId);
+        ServiceResponse<List<MemberChannelDataDTO>> listServiceResponse = this.memberDataApiService.listChannelData(type, cuType, enterpriseId, userId, this.getAuthStore());
         return RestResponse.success(listServiceResponse.getResult());
     }
 
@@ -290,7 +289,7 @@ public class IndexModuleController {
     public RestResponse consumptionAnalysis(Integer consumptionType, Long cardConfigId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<ConsumptionAnalysisDTO>> listServiceResponse = this.memberDataApiService.consumptionAnalysis(consumptionType, cardConfigId, enterpriseId, userId);
+        ServiceResponse<List<ConsumptionAnalysisDTO>> listServiceResponse = this.memberDataApiService.consumptionAnalysis(consumptionType, cardConfigId, enterpriseId, userId, this.getAuthStore());
         return RestResponse.success(listServiceResponse.getResult());
     }
 
@@ -401,4 +400,19 @@ public class IndexModuleController {
         ServiceResponse<Long> countFromES = this.storeApiService.queryStoreCountFromES(storeSearchDTO);
         return countFromES.getResult().intValue();
     }
-}
+
+    private List<Integer> getAuthStore(){
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        List<Integer> authStoreIdList = new ArrayList<>();
+        if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
+            ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
+            if(authResponse.isSuccess()){
+                authStoreIdList = authResponse.getResult();
+            }
+            if(CollectionUtils.isEmpty(authStoreIdList)){
+                authStoreIdList.add(-1);
+            }
+        }
+        return authStoreIdList;
+    }
+}
\ No newline at end of file