删除wx_user_id

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ClerkStaffWxUserDTO.java

@@ -17,7 +17,7 @@ public class ClerkStaffWxUserDTO implements Serializable {
     /**
      * 导购员工的外部联系人id-wxUserId
      */
-    private String staffWxUserId;
+    private String staffId;
     /**
      * 员工导购id
      */
@@ -26,9 +26,9 @@ public class ClerkStaffWxUserDTO implements Serializable {
     public ClerkStaffWxUserDTO() {
     }
 
-    public ClerkStaffWxUserDTO(String staffWxUserId, String staffClerkId, String memberExternalUserId) {
+    public ClerkStaffWxUserDTO(String staffId, String staffClerkId, String memberExternalUserId) {
         this.memberExternalUserId = memberExternalUserId;
-        this.staffWxUserId = staffWxUserId;
+        this.staffId = staffId;
         this.staffClerkId = staffClerkId;
     }
 
@@ -40,12 +40,12 @@ public class ClerkStaffWxUserDTO implements Serializable {
         this.memberExternalUserId = memberExternalUserId;
     }
 
-    public String getStaffWxUserId() {
-        return staffWxUserId;
+    public String getStaffId() {
+        return staffId;
     }
 
-    public void setStaffWxUserId(String staffWxUserId) {
-        this.staffWxUserId = staffWxUserId;
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
     }
 
     public String getStaffClerkId() {

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -77,7 +77,7 @@ public interface MemberUnionidRelatedApiService {
      * @author mozhu
      * @date 2022-01-13 10:50:44
      */
-    String sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, String materialId);
+    String sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, String materialId);
 
     /**
      * 创建企业群发, 支出素材批量发送
@@ -88,7 +88,7 @@ public interface MemberUnionidRelatedApiService {
      * @param materialIdList : 素材id列表
      * @return : 返回群发执行结果
      */
-    JSONResponse sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, List<String> materialIdList);
+    JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, List<String> materialIdList);
 
     /**
      * 获取群发成员发送任务列表

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -141,28 +141,7 @@ public interface TabHaobanStaffClerkRelationMapper {
     List<String> listRelationsStaffId(@Param("staffIdList") Set<String> staffIdList);
 
     /**
-     * 批量查询会员与导购关系并且返回关联信息
-     *
-     * @param memberIdList 会员id列表
-     * @param clerkIdList  导购id列表
-     * @param enterpriseId 企业id
-     * @return {@link MemberStaffRelExtDO}
-     */
-    List<MemberStaffRelExtDO> listMemberStaffRel(
-            @Param("memberIdList") List<String> memberIdList,
-            @Param("clerkIdList") List<String> clerkIdList,
-            @Param("enterpriseId") String enterpriseId);
-
-
-    /**
      * 批量查询会员与导购关系并且返回关联信息（新企业）
-     *
-     * @param memberIdList 会员id列表
-     * @param clerkIdList  职员id列表
-     * @param enterpriseId 企业标识
-     * @return {@link List<MemberStaffRelExtDO> }
-     * @author mozhu
-     * @date 2021-12-23 15:45:48
      */
     List<MemberStaffRelExtDO> listMemberStaffRelNew(
             @Param("memberIdList") List<String> memberIdList,

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/ext/MemberStaffRelExtDO.java

@@ -18,10 +18,7 @@ public class MemberStaffRelExtDO implements Serializable {
      * 会员对外联系人id
      */
     private String memberExternalUserId;
-    /**
-     * 导购员工的外部联系人id-wxUserId
-     */
-    private String staffWxUserId;
+    private String staffId;
     /**
      * 员工导购id
      */
@@ -42,13 +39,13 @@ public class MemberStaffRelExtDO implements Serializable {
     public void setMemberExternalUserId(String memberExternalUserId) {
         this.memberExternalUserId = memberExternalUserId;
     }
-
-    public String getStaffWxUserId() {
-        return staffWxUserId;
+    
+    public String getStaffId() {
+        return staffId;
     }
 
-    public void setStaffWxUserId(String staffWxUserId) {
-        this.staffWxUserId = staffWxUserId;
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
     }
 
     public String getStaffClerkId() {
@@ -61,10 +58,7 @@ public class MemberStaffRelExtDO implements Serializable {
 
     @Override
     public String toString() {
-        return "MemberStaffRelExtDO{" +
-                "memberId='" + memberId + '\'' +
-                ", staffWxUserId='" + staffWxUserId + '\'' +
-                ", staffClerkId='" + staffClerkId + '\'' +
-                '}';
+        return "MemberStaffRelExtDO{" + "memberId='" + memberId + '\'' + ", staffId='" + staffId + '\''
+                + ", staffClerkId='" + staffClerkId + '\'' + '}';
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -368,12 +368,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         if (qwDTO == null) {
             return Collections.emptyMap();
         }
-        List<MemberStaffRelExtDO> res = new ArrayList<>();
-        if (qwDTO.needOpenUserId3th()) {
-            res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId);
-        } else {
-            res = staffClerkRelationMapper.listMemberStaffRel(memberIdList, clerkIdList, enterpriseId);
-        }
+        List<MemberStaffRelExtDO> res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId);
         if (CollectionUtils.isEmpty(res)) {
             return Collections.emptyMap();
         }
@@ -381,7 +376,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                 // key-memberId
                 MemberStaffRelExtDO::getMemberId,
                 // value-list
-                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffWxUserId(), e.getStaffClerkId(), e.getMemberExternalUserId()))),
+                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffId(), e.getStaffClerkId(), e.getMemberExternalUserId()))),
                 // 重复key的value添加到集合
                 (List<ClerkStaffWxUserDTO> oldList, List<ClerkStaffWxUserDTO> newList) -> {
                     oldList.addAll(newList);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -1121,8 +1121,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @return : 返回群发执行结果
      */
     @Override
-    public String sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, String materialId) {
-        JSONResponse jp = this.sendMessage(wxEnterpriseId, userId, extendUserList, Collections.singletonList(materialId));
+    public String sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, String materialId) {
+        JSONResponse jp = this.sendMessage(wxEnterpriseId, staffId, extendUserList, Collections.singletonList(materialId));
         //返回执行结果, msgId
         log.info("【发送消息】jp = {}", JSON.toJSONString(jp));
         Map<String, Object> returnMap = jp.getReturnMap();
@@ -1139,7 +1139,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @return : 返回群发执行结果
      */
     @Override
-    public JSONResponse sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, List<String> materialIdList) {
+    public JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, List<String> materialIdList) {
         //群发请求参数
         QywxExternalMessageDTO qywxExternalMessageDTO = new QywxExternalMessageDTO();
         //素材列表
@@ -1166,17 +1166,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //请求参数赋值
         qywxExternalMessageDTO.setChatType("single");
         qywxExternalMessageDTO.setExternalUserid(extendUserList);
+        TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
         if (qwDTO.needOpenUserId3th()) {
-            TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
-            if (tabHaobanStaff == null) {
-                JSONResponse jp = new JSONResponse();
-                jp.setErrorCode(-1);
-                jp.setErrorMessage("员工未查询到，群发创建失败,userId:" + userId);
-                return jp;
-            }
             qywxExternalMessageDTO.setSenderUserId(tabHaobanStaff.getWxOpenUseId());
         } else {
-            qywxExternalMessageDTO.setSenderUserId(userId);
+            qywxExternalMessageDTO.setSenderUserId(tabHaobanStaff.getWxUserId());
         }
         qywxExternalMessageDTO.setAttachments(messageMaterialList);
         //调接口执行创建群发

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -368,40 +368,12 @@
         and status_flag = 1 group by staff_id;
     </select>
 
-    <select id="listMemberStaffRel" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
-        select ecr.member_id as memberId,
-        ecr.external_user_id as memberExternalUserId,
-        scr.wx_user_id as staffWxUserId,
-        scr.clerk_id as staffClerkId
-        from (select a.staff_id,
-        b.wx_user_id,
-        a.clerk_id
-        from tab_haoban_staff_clerk_relation a
-        left join tab_haoban_staff b on a.staff_id = b.staff_id
-        where a.clerk_id in
-        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        and a.status_flag = 1
-        group by a.staff_id, b.wx_user_id, a.clerk_id) as scr
-        left join tab_haoban_external_clerk_related as ecr on scr.staff_id = ecr.staff_id
-        where ecr.status_flag = 1
-        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
-        and ecr.member_id in
-        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-    </select>
-
-
     <select id="listMemberStaffRelNew" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
         select ecr.member_id as memberId,
         ecr.external_user_id as memberExternalUserId,
-        scr.wx_open_user_id as staffWxUserId,
+        scr.staff_id as staffId,
         scr.clerk_id as staffClerkId
         from (select a.staff_id,
-        b.wx_open_user_id,
-        b.wx_user_id,
         a.clerk_id
         from tab_haoban_staff_clerk_relation a
         left join tab_haoban_staff b on a.staff_id = b.staff_id