Skip to content

H
haoban-manage3.0
Commit 8e053b65 by fudahua
Options

Merge branch 'master' into developer

parents f20ceb5f 46719b7b
Showing with 167 additions and 123 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
...@@ -169,4 +169,16 @@ public interface MemberUnionidRelatedApiService { ...@@ -169,4 +169,16 @@ public interface MemberUnionidRelatedApiService {
*/ */
MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId); MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId);
/**
* 根据企业内部外部联系人id 获取关联关系
*
* @param wxEnterpriseId wx企业标识
* @param selfExternalUserId 自外部的用户id
* @return {@link MemberUnionidRelatedDTO }
* @author mozhu
* @date 2021-12-23 22:39:25
*/
MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId,String selfExternalUserId);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java
...@@ -26,27 +26,27 @@ public interface MemberUnionidRelatedMapper { ...@@ -26,27 +26,27 @@ public interface MemberUnionidRelatedMapper {
MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("unionid") String unionid); MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("unionid") String unionid);
MemberUnionidRelated getByMemberId(@Param("wxUserId")String wxUserId, @Param("memberId")String memberId); MemberUnionidRelated getByMemberId(@Param("wxUserId") String wxUserId, @Param("memberId") String memberId);
void deleteByUnionidAndUserId(@Param("externalUserid")String externalUserid,@Param("wxUserId") String wxUserId); void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("wxUserId") String wxUserId); void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("wxUserId") String wxUserId);
List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId); List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId);
List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date); List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId") String enterpriseId, @Param("date") Date date);
MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId, MemberUnionidRelated getByParams(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId,
@Param("externalName")String name, @Param("addCreateTime")String createTime); @Param("externalName") String name, @Param("addCreateTime") String createTime);
List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid")String externalUserid, @Param("wxUserId")String wxUserId); List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
Page<MemberUnionidRelated> pageMemberUnionByParams(@Param("userIdList")List<String> userIdList, @Param("sendMemberIds")List<String> sendMemberIds, Page<MemberUnionidRelated> pageMemberUnionByParams(@Param("userIdList") List<String> userIdList, @Param("sendMemberIds") List<String> sendMemberIds,
@Param("enterpriseId")String enterpriseId); @Param("enterpriseId") String enterpriseId);
List<MemberUnionidRelated> getByWxUserIdListAndWxEnterpriseId(@Param("userIdList")List<String> userIdList, @Param("wxEnterpriseId")String wxEnterpriseId); List<MemberUnionidRelated> getByWxUserIdListAndWxEnterpriseId(@Param("userIdList") List<String> userIdList, @Param("wxEnterpriseId") String wxEnterpriseId);
void cleanStaffRelated(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffIds")List<String> staffIds); void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
/** /**
* 根据应用内的外部联系人获取信息 * 根据应用内的外部联系人获取信息
...@@ -56,7 +56,7 @@ public interface MemberUnionidRelatedMapper { ...@@ -56,7 +56,7 @@ public interface MemberUnionidRelatedMapper {
* @param selfExternalUserId * @param selfExternalUserId
* @return * @return
*/ */
MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId); MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId,@Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId); List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MemberUnionRelatedService.java
...@@ -45,7 +45,19 @@ public interface MemberUnionRelatedService { ...@@ -45,7 +45,19 @@ public interface MemberUnionRelatedService {
* @param selfExternalUserId * @param selfExternalUserId
* @return * @return
*/ */
MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId); MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId);
/**
* 根据应用内的外部联系人id 获取信息
*
* @param wxEnterpriseId wx企业标识
* @param selfExternalUserId 自外部的用户id
* @return {@link MemberUnionidRelatedDTO }
* @author mozhu
* @date 2021-12-23 22:35:47
*/
MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId);
/** /**
* 根据应用内的外部联系人id 获取信息 * 根据应用内的外部联系人id 获取信息
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java
...@@ -86,8 +86,14 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -86,8 +86,14 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
} }
@Override @Override
public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) { public MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) {
MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId); MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxUserId,wxEnterpriseId, selfExternalUserId);
return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
}
@Override
public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId) {
MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(null,wxEnterpriseId, selfExternalUserId);
return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated); return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -1283,8 +1283,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1283,8 +1283,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
public void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String wxRes) { public void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String wxRes) {
log.info("【清除不存在的好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId); log.info("【清除不存在的好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId); WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
//String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId);
List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId); List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
List<String> externalUserIdList = list.stream().map(external -> external.getExternalUserid()) List<String> externalUserIdList = list.stream().map(external -> external.getExternalUserid())
.collect(Collectors.toList()); .collect(Collectors.toList());
...@@ -1345,8 +1343,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1345,8 +1343,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
public List<String> listExterialList(String wxEnterpriseId, String wxUserId) { public List<String> listExterialList(String wxEnterpriseId, String wxUserId) {
log.info("【获取第三方应用好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId); log.info("【获取第三方应用好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId); WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
// String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), "wwb3ef71aa8c6d9c06", wxUserId); String corpid = enterprise.getCorpid();
String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId); String userId = "";
if (wxUserId.length() > 20) {
TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
if (staff != null) {
userId = staff.getWxOpenUseId();
}
} else {
userId = wxUserId;
}
log.info("【获取第三方应用好友】wxEnterpriseId={},userId={}", wxEnterpriseId, userId);
String wxRes = qywxUserApiService.listExternalUserid(corpid, config.getWxSuiteid(), userId);
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
log.info("【查询第三方应用】res={}", wxRes); log.info("【查询第三方应用】res={}", wxRes);
if (wxRes != null && wxRes.equals("1")) { if (wxRes != null && wxRes.equals("1")) {
...@@ -1591,7 +1599,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1591,7 +1599,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
String relationKey = SecureUtil.md5(dto.getClerkId() + dto.getExternalUserId()); String relationKey = SecureUtil.md5(dto.getClerkId() + dto.getExternalUserId());
MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getBySelfExternalUserId(wxUserId, wxEnterpriseId, dto.getSelfExternalUserId()); MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByWxUserIdAndSelfExternalUserId(wxUserId, wxEnterpriseId, dto.getSelfExternalUserId());
String uuid = ""; String uuid = "";
if (exsitDTO == null) { if (exsitDTO == null) {
exsitDTO = new MemberUnionidRelatedDTO(); exsitDTO = new MemberUnionidRelatedDTO();
...@@ -1729,6 +1737,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1729,6 +1737,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
@Override @Override
public MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId) { public MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId) {
return memberUnionRelatedService.getBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId); return memberUnionRelatedService.getByWxUserIdAndSelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId);
}
@Override
public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId) {
return memberUnionRelatedService.getBySelfExternalUserId(wxEnterpriseId,selfExternalUserId);
} }
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java
...@@ -49,14 +49,13 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation { ...@@ -49,14 +49,13 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
logger.info("dealParamMqDTO={},dataPre={}", JSON.toJSONString(dealParamMqDTO), JSON.toJSONString(dataPre)); logger.info("dealParamMqDTO={},dataPre={}", JSON.toJSONString(dealParamMqDTO), JSON.toJSONString(dataPre));
String reason = ""; String reason = "";
boolean dealFlag = true; boolean dealFlag = true;
String taskId = dealParamMqDTO.getTaskId();
try { try {
String wxEnterpriseId = dataPre.getWxEnterpriseId(); String wxEnterpriseId = dataPre.getWxEnterpriseId();
String wxUserId = dataPre.getDataId(); String wxUserId = dataPre.getDataId();
//获取所有外部联系人的外部联系人ids //获取所有外部联系人的外部联系人ids
List<String> selfUserIdList = memberUnionidRelatedApiService.listSelfExterialList(wxEnterpriseId, wxUserId); List<String> selfUserIdList = memberUnionidRelatedApiService.listSelfExterialList(wxEnterpriseId, wxUserId);
logger.info("selfUserIdList={}", JSONObject.toJSONString(selfUserIdList)); logger.info("selfUserIdList={}", JSONObject.toJSONString(selfUserIdList));
if (null == selfUserIdList) { if (CollectionUtils.isEmpty(selfUserIdList)) {
logger.info("自建应用调用第三方接口进入重试"); logger.info("自建应用调用第三方接口进入重试");
dealFlag = tryAgainToMq(dataPre); dealFlag = tryAgainToMq(dataPre);
reason = "重试次数过多"; reason = "重试次数过多";
...@@ -70,7 +69,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation { ...@@ -70,7 +69,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
} }
//第三方服务商的外部联系人 //第三方服务商的外部联系人
List<String> userIdList = memberUnionidRelatedApiService.listExterialList(wxEnterpriseId, wxUserId); List<String> userIdList = memberUnionidRelatedApiService.listExterialList(wxEnterpriseId, wxUserId);
if (null == selfUserIdList) { if (CollectionUtils.isEmpty(selfUserIdList)) {
dealFlag = tryAgainToMq(dataPre); dealFlag = tryAgainToMq(dataPre);
reason = "重试次数过多"; reason = "重试次数过多";
logger.info("第三方服务商外部联系人调用失败进入重试：{}", dataPre.getDataId()); logger.info("第三方服务商外部联系人调用失败进入重试：{}", dataPre.getDataId());
......
haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.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.MemberUnionidRelatedMapper" > <mapper namespace="com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper">
<resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
<id column="member_unionid_related_id" property="memberUnionidRelatedId" jdbcType="VARCHAR" /> <id column="member_unionid_related_id" property="memberUnionidRelatedId" jdbcType="VARCHAR"/>
<result column="member_id" property="memberId" jdbcType="VARCHAR" /> <result column="member_id" property="memberId" jdbcType="VARCHAR"/>
<result column="unionid" property="unionid" jdbcType="VARCHAR" /> <result column="unionid" property="unionid" jdbcType="VARCHAR"/>
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" /> <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
<result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" /> <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER" /> <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
<result column="external_userid" property="externalUserid" jdbcType="VARCHAR" /> <result column="external_userid" property="externalUserid" jdbcType="VARCHAR"/>
<result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR" /> <result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR"/>
<result column="self_external_userid" property="selfExternalUserid" jdbcType="VARCHAR" /> <result column="self_external_userid" property="selfExternalUserid" jdbcType="VARCHAR"/>
<result column="add_create_time" property="addCreateTime" jdbcType="VARCHAR" /> <result column="add_create_time" property="addCreateTime" jdbcType="VARCHAR"/>
<result column="external_name" property="externalName" jdbcType="VARCHAR" /> <result column="external_name" property="externalName" jdbcType="VARCHAR"/>
<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">
member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid, member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid,
wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id
</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_member_unionid_related from tab_haoban_member_unionid_related
where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR} where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" > <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_member_unionid_related delete
from tab_haoban_member_unionid_related
where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR} where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
</delete> </delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id, insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id,
unionid, wx_enterprise_id, status_flag, unionid, wx_enterprise_id, status_flag,
external_userid, wx_user_id, create_time, external_userid, wx_user_id, create_time,
update_time,add_create_time,self_external_userid,external_name,enterprise_id) update_time, add_create_time, self_external_userid,
external_name, enterprise_id)
values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
#{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},
#{externalUserid,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{externalUserid,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP},#{addCreateTime},#{selfExternalUserid},#{externalName},#{enterpriseId}) #{updateTime,jdbcType=TIMESTAMP}, #{addCreateTime}, #{selfExternalUserid}, #{externalName},
#{enterpriseId})
</insert> </insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
insert into tab_haoban_member_unionid_related insert into tab_haoban_member_unionid_related
<trim prefix="(" suffix=")" suffixOverrides="," > <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="memberUnionidRelatedId != null" > <if test="memberUnionidRelatedId != null">
member_unionid_related_id, member_unionid_related_id,
</if> </if>
<if test="memberId != null" > <if test="memberId != null">
member_id, member_id,
</if> </if>
<if test="unionid != null" > <if test="unionid != null">
unionid, unionid,
</if> </if>
<if test="wxEnterpriseId != null" > <if test="wxEnterpriseId != null">
wx_enterprise_id, wx_enterprise_id,
</if> </if>
<if test="enterpriseId != null" > <if test="enterpriseId != null">
enterprise_id, enterprise_id,
</if> </if>
<if test="statusFlag != null" > <if test="statusFlag != null">
status_flag, status_flag,
</if> </if>
<if test="externalUserid != null" > <if test="externalUserid != null">
external_userid, external_userid,
</if> </if>
<if test="wxUserId != null" > <if test="wxUserId != null">
wx_user_id, wx_user_id,
</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>
<if test="addCreateTime != null" > <if test="addCreateTime != null">
add_create_time, add_create_time,
</if> </if>
<if test="selfExternalUserid != null" > <if test="selfExternalUserid != null">
self_external_userid, self_external_userid,
</if> </if>
<if test="externalName != null" > <if test="externalName != null">
external_name, external_name,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="memberUnionidRelatedId != null" > <if test="memberUnionidRelatedId != null">
#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberUnionidRelatedId,jdbcType=VARCHAR},
</if> </if>
<if test="memberId != null" > <if test="memberId != null">
#{memberId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
</if> </if>
<if test="unionid != null" > <if test="unionid != null">
#{unionid,jdbcType=VARCHAR}, #{unionid,jdbcType=VARCHAR},
</if> </if>
<if test="wxEnterpriseId != null" > <if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="enterpriseId != null" > <if test="enterpriseId != null">
#{enterpriseId,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="statusFlag != null" > <if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER},
</if> </if>
<if test="externalUserid != null" > <if test="externalUserid != null">
#{externalUserid,jdbcType=VARCHAR}, #{externalUserid,jdbcType=VARCHAR},
</if> </if>
<if test="wxUserId != null" > <if test="wxUserId != null">
#{wxUserId,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR},
</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>
<if test="addCreateTime != null" > <if test="addCreateTime != null">
#{addCreateTime}, #{addCreateTime},
</if> </if>
<if test="selfExternalUserid != null" > <if test="selfExternalUserid != null">
#{selfExternalUserid}, #{selfExternalUserid},
</if> </if>
<if test="externalName != null" > <if test="externalName != null">
#{externalName}, #{externalName},
</if> </if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
<set > <set>
<if test="memberId != null" > <if test="memberId != null">
member_id = #{memberId,jdbcType=VARCHAR}, member_id = #{memberId,jdbcType=VARCHAR},
</if> </if>
<if test="unionid != null" > <if test="unionid != null">
unionid = #{unionid,jdbcType=VARCHAR}, unionid = #{unionid,jdbcType=VARCHAR},
</if> </if>
<if test="wxEnterpriseId != null" > <if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}, wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="enterpriseId != null" > <if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=VARCHAR}, enterprise_id = #{enterpriseId,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="externalUserid != null" > <if test="externalUserid != null">
external_userid = #{externalUserid,jdbcType=VARCHAR}, external_userid = #{externalUserid,jdbcType=VARCHAR},
</if> </if>
<if test="wxUserId != null" > <if test="wxUserId != null">
wx_user_id = #{wxUserId,jdbcType=VARCHAR}, wx_user_id = #{wxUserId,jdbcType=VARCHAR},
</if> </if>
<if test="addCreateTime != null" > <if test="addCreateTime != null">
add_create_time = #{addCreateTime,jdbcType=VARCHAR}, add_create_time = #{addCreateTime,jdbcType=VARCHAR},
</if> </if>
<if test="selfExternalUserid != null" > <if test="selfExternalUserid != null">
self_external_userid = #{selfExternalUserid,jdbcType=VARCHAR}, self_external_userid = #{selfExternalUserid,jdbcType=VARCHAR},
</if> </if>
<if test="externalName != null" > <if test="externalName != null">
external_name = #{externalName,jdbcType=VARCHAR}, external_name = #{externalName,jdbcType=VARCHAR},
</if> </if>
<if test="createTime != null" > <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
update_time = now() update_time = now()
</set> </set>
where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR} where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
set member_id = #{memberId,jdbcType=VARCHAR}, set member_id = #{memberId,jdbcType=VARCHAR},
unionid = #{unionid,jdbcType=VARCHAR}, unionid = #{unionid,jdbcType=VARCHAR},
...@@ -182,7 +185,7 @@ ...@@ -182,7 +185,7 @@
where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR} where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
</update> </update>
<update id="cleanByCid" > <update id="cleanByCid">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
set set
status_flag = 0, status_flag = 0,
...@@ -193,9 +196,9 @@ ...@@ -193,9 +196,9 @@
</if> </if>
</update> </update>
<select id="getByUnionId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="getByUnionId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId} where wx_user_id = #{wxUserId}
and wx_enterprise_id=#{wxEnterpriseId} and wx_enterprise_id=#{wxEnterpriseId}
...@@ -204,9 +207,9 @@ ...@@ -204,9 +207,9 @@
limit 1 limit 1
</select> </select>
<select id="getByMemberId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="getByMemberId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId} where wx_user_id = #{wxUserId}
and status_flag = 1 and status_flag = 1
...@@ -214,9 +217,10 @@ ...@@ -214,9 +217,10 @@
limit 1 limit 1
</select> </select>
<update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
set status_flag = 0 ,update_time=now() set status_flag = 0,
update_time=now()
where external_userid = #{externalUserid,jdbcType=VARCHAR} where external_userid = #{externalUserid,jdbcType=VARCHAR}
and wx_user_id = #{wxUserId} and wx_user_id = #{wxUserId}
</update> </update>
...@@ -233,37 +237,37 @@ ...@@ -233,37 +237,37 @@
</foreach> </foreach>
</update> </update>
<select id="getByWxUserIdAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="getByWxUserIdAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId} where wx_user_id = #{wxUserId}
and status_flag in(1,3,4) and status_flag in(1,3,4)
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
</select> </select>
<select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where status_flag = 1 where status_flag = 1
and enterprise_id = #{enterpriseId} and enterprise_id = #{enterpriseId}
<if test="date != null" > <if test="date != null">
and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP}) and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP})
</if> </if>
</select> </select>
<select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId} where wx_user_id = #{wxUserId}
and status_flag = 1 and status_flag = 1
and external_userid = #{externalUserid} and external_userid = #{externalUserid}
</select> </select>
<select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId} where wx_user_id = #{wxUserId}
and status_flag = 1 and status_flag = 1
...@@ -272,9 +276,9 @@ ...@@ -272,9 +276,9 @@
and add_create_time = #{addCreateTime} and add_create_time = #{addCreateTime}
</select> </select>
<select id="pageMemberUnionByParams" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="pageMemberUnionByParams" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where enterprise_id = #{enterpriseId} where enterprise_id = #{enterpriseId}
and status_flag = 1 and status_flag = 1
...@@ -290,9 +294,9 @@ ...@@ -290,9 +294,9 @@
group by external_userid group by external_userid
</select> </select>
<select id="getByWxUserIdListAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="getByWxUserIdListAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
...@@ -302,7 +306,7 @@ ...@@ -302,7 +306,7 @@
</foreach> </foreach>
</select> </select>
<update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" > <update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
set status_flag = 0, set status_flag = 0,
update_time = now() update_time = now()
...@@ -322,16 +326,20 @@ ...@@ -322,16 +326,20 @@
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
and wx_user_id = #{wxUserId, jdbcType=CHAR}
and self_external_userid = #{selfExternalUserId} and self_external_userid = #{selfExternalUserId}
<if test="wxUserId != null">
and wx_user_id = #{wxUserId}
</if>
order by create_time desc limit 1
</select> </select>
<select id="listBySelfExternalUserId" resultMap="BaseResultMap"> <select id="listBySelfExternalUserId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
and wx_user_id = #{wxUserId, jdbcType=CHAR} and wx_user_id = #{wxUserId}
and self_external_userid = #{selfExternalUserId} and self_external_userid = #{selfExternalUserId}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -269,13 +269,13 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -269,13 +269,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
if (user == null) { if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6); return resultResponse(HaoBanErrCode.ERR_6);
} }
if (!user.getCorpId().equals(enterpriseDTO.getCorpid())) {
WxApplicationDTO wxApplicationDTO = wxApplicationApiService.selectByCorpid(user.getCorpId()); WxApplicationDTO wxApplicationDTO = wxApplicationApiService.selectByCorpid(user.getCorpId());
WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxApplicationDTO.getWxEnterpriseId()); WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxApplicationDTO.getWxEnterpriseId());
if (wxEnterpriseDTO == null) { if (wxEnterpriseDTO == null) {
logger.info("该企业不存在:{}", qo.getGicEnterpriseId()); logger.info("该企业不存在:{}", qo.getGicEnterpriseId());
return resultResponse(HaoBanErrCode.ERR_400002); return resultResponse(HaoBanErrCode.ERR_400002);
} }
if (!wxEnterpriseDTO.getCorpid().equals(enterpriseDTO.getCorpid())) {
return resultResponse(HaoBanErrCode.ERR_500003, wxEnterpriseDTO.getCorpid()); return resultResponse(HaoBanErrCode.ERR_500003, wxEnterpriseDTO.getCorpid());
} }
} else { } else {
...@@ -407,11 +407,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -407,11 +407,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
logger.info("企业不存在没有绑定"); logger.info("企业不存在没有绑定");
return resultResponse(HaoBanErrCode.ERR_400002); return resultResponse(HaoBanErrCode.ERR_400002);
} }
//if (enterpriseBindInfo.getMemberOpenCardFlag() != 1) { MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
// logger.info("该企业在同一个开平，无需手动关联:wxEid:{}, eid:{}", wxEnterpriseId, gicEnterpriseId);
// return resultResponse(HaoBanErrCode.ERR_11125);
//}
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getExternalUseridInfoBySelfExternalUserId(wxEnterpriseId, wxUserId, externalUserid);
if (null == memberUnionidRelatedDTO) { if (null == memberUnionidRelatedDTO) {
logger.info("请刷新好友"); logger.info("请刷新好友");
return resultResponse(HaoBanErrCode.ERR_11123); return resultResponse(HaoBanErrCode.ERR_11123);
...@@ -438,7 +434,6 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -438,7 +434,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
memberSendMessageVo.setWxaHandUrl(enterpriseDTO.getMallMiniprogramLogoUrl()); memberSendMessageVo.setWxaHandUrl(enterpriseDTO.getMallMiniprogramLogoUrl());
memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0); memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0);
memberSendMessageVo.setWxaName(settingDTO.getMiniprogramName()); memberSendMessageVo.setWxaName(settingDTO.getMiniprogramName());
return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo); return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo);
} }
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/interceptor/MobileWebInterceptor.java
...@@ -51,9 +51,6 @@ public class MobileWebInterceptor extends HandlerInterceptorAdapter { ...@@ -51,9 +51,6 @@ public class MobileWebInterceptor extends HandlerInterceptorAdapter {
logger.info("post-url:{}", requestURI); logger.info("post-url:{}", requestURI);
Map<String, String[]> parameterMap = httpServletRequest.getParameterMap(); Map<String, String[]> parameterMap = httpServletRequest.getParameterMap();
logger.info("post-params:{}", JSONObject.toJSONString(parameterMap)); logger.info("post-params:{}", JSONObject.toJSONString(parameterMap));
if (true) {
return true;
}
HandlerMethod handler = (HandlerMethod) o; HandlerMethod handler = (HandlerMethod) o;
IgnoreLogin ignoreLogin = handler.getMethodAnnotation(IgnoreLogin.class); IgnoreLogin ignoreLogin = handler.getMethodAnnotation(IgnoreLogin.class);
if (null != ignoreLogin) { if (null != ignoreLogin) {
......
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