导购设置

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

@@ -27,7 +27,6 @@ import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.ApplicationDTO;
-import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
@@ -103,32 +102,13 @@ public class ApplicationController extends WebBaseController {
             Iterator<ApplicationDTO> it = list.iterator();
             while (it.hasNext()) {
                 ApplicationDTO s = it.next();
-                if (s.getApplicationName().contains("内购券")) {
+                // 我的客户、营销任务、看数据、云日报、月指标、商品中心、订单评价、扫码核销、E袋洗、佣金结算
+                if(Arrays.asList("11111","11114","11121","11122").contains(s.getApplicationId())) {
                     it.remove();
-                }else {
-                    // 我的客户、营销任务、看数据、云日报、月指标、商品中心、订单评价、扫码核销、E袋洗、佣金结算
-                    if(Arrays.asList("11111","11114","11121","11122").contains(s.getApplicationId())) {
-                        it.remove();
-                    }
                 }
             }
         }
         List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
-        List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
-        //开启
-        List<ApplicationDTO> openList = new ArrayList<ApplicationDTO>();
-        List<String> openApplicationIds = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(result)) {
-            openApplicationIds = result.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
-            openList = applicationApiService.listByApplications(openApplicationIds);
-        }
-        //关闭
-        List<ApplicationDTO> closeList = new ArrayList<ApplicationDTO>();
-        applicationIds.removeAll(openApplicationIds);
-        if (CollectionUtil.isNotEmpty(applicationIds)) {
-            closeList = applicationApiService.listByApplications(applicationIds);
-        }
-        
         List<ApplicationVO> allList = new ArrayList<>();
         list.forEach(item->{
             ApplicationVO vo = EntityUtil.changeEntity(ApplicationVO.class, item) ;
@@ -139,8 +119,6 @@ public class ApplicationController extends WebBaseController {
             }
             allList.add(vo) ;
         });
-        map.put("open", openList);
-        map.put("close", closeList);
         map.put("allList", allList) ;
         if(null != loginUser) {
             String enterpriseId = loginUser.getEnterpriseId() ;