Commit 6c3bf8d4 by 徐高华

应用列表

parent 35e84569
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from tab_haoban_application from tab_haoban_application
where status_flag = 1 where status_flag = 1 order by update_time
</select> </select>
<select id="listByApplicationIds" resultMap="BaseResultMap" > <select id="listByApplicationIds" resultMap="BaseResultMap" >
select select
......
...@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO; import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.anno.IgnoreLogin; import com.gic.haoban.common.anno.IgnoreLogin;
import com.gic.haoban.common.utils.AuthWebRequestUtil; import com.gic.haoban.common.utils.AuthWebRequestUtil;
...@@ -41,6 +42,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService; ...@@ -41,6 +42,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService; import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.web.config.Config; import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.ApplicationVO;
import com.gic.haoban.manage.web.vo.ClerkEditInfoVO; import com.gic.haoban.manage.web.vo.ClerkEditInfoVO;
import com.gic.redis.data.util.RedisUtil; import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService; import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
...@@ -94,6 +96,17 @@ public class ApplicationController extends WebBaseController { ...@@ -94,6 +96,17 @@ public class ApplicationController extends WebBaseController {
} }
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId); List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
Object o = RedisUtil.getCache("haobanWxEnterpriseIdAppOpen");
String wxEnterpriseIds = o == null ? "" : o.toString();
if (!wxEnterpriseIds.contains(wxEnterpriseId)) {
Iterator<ApplicationDTO> it = list.iterator();
while (it.hasNext()) {
ApplicationDTO s = it.next();
if (s.getApplicationName().contains("内购券")) {
it.remove();
}
}
}
List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList()); List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds); List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
//开启 //开启
...@@ -109,27 +122,20 @@ public class ApplicationController extends WebBaseController { ...@@ -109,27 +122,20 @@ public class ApplicationController extends WebBaseController {
if (CollectionUtil.isNotEmpty(applicationIds)) { if (CollectionUtil.isNotEmpty(applicationIds)) {
closeList = applicationApiService.listByApplications(applicationIds); closeList = applicationApiService.listByApplications(applicationIds);
} }
Object o = RedisUtil.getCache("haobanWxEnterpriseIdAppOpen");
String wxEnterpriseIds = o == null ? "" : o.toString(); List<ApplicationVO> allList = new ArrayList<>();
if (!wxEnterpriseIds.contains(wxEnterpriseId)) { list.forEach(item->{
//不开启 ApplicationVO vo = EntityUtil.changeEntity(ApplicationVO.class, item) ;
Iterator<ApplicationDTO> it = openList.iterator(); if(applicationIds.contains(vo.getApplicationId())) {
while (it.hasNext()) { vo.setOpenFlag(0);
ApplicationDTO s = it.next(); }else {
if (s.getApplicationName().contains("内购券")) { vo.setOpenFlag(1);
it.remove(); }
} allList.add(vo) ;
} });
Iterator<ApplicationDTO> it2 = closeList.iterator();
while (it2.hasNext()) {
ApplicationDTO s = it2.next();
if (s.getApplicationName().contains("内购券")) {
it2.remove();
}
}
}
map.put("open", openList); map.put("open", openList);
map.put("close", closeList); map.put("close", closeList);
map.put("allList", allList) ;
if(null != loginUser) { if(null != loginUser) {
String enterpriseId = loginUser.getEnterpriseId() ; String enterpriseId = loginUser.getEnterpriseId() ;
EnterpriseDetailDTO dto = this.wxEnterpriseRelatedApiService.getByEnterpriseId(wxEnterpriseId, enterpriseId) ; EnterpriseDetailDTO dto = this.wxEnterpriseRelatedApiService.getByEnterpriseId(wxEnterpriseId, enterpriseId) ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment