查询会员导购关联列表新增会员外部联系人字段

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

@@ -11,6 +11,10 @@ import java.io.Serializable;
 public class ClerkStaffWxUserDTO implements Serializable {
     private static final long serialVersionUID = -5124016907535027993L;
     /**
+     * 会员对外联系人id
+     */
+    private String memberExternalUserId;
+    /**
      * 导购员工的外部联系人id-wxUserId
      */
     private String staffWxUserId;
@@ -22,11 +26,20 @@ public class ClerkStaffWxUserDTO implements Serializable {
     public ClerkStaffWxUserDTO() {
     }
 
-    public ClerkStaffWxUserDTO(String staffWxUserId, String staffClerkId) {
+    public ClerkStaffWxUserDTO(String staffWxUserId, String staffClerkId, String memberExternalUserId) {
+        this.memberExternalUserId = memberExternalUserId;
         this.staffWxUserId = staffWxUserId;
         this.staffClerkId = staffClerkId;
     }
 
+    public String getMemberExternalUserId() {
+        return memberExternalUserId;
+    }
+
+    public void setMemberExternalUserId(String memberExternalUserId) {
+        this.memberExternalUserId = memberExternalUserId;
+    }
+
     public String getStaffWxUserId() {
         return staffWxUserId;
     }

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

@@ -15,6 +15,10 @@ public class MemberStaffRelExtDO implements Serializable {
      */
     private String memberId;
     /**
+     * 会员对外联系人id
+     */
+    private String memberExternalUserId;
+    /**
      * 导购员工的外部联系人id-wxUserId
      */
     private String staffWxUserId;
@@ -31,6 +35,14 @@ public class MemberStaffRelExtDO implements Serializable {
         this.memberId = memberId;
     }
 
+    public String getMemberExternalUserId() {
+        return memberExternalUserId;
+    }
+
+    public void setMemberExternalUserId(String memberExternalUserId) {
+        this.memberExternalUserId = memberExternalUserId;
+    }
+
     public String getStaffWxUserId() {
         return staffWxUserId;
     }

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

@@ -306,7 +306,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                 // key-memberId
                 MemberStaffRelExtDO::getMemberId,
                 // value-list
-                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffWxUserId(), e.getStaffClerkId()))),
+                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffWxUserId(), e.getStaffClerkId(), e.getMemberExternalUserId()))),
                 // 重复key的value添加到集合
                 (List<ClerkStaffWxUserDTO> oldList, List<ClerkStaffWxUserDTO> newList) -> {
                     oldList.addAll(newList);

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

@@ -390,6 +390,7 @@
 
   <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 staff_id,
@@ -414,6 +415,7 @@
 
     <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.clerk_id as staffClerkId
         from (select a.staff_id,