Skip to content

H
haoban-manage3.0
Commit 734e0a86 by 墨竹
Options

fix：默认返回模板

parent 2301b10a
Showing with 125 additions and 124 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationApiServiceImpl.java
...@@ -11,10 +11,12 @@ import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper; ...@@ -11,10 +11,12 @@ import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper;
import com.gic.haoban.manage.service.entity.TabHaobanApplication; import com.gic.haoban.manage.service.entity.TabHaobanApplication;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated; import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import com.gic.haoban.manage.service.service.*; import com.gic.haoban.manage.service.service.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -22,71 +24,77 @@ import java.util.stream.Collectors; ...@@ -22,71 +24,77 @@ import java.util.stream.Collectors;
@Service @Service
public class ApplicationApiServiceImpl implements ApplicationApiService { public class ApplicationApiServiceImpl implements ApplicationApiService {
@Autowired @Autowired
private ApplicationService applicationService; private ApplicationService applicationService;
@Autowired @Autowired
private ApplicationMapper applicationMapper; private ApplicationMapper applicationMapper;
@Autowired @Autowired
private TemplateEnterpriseRelatedService templateEnterpriseRelatedService; private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
@Autowired @Autowired
private TemplateApplicationRelatedService templateApplicationRelatedService; private TemplateApplicationRelatedService templateApplicationRelatedService;
@Autowired @Autowired
private ApplicationTemplateService applicationTemplateService; private ApplicationTemplateService applicationTemplateService;
@Autowired @Autowired
private WxEnterpriseService wxEnterpriseService; private WxEnterpriseService wxEnterpriseService;
@Override
public List<ApplicationDTO> listApplication() {
List<TabHaobanApplication> list = applicationService.listApplication();
return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
}
@Override @Override
public List<ApplicationDTO> listByApplications(List<String> applicationIds) { public List<ApplicationDTO> listApplication() {
List<TabHaobanApplication> list = applicationMapper.listByApplicationIds(applicationIds); List<TabHaobanApplication> list = applicationService.listApplication();
if(CollectionUtil.isEmpty(list)){ return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
return null; }
}
List<ApplicationDTO> result = EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
return result;
}
@Override @Override
public List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId) { public List<ApplicationDTO> listByApplications(List<String> applicationIds) {
List<TabHaobanApplication> list = applicationService.listApplication(); List<TabHaobanApplication> list = applicationMapper.listByApplicationIds(applicationIds);
TemplateEnterpriseRelatedDTO template = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId); if (CollectionUtil.isEmpty(list)) {
if(template == null){ return null;
return Collections.EMPTY_LIST; }
} List<ApplicationDTO> result = EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
List<TabHaobanTemplateApplicationRelated> applicatinList = templateApplicationRelatedService.listByTemplateId(template.getApplicationTemplateId()); return result;
}
List<String> applicationIds = applicatinList.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
List<TabHaobanApplication> result = new ArrayList<TabHaobanApplication>();
for (TabHaobanApplication tabHaobanApplication : list) {
if(applicationIds.contains(tabHaobanApplication.getApplicationId())){
result.add(tabHaobanApplication);
}
}
return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, result);
}
@Override @Override
public void insertApplicationRelation(String wxEnterpriseId) { public List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId) {
TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId); List<TabHaobanApplication> list = applicationService.listApplication();
if(dto == null){ List<String> applicationIds = new ArrayList<>();
ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate(); //-1默认模版
if(defaultTemplate != null){ if ("-1".equals(wxEnterpriseId) || StringUtils.isBlank(wxEnterpriseId)) {
dto = new TemplateEnterpriseRelatedDTO(); applicationIds = Arrays.asList("11112", "11113", "11116", "11117", "11118");
dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId()); } else {
dto.setWxEnterpriseId(wxEnterpriseId); TemplateEnterpriseRelatedDTO template = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId); if (template == null) {
if(enterprise != null){ return Collections.EMPTY_LIST;
dto.setWxEnterpriseName(enterprise.getCorpName()); }
} List<TabHaobanTemplateApplicationRelated> applicatinList = templateApplicationRelatedService.listByTemplateId(template.getApplicationTemplateId());
templateEnterpriseRelatedService.insert(dto); applicationIds = applicatinList.stream().map(TabHaobanTemplateApplicationRelated::getApplicationId).collect(Collectors.toList());
} }
}
} List<TabHaobanApplication> result = new ArrayList<TabHaobanApplication>();
for (TabHaobanApplication tabHaobanApplication : list) {
if (applicationIds.contains(tabHaobanApplication.getApplicationId())) {
result.add(tabHaobanApplication);
}
}
return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, result);
}
@Override
public void insertApplicationRelation(String wxEnterpriseId) {
TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if (dto == null) {
ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate();
if (defaultTemplate != null) {
dto = new TemplateEnterpriseRelatedDTO();
dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId());
dto.setWxEnterpriseId(wxEnterpriseId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
if (enterprise != null) {
dto.setWxEnterpriseName(enterprise.getCorpName());
}
templateEnterpriseRelatedService.insert(dto);
}
}
}
} }
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.web.vo.SdkVersionLimitVo;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.ApplicationDTO; import com.gic.haoban.manage.api.dto.ApplicationDTO;
import com.gic.haoban.manage.api.dto.ApplicationSettingDTO; import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
import com.gic.haoban.manage.api.service.ApplicationApiService; import com.gic.haoban.manage.api.service.ApplicationApiService;
import com.gic.haoban.manage.api.service.ApplicationSettingApiService; import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.SdkVersionLimitVo;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
@RestController @RestController
public class ApplicationController extends WebBaseController{ public class ApplicationController extends WebBaseController {
@Autowired @Autowired
private ApplicationApiService applicationApiService; private ApplicationApiService applicationApiService;
@Autowired @Autowired
private ApplicationSettingApiService applicationSettingApiService; private ApplicationSettingApiService applicationSettingApiService;
private static final String SDKVERSION_KEY = "haoban-wx-sdk-version"; private static final String SDKVERSION_KEY = "haoban-wx-sdk-version";
@RequestMapping("application-list") @RequestMapping("application-list")
public HaobanResponse applicationList(String wxEnterpriseId) { public HaobanResponse applicationList(String wxEnterpriseId) {
List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId); List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
List<ApplicationSettingDTO> settings = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
List<String> applicationIds = list.stream().map(s->s.getApplicationId()).collect(Collectors.toList()); List<String> openApplicationIds = new ArrayList<String>();
List<ApplicationSettingDTO> settings = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds); if (CollectionUtil.isNotEmpty(settings)) {
List<String> openApplicationIds = new ArrayList<String>(); openApplicationIds = settings.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
if(CollectionUtil.isNotEmpty(settings)){ }
openApplicationIds = settings.stream().map(s->s.getApplicationId()).collect(Collectors.toList()); Iterator<ApplicationDTO> it = list.listIterator();
} while (it.hasNext()) {
Iterator<ApplicationDTO> it = list.listIterator(); ApplicationDTO app = it.next();
while(it.hasNext()){ if (!openApplicationIds.contains(app.getApplicationId())) {
ApplicationDTO app = it.next(); it.remove();
if(!openApplicationIds.contains(app.getApplicationId())){ continue;
it.remove(); }
continue ; if ("通讯录".equals(app.getApplicationName())) {
} it.remove();
if("通讯录".equals(app.getApplicationName())){ continue;
it.remove(); }
continue ; if ("卡券赠送".equals(app.getApplicationName())) {
} it.remove();
if("卡券赠送".equals(app.getApplicationName())){ continue;
it.remove(); }
continue ; if ("内购券".equals(app.getApplicationName())) {
} it.remove();
if("内购券".equals(app.getApplicationName())){ continue;
it.remove(); }
continue ; }
}
} return resultResponse(HaoBanErrCode.ERR_1, list);
return resultResponse(HaoBanErrCode.ERR_1,list); }
}
@RequestMapping("sdk-version-check") @RequestMapping("sdk-version-check")
public HaobanResponse sdkVersionCheck(String skdVersion) { public HaobanResponse sdkVersionCheck(String skdVersion) {
...@@ -85,8 +78,8 @@ public class ApplicationController extends WebBaseController{ ...@@ -85,8 +78,8 @@ public class ApplicationController extends WebBaseController{
String limitSdkVersion = cache.toString(); String limitSdkVersion = cache.toString();
sdkVersionLimitVo.setLimitSdkVersion(limitSdkVersion); sdkVersionLimitVo.setLimitSdkVersion(limitSdkVersion);
String[] limitSdk = StringUtils.split(limitSdkVersion, "."); String[] limitSdk = StringUtils.split(limitSdkVersion, ".");
String[] versionSplit = StringUtils.split(skdVersion, "."); String[] versionSplit = StringUtils.split(skdVersion, ".");
int checkFlag = checkNum(Integer.valueOf(limitSdk[0]), Integer.valueOf(versionSplit[0])); int checkFlag = checkNum(Integer.valueOf(limitSdk[0]), Integer.valueOf(versionSplit[0]));
if (checkFlag != 0) { if (checkFlag != 0) {
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -198,7 +198,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -198,7 +198,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
String wxOpenUseId = staffLoginQO.getWxOpenUseId(); String wxOpenUseId = staffLoginQO.getWxOpenUseId();
//-1 代表游客登录 //-1 代表游客登录
if ("-1".equals(staffId) || StringUtils.isBlank(staffId)) { if ("-1".equals(staffId) || StringUtils.isBlank(staffId)) {
return wellDoneLoginPrivacy(staffLoginQO, request, staffId, wxOpenUseId); return wellDoneTouristsLogin(staffLoginQO, request, staffId, wxOpenUseId);
} }
//用户登录 //用户登录
return wellDoneLogin(staffLoginQO, request, staffId); return wellDoneLogin(staffLoginQO, request, staffId);
...@@ -212,7 +212,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -212,7 +212,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
* @param wxOpenUseId * @param wxOpenUseId
* @return * @return
*/ */
private RestResponse<String> wellDoneLoginPrivacy(StaffLoginQO staffLoginQO, HttpServletRequest request, String staffId, String wxOpenUseId) { private RestResponse<String> wellDoneTouristsLogin(StaffLoginQO staffLoginQO, HttpServletRequest request, String staffId, String wxOpenUseId) {
logger.info("游客登录,wxOpenUseId:{}", wxOpenUseId); logger.info("游客登录,wxOpenUseId:{}", wxOpenUseId);
//登录和刷新token兼容 //登录和刷新token兼容
String headerToken = AuthRequestWellDoneUtil.getHeaderToken(); String headerToken = AuthRequestWellDoneUtil.getHeaderToken();
......
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