Merge branch 'feature/xgh/20241月迭代' into 'master'

Feature/xgh/20241月迭代

See merge request !1621

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

+package com.gic.haoban.manage.api;
+
+import java.io.Serializable;
+
+/**
+ * 会员和导购加的好友列表
+ */
+public class ExternalUserClerkDTO implements Serializable {
+
+    private String memberId ;
+    private String clerkId ;
+    private String storeId ;
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.api.service;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.manage.api.ExternalUserClerkDTO;
 import com.gic.haoban.manage.api.dto.*;
 
 import java.util.Date;
@@ -323,4 +324,12 @@ public interface ExternalClerkRelatedApiService {
      */
     com.gic.api.base.commons.ServiceResponse<String> getMemberIdByExternalId(String wxEnterpriseId,String externalUserId);
 
+    /**
+     * 查询会员和那些导购加好友
+     * @param enterpriseId
+     * @param memberId
+     * @return
+     */
+    List<ExternalUserClerkDTO> listExternalClerk(String enterpriseId , String memberId) ;
+
 }

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

 package com.gic.haoban.manage.service.service.impl;
 
 import java.util.Date;
+
+import com.gic.commons.util.ToolUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,8 +35,9 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 		String unionid = dto.getUnionid() ;
 		// unionid不保存,但需要传递
 		dto.setUnionid(null);
-		mapper.insert(EntityUtil.changeEntityByJSON(MemberUnionidRelated.class, dto));
+		// mapper.insert(EntityUtil.changeEntityByJSON(MemberUnionidRelated.class, dto));
 		dto.setUnionid(unionid);
+		dto.setMemberUnionidRelatedId(ToolUtil.randomUUID());
 		return dto.getMemberUnionidRelatedId();
 	}
 

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

@@ -16,6 +16,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.ExternalUserClerkDTO;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.AlertTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
@@ -793,4 +794,22 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     public com.gic.api.base.commons.ServiceResponse<String> getMemberIdByExternalId(String wxEnterpriseId, String externalUserId) {
         return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelatedService.getMemberIdByExternalId(wxEnterpriseId,externalUserId));
     }
+
+    @Override
+    public List<ExternalUserClerkDTO> listExternalClerk(String enterpriseId, String memberId) {
+        log.info("查询会员导购好友={}",memberId);
+        List<TabHaobanExternalClerkRelated> list = this.externalClerkRelatedService.getAddTimeByMemberId(memberId,enterpriseId,"1") ;
+        if(CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        List<ExternalUserClerkDTO> retList = list.stream().filter(o->StringUtils.isNotBlank(o.getClerkId())).map(o->{
+            ExternalUserClerkDTO dto = new ExternalUserClerkDTO();
+            dto.setClerkId(o.getClerkId());
+            dto.setStoreId(o.getStoreId());
+            dto.setMemberId(memberId);
+            return dto ;
+        }).collect(Collectors.toList());
+        log.info("好友={}",JSONObject.toJSONString(retList));
+        return retList;
+    }
 }