Commit 3e52a76a by 徐高华

删除无效代码

parent 2b3a3b53
......@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface MemberUnionidRelatedMapper {
......@@ -22,8 +21,6 @@ public interface MemberUnionidRelatedMapper {
void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("staffId") String staffId);
List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId") String enterpriseId, @Param("date") Date date);
void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
/**
......@@ -38,29 +35,6 @@ public interface MemberUnionidRelatedMapper {
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
/**
* 更新外部用户id的老外部用户id
*
* @param new_external_userid 新的外部标识
* @param external_userid 外部用户标识
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2021-12-29 16:30:43
*/
int updateExternalUserIdByOldExternalUserId(@Param("newExternalUserId") String new_external_userid,
@Param("oldExternalUserId") String external_userid,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* wx企业id查询数据
*
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link MemberUnionidRelated }>
* @author mozhu
* @date 2022-06-30 17:35:50
*/
List<MemberUnionidRelated> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<MemberUnionidRelated> listByWxEnterpriseIdAndExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("list")List<String> externalUserIdList);
......
......@@ -64,16 +64,4 @@ public interface MemberUnionRelatedService {
*/
List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId);
/**
* 分页查询外部联系人id
*
* @param wxEnterpriseId wx企业标识
* @param basePageInfo 基本信息页
* @return {@link Page }<{@link MemberUnionidRelatedDTO }>
* @author mozhu
* @date 2022-06-30 17:34:06
*/
PageInfo<MemberUnionidRelated> listByWxEnterpriseId(String wxEnterpriseId, BasePageInfo basePageInfo);
}
......@@ -83,11 +83,4 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
List<MemberUnionidRelated> retList = mapper.listBySelfExternalUserId(staffId, wxEnterpriseId, selfExternalUserId);
return EntityUtil.changeEntityListNew(MemberUnionidRelatedDTO.class, retList);
}
@Override
public PageInfo<MemberUnionidRelated> listByWxEnterpriseId(String wxEnterpriseId, BasePageInfo basePageInfo) {
PageHelper.startPage(basePageInfo);
List<MemberUnionidRelated> memberUnionidRelateds = mapper.listByWxEnterpriseId(wxEnterpriseId);
return new PageInfo<>(memberUnionidRelateds);
}
}
......@@ -8,7 +8,6 @@ import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.dubbo.entity.ProviderLocalTag;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.StoreService;
......@@ -40,7 +39,6 @@ import com.gic.member.api.service.MemberEntranceApiService;
import com.gic.member.api.service.MemberService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -498,50 +496,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
}
@Override
@Deprecated
public void updateNewExternalUseridMq(String res) {
log.info("更新新的外部联系人id mq,start");
try {
JSONObject jsonObject = JSON.parseObject(res);
String corpid = jsonObject.getString("corpid");
String wxEnterpriseId = jsonObject.getString("wxEnterpriseId");
Boolean isLastPage = jsonObject.getBoolean("isLastPage");
log.info("更新新的外部联系人id mq,corpid:{},wxEnterpriseId:{}", corpid, wxEnterpriseId);
String externalUserIdLists = jsonObject.getString("externalUserIdList");
List<String> externalUserIdList = JSON.parseArray(externalUserIdLists, String.class);
//查询企微接口,更新新的external_user_id
List<QywxNewExternalUseridDTO> newExternalUseridList = qywxUserApiService.getNewExternalUseridByList(corpid, config.getWxSuiteid(), externalUserIdList);
if (CollectionUtils.isEmpty(newExternalUseridList)) {
log.info("更新新的外部联系人id,查询企业微信接口报错");
wxEnterriseMapper.updateExternalFlagById(3, wxEnterpriseId);
return;
}
List<TabExternalUseridLog> tabExternalUseridLogList = new ArrayList<>();
for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUseridList) {
String new_external_userid = qywxNewExternalUseridDTO.getNew_external_userid();
String external_userid = qywxNewExternalUseridDTO.getExternal_userid();
//好友关系表
tabHaobanExternalClerkRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
//会员关系表
memberUnionidRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
TabExternalUseridLog tabExternalUseridLog = new TabExternalUseridLog();
tabExternalUseridLog.setId(UniqueIdUtils.uniqueLong());
tabExternalUseridLog.setOldExternalUserId(external_userid);
tabExternalUseridLog.setNewExternalUserId(new_external_userid);
tabExternalUseridLog.setWxEnterpriseId(wxEnterpriseId);
tabExternalUseridLog.setCreatorId("admin");
tabExternalUseridLog.setCreatorName("系统管理员");
tabExternalUseridLogList.add(tabExternalUseridLog);
}
externalUseridLogMapper.insertBatch(tabExternalUseridLogList);
//最后一页
if (isLastPage) {
updateAgreeExternalUseridFlag(corpid, wxEnterpriseId);
}
log.info("更新新的外部联系人id mq,end");
} catch (Exception e) {
log.info("更新新的外部联系人id mq报错:{},res:{}", e.getMessage(), res, e);
}
}
@Override
......
......@@ -122,16 +122,6 @@
</foreach>
</update>
<select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where status_flag = 1
and enterprise_id = #{enterpriseId}
<if test="date != null">
and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP})
</if>
</select>
<update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related
......@@ -168,24 +158,6 @@
and self_external_userid = #{selfExternalUserId}
</select>
<update id="updateExternalUserIdByOldExternalUserId">
UPDATE
tab_haoban_member_unionid_related
SET external_userid = #{newExternalUserId},
update_time = now()
where external_userid = #{oldExternalUserId}
and wx_enterprise_id = #{wxEnterpriseId}
</update>
<select id="listByWxEnterpriseId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1
</select>
<select id="listByWxEnterpriseIdAndExternalUserId" resultMap="BaseResultMap">
select
external_userid, self_external_userid from tab_haoban_member_unionid_related
......
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