Skip to content

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

fix：默认返回模板

parent 2301b10a
Showing with 98 additions and 92 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;
...@@ -34,6 +36,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService { ...@@ -34,6 +36,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
private ApplicationTemplateService applicationTemplateService; private ApplicationTemplateService applicationTemplateService;
@Autowired @Autowired
private WxEnterpriseService wxEnterpriseService; private WxEnterpriseService wxEnterpriseService;
@Override @Override
public List<ApplicationDTO> listApplication() { public List<ApplicationDTO> listApplication() {
List<TabHaobanApplication> list = applicationService.listApplication(); List<TabHaobanApplication> list = applicationService.listApplication();
...@@ -43,7 +46,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService { ...@@ -43,7 +46,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
@Override @Override
public List<ApplicationDTO> listByApplications(List<String> applicationIds) { public List<ApplicationDTO> listByApplications(List<String> applicationIds) {
List<TabHaobanApplication> list = applicationMapper.listByApplicationIds(applicationIds); List<TabHaobanApplication> list = applicationMapper.listByApplicationIds(applicationIds);
if(CollectionUtil.isEmpty(list)){ if (CollectionUtil.isEmpty(list)) {
return null; return null;
} }
List<ApplicationDTO> result = EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list); List<ApplicationDTO> result = EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
...@@ -54,34 +57,39 @@ public class ApplicationApiServiceImpl implements ApplicationApiService { ...@@ -54,34 +57,39 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
@Override @Override
public List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId) { public List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId) {
List<TabHaobanApplication> list = applicationService.listApplication(); List<TabHaobanApplication> list = applicationService.listApplication();
List<String> applicationIds = new ArrayList<>();
//-1默认模版
if ("-1".equals(wxEnterpriseId) || StringUtils.isBlank(wxEnterpriseId)) {
applicationIds = Arrays.asList("11112", "11113", "11116", "11117", "11118");
} else {
TemplateEnterpriseRelatedDTO template = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId); TemplateEnterpriseRelatedDTO template = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if(template == null){ if (template == null) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
List<TabHaobanTemplateApplicationRelated> applicatinList = templateApplicationRelatedService.listByTemplateId(template.getApplicationTemplateId()); List<TabHaobanTemplateApplicationRelated> applicatinList = templateApplicationRelatedService.listByTemplateId(template.getApplicationTemplateId());
applicationIds = applicatinList.stream().map(TabHaobanTemplateApplicationRelated::getApplicationId).collect(Collectors.toList());
}
List<String> applicationIds = applicatinList.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
List<TabHaobanApplication> result = new ArrayList<TabHaobanApplication>(); List<TabHaobanApplication> result = new ArrayList<TabHaobanApplication>();
for (TabHaobanApplication tabHaobanApplication : list) { for (TabHaobanApplication tabHaobanApplication : list) {
if(applicationIds.contains(tabHaobanApplication.getApplicationId())){ if (applicationIds.contains(tabHaobanApplication.getApplicationId())) {
result.add(tabHaobanApplication); result.add(tabHaobanApplication);
} }
} }
return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, result); return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, result);
} }
@Override @Override
public void insertApplicationRelation(String wxEnterpriseId) { public void insertApplicationRelation(String wxEnterpriseId) {
TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId); TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if(dto == null){ if (dto == null) {
ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate(); ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate();
if(defaultTemplate != null){ if (defaultTemplate != null) {
dto = new TemplateEnterpriseRelatedDTO(); dto = new TemplateEnterpriseRelatedDTO();
dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId()); dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId());
dto.setWxEnterpriseId(wxEnterpriseId); dto.setWxEnterpriseId(wxEnterpriseId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId); WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
if(enterprise != null){ if (enterprise != null) {
dto.setWxEnterpriseName(enterprise.getCorpName()); dto.setWxEnterpriseName(enterprise.getCorpName());
} }
templateEnterpriseRelatedService.insert(dto); templateEnterpriseRelatedService.insert(dto);
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanTemplateEnterpriseRelationMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateEnterpriseRelationMapper" > <mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateEnterpriseRelationMapper">
<resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation" > <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
<id column="template_enterprise_relation_id" property="templateEnterpriseRelationId" jdbcType="VARCHAR" /> <id column="template_enterprise_relation_id" property="templateEnterpriseRelationId" jdbcType="VARCHAR"/>
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" /> <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
<result column="wx_enterprise_name" property="wxEnterpriseName" jdbcType="VARCHAR" /> <result column="wx_enterprise_name" property="wxEnterpriseName" jdbcType="VARCHAR"/>
<result column="application_template_id" property="applicationTemplateId" jdbcType="VARCHAR" /> <result column="application_template_id" property="applicationTemplateId" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER" /> <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
</resultMap> </resultMap>
<sql id="Base_Column_List" > <sql id="Base_Column_List">
template_enterprise_relation_id, wx_enterprise_id, application_template_id, status_flag,wx_enterprise_name, template_enterprise_relation_id, wx_enterprise_id, application_template_id, status_flag,wx_enterprise_name,
create_time, update_time create_time, update_time
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_template_enterprise_relation from tab_haoban_template_enterprise_relation
where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR} where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" > <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_template_enterprise_relation delete
from tab_haoban_template_enterprise_relation
where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR} where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR}
</delete> </delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation" > <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
insert into tab_haoban_template_enterprise_relation (template_enterprise_relation_id, wx_enterprise_id, insert into tab_haoban_template_enterprise_relation (template_enterprise_relation_id, wx_enterprise_id,
application_template_id, status_flag, create_time, application_template_id, status_flag, create_time,
update_time,wx_enterprise_name) update_time, wx_enterprise_name)
values (#{templateEnterpriseRelationId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, values (#{templateEnterpriseRelationId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
#{applicationTemplateId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{applicationTemplateId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},
#{updateTime,jdbcType=TIMESTAMP},#{wxEnterpriseName,jdbcType=VARCHAR}) #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{wxEnterpriseName,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation" > <insert id="insertSelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
insert into tab_haoban_template_enterprise_relation insert into tab_haoban_template_enterprise_relation
<trim prefix="(" suffix=")" suffixOverrides="," > <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="templateEnterpriseRelationId != null" > <if test="templateEnterpriseRelationId != null">
template_enterprise_relation_id, template_enterprise_relation_id,
</if> </if>
<if test="wxEnterpriseId != null" > <if test="wxEnterpriseId != null">
wx_enterprise_id, wx_enterprise_id,
</if> </if>
<if test="wxEnterpriseName != null" > <if test="wxEnterpriseName != null">
wx_enterprise_name, wx_enterprise_name,
</if> </if>
<if test="applicationTemplateId != null" > <if test="applicationTemplateId != null">
application_template_id, application_template_id,
</if> </if>
<if test="statusFlag != null" > <if test="statusFlag != null">
status_flag, status_flag,
</if> </if>
<if test="createTime != null" > <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="updateTime != null" > <if test="updateTime != null">
update_time, update_time,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateEnterpriseRelationId != null" > <if test="templateEnterpriseRelationId != null">
#{templateEnterpriseRelationId,jdbcType=VARCHAR}, #{templateEnterpriseRelationId,jdbcType=VARCHAR},
</if> </if>
<if test="wxEnterpriseId != null" > <if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="wxEnterpriseName != null" > <if test="wxEnterpriseName != null">
#{wxEnterpriseName,jdbcType=VARCHAR}, #{wxEnterpriseName,jdbcType=VARCHAR},
</if> </if>
<if test="applicationTemplateId != null" > <if test="applicationTemplateId != null">
#{applicationTemplateId,jdbcType=VARCHAR}, #{applicationTemplateId,jdbcType=VARCHAR},
</if> </if>
<if test="statusFlag != null" > <if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER},
</if> </if>
<if test="createTime != null" > <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null" > <if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation" > <update id="updateByPrimaryKeySelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
update tab_haoban_template_enterprise_relation update tab_haoban_template_enterprise_relation
<set > <set>
<if test="wxEnterpriseId != null" > <if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}, wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="wxEnterpriseName != null" > <if test="wxEnterpriseName != null">
wx_enterprise_name = #{wxEnterpriseName,jdbcType=VARCHAR}, wx_enterprise_name = #{wxEnterpriseName,jdbcType=VARCHAR},
</if> </if>
<if test="applicationTemplateId != null" > <if test="applicationTemplateId != null">
application_template_id = #{applicationTemplateId,jdbcType=VARCHAR}, application_template_id = #{applicationTemplateId,jdbcType=VARCHAR},
</if> </if>
<if test="statusFlag != null" > <if test="statusFlag != null">
status_flag = #{statusFlag,jdbcType=INTEGER}, status_flag = #{statusFlag,jdbcType=INTEGER},
</if> </if>
<if test="createTime != null" > <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null" > <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
</set> </set>
where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR} where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation" > <update id="updateByPrimaryKey"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
update tab_haoban_template_enterprise_relation update tab_haoban_template_enterprise_relation
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}, set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
wx_enterprise_name = #{wxEnterpriseName,jdbcType=VARCHAR}, wx_enterprise_name = #{wxEnterpriseName,jdbcType=VARCHAR},
...@@ -116,25 +121,25 @@ ...@@ -116,25 +121,25 @@
where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR} where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR}
</update> </update>
<select id="listEnterpriseByTemplateId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="listEnterpriseByTemplateId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_template_enterprise_relation from tab_haoban_template_enterprise_relation
where application_template_id = #{templateId,jdbcType=VARCHAR} where application_template_id = #{templateId,jdbcType=VARCHAR}
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="selectByWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="selectByWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_template_enterprise_relation from tab_haoban_template_enterprise_relation
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="listEnterpriseByParams" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="listEnterpriseByParams" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_template_enterprise_relation from tab_haoban_template_enterprise_relation
where application_template_id = #{applicationTemplateId,jdbcType=VARCHAR} where application_template_id = #{applicationTemplateId,jdbcType=VARCHAR}
and status_flag = 1 and status_flag = 1
......
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;
...@@ -38,37 +33,35 @@ public class ApplicationController extends WebBaseController{ ...@@ -38,37 +33,35 @@ public class ApplicationController extends WebBaseController{
@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<String> applicationIds = list.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
List<ApplicationSettingDTO> settings = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds); List<ApplicationSettingDTO> settings = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
List<String> openApplicationIds = new ArrayList<String>(); List<String> openApplicationIds = new ArrayList<String>();
if(CollectionUtil.isNotEmpty(settings)){ if (CollectionUtil.isNotEmpty(settings)) {
openApplicationIds = settings.stream().map(s->s.getApplicationId()).collect(Collectors.toList()); openApplicationIds = settings.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
} }
Iterator<ApplicationDTO> it = list.listIterator(); Iterator<ApplicationDTO> it = list.listIterator();
while(it.hasNext()){ while (it.hasNext()) {
ApplicationDTO app = it.next(); ApplicationDTO app = it.next();
if(!openApplicationIds.contains(app.getApplicationId())){ if (!openApplicationIds.contains(app.getApplicationId())) {
it.remove(); it.remove();
continue ; continue;
} }
if("通讯录".equals(app.getApplicationName())){ if ("通讯录".equals(app.getApplicationName())) {
it.remove(); it.remove();
continue ; continue;
} }
if("卡券赠送".equals(app.getApplicationName())){ if ("卡券赠送".equals(app.getApplicationName())) {
it.remove(); it.remove();
continue ; continue;
} }
if("内购券".equals(app.getApplicationName())){ if ("内购券".equals(app.getApplicationName())) {
it.remove(); it.remove();
continue ; continue;
} }
} }
return resultResponse(HaoBanErrCode.ERR_1,list); return resultResponse(HaoBanErrCode.ERR_1, list);
} }
......
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