商户列表

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -18,7 +18,7 @@ public interface WxEnterpriseRelatedApiService {
 	@Deprecated
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
 	
-	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber , int filteRight);
+	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber);
 
 	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -85,12 +85,11 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 
     @Override
     public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId) {
-        return this.listEnterpriseByWxEnterpriseId(wxEnterpriseId, null, 0) ;
+        return this.listEnterpriseByWxEnterpriseId(wxEnterpriseId, null) ;
     }
     
     @Override
-    public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber,
-            int filteRight) {
+    public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber) {
         List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
         List<EnterpriseDetailDTO> list = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
         if (CollectionUtils.isEmpty(list)) {
@@ -102,18 +101,16 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         for (EnterpriseDetailDTO dto : list) {
             EnterpriseDTO enterpriseDTO = map.get(dto.getEnterpriseId());
             if (enterpriseDTO != null) {
+                dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
+                dto.setEnterpriseLogo(enterpriseDTO.getQcloudImageUrl());
+                dto.setBrandName(enterpriseDTO.getBrandName());
+                dto.setAclFlag(1);
                 if(StringUtils.isNotBlank(phoneNumber)) {
                     com.gic.api.base.commons.ServiceResponse<Boolean> resp = this.rightService.hasHaobanAcl(enterpriseDTO.getEnterpriseId(), phoneNumber) ;
                     if(!resp.getResult()) {
                         dto.setAclFlag(0);
-                        if(filteRight==1) {
-                            continue ;
-                        }
                     }
                 }
-                dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
-                dto.setEnterpriseLogo(enterpriseDTO.getQcloudImageUrl());
-                dto.setBrandName(enterpriseDTO.getBrandName());
             }
         }
         return list;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -134,7 +134,7 @@ public class WxEnterpriseController extends WebBaseController {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         String phoneNumber = login.getPhoneNumber() ;
-        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber,filteRight);
+        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber);
         return resultResponse(HaoBanErrCode.ERR_1, list);
     }