好办-客户详情-查询memberid

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

@@ -13,8 +13,18 @@ public class MemberStoreDTO implements Serializable {
 	 */
 	private Integer hasRight;
 	private static final long serialVersionUID = 1L;
+	
+	private String errmsg ;
+	
+	public String getErrmsg() {
+        return errmsg;
+    }
+
+    public void setErrmsg(String errmsg) {
+        this.errmsg = errmsg;
+    }
 
-	public Integer getHasRight() {
+    public Integer getHasRight() {
 		return hasRight;
 	}
 

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

@@ -64,12 +64,12 @@ public class WxEnterpriseQwDTO implements Serializable {
     public void setSelfSecret(String selfSecret) {
         this.selfSecret = selfSecret;
     }
-
+
     // 好办小程序应用id
     private String agentId;
     // 好办小程序名称
     private String agentName;
-
+
 
     // 第三方使用的加密的userid
     public boolean needOpenUserId3th() {

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

@@ -53,11 +53,22 @@ public interface MemberUnionidRelatedApiService {
      * 查看是否可以跳转会员详情的会员列表
      *
      * @param externalUserid
-     * @param wxUserId
      * @param storeId
      * @return
      */
     List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId);
+    
+    /**
+     * 
+    * @Title: getMemberIdForDetail
+    * @Description: 好办打开会员详情-返回memberId
+    * @author xugh
+    * @param externalUserid
+    * @param staffId
+    * @return
+    * @throws
+     */
+    com.gic.api.base.commons.ServiceResponse<MemberStoreDTO> getMemberIdForDetail(String externalUserid, String staffId, String enterpriseId);
 
     /**
      * 创建企业群发, 支出素材批量发送
@@ -76,9 +87,6 @@ public interface MemberUnionidRelatedApiService {
      * 创建企业群发, 支出素材批量发送
      *
      * @param wxEnterpriseId : 微信企业id
-     * @param staffId         : 用户id
-     * @param extendUserList : 发送的用户id
-     * @param materialIdList : 素材id列表
      * @return : 返回群发执行结果
      */
     JSONResponse share(String wxEnterpriseId, List<String> clerkIdList, String message , List<ContentMaterialDTO> imgList);

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

@@ -465,4 +465,4 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
         }
         return null;
     }
-}
+}

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

@@ -264,8 +264,61 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
         addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
     }
+    
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<MemberStoreDTO> getMemberIdForDetail(String externalUserid,
+            String staffId, String enterpriseId) {
+        MemberStoreDTO dto = new MemberStoreDTO();
+        log.info("好办顾客详情={},staffId={}",externalUserid,staffId);
+        List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExternalUseridAndWxUserId(externalUserid, staffId);
+        if (CollectionUtil.isEmpty(list)) {
+            log.info("好友记录查不到");
+            dto.setErrmsg("客户不存在");
+            return com.gic.api.base.commons.ServiceResponse.success(dto) ;
+        }
+        TabHaobanExternalClerkRelated tab = list.get(0) ;
+        String memberId = tab.getMemberId();
+        if (StringUtils.isEmpty(memberId)) {
+            log.info("memberId为空");
+            dto.setErrmsg("客户不存在");
+            return com.gic.api.base.commons.ServiceResponse.success(dto) ;
+        }
+        
+        if(!enterpriseId.equals(tab.getEnterpriseId())) {
+            log.info("客户在当前商户下不存在");
+            dto.setErrmsg("客户在当前商户下不存在");
+            return com.gic.api.base.commons.ServiceResponse.success(dto) ;
+        }
+           
+        CustomerDTO params = new CustomerDTO();
+        params.setClerkType("0");
+        params.setStoreId(tab.getStoreId());
+        params.setClerkId(tab.getClerkId());
+        params.setEnterpriseId(tab.getEnterpriseId());
 
+        MemberInfoListParamsDTO memberInfoListParamsDTO = new MemberInfoListParamsDTO();
+        memberInfoListParamsDTO.setMemberId(memberId);
+        FilterListDTO filterListDTO = new FilterListDTO();
+        filterListDTO.setFilterType("4");
+        ChildDTO childDTO = new ChildDTO();
+        childDTO.setId("");
+        filterListDTO.setChild(childDTO);
+        List<FilterListDTO> filterList = new ArrayList<>();
+        filterList.add(filterListDTO);
+        memberInfoListParamsDTO.setFilterList(filterList);
+        boolean flag = customerApiService.checkMemberRangeByMemberId(params, memberInfoListParamsDTO);
+        dto.setMemberId(tab.getMemberId());
+        dto.setStoreId(tab.getStoreId());
+        if (flag) {
+            dto.setHasRight(1);
+        } else {
+            dto.setHasRight(0);
+        }
+        return com.gic.api.base.commons.ServiceResponse.success(dto) ;
+    }
+    // 全部提审后废弃
     @Override
+    @Deprecated
     public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId) {
         List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExternalUseridAndWxUserId(externalUserid, staffId);
         List<MemberStoreDTO> result = new ArrayList<>();

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

@@ -792,5 +792,5 @@
         and enterprise_id = #{enterpriseId}
         AND status_flag = 1 
     </select>
-
+
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -503,6 +503,19 @@ public class WxEnterpriseInfoController extends WebBaseController {
         List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, staffId, storeId);
         return resultResponse(HaoBanErrCode.ERR_1, result);
     }
+    
+    @RequestMapping("get-externaluser-memberid")
+    public RestResponse<Object> getMemberDetail(String externalUserid, String staffId, String enterpriseId) {
+        logger.info("获取外部联系人memberid={},{}",externalUserid,staffId);
+        if (StringUtils.isAnyBlank(externalUserid, staffId,enterpriseId)) {
+            return RestResponse.failure("9999",HaoBanErrCode.ERR_2.getMsg());
+        }
+        ServiceResponse<MemberStoreDTO> resp = memberUnionidRelatedApiService.getMemberIdForDetail(externalUserid, staffId, enterpriseId);
+        if(resp.isSuccess()) {
+            return RestResponse.successResult(resp.getResult());
+        }
+        return RestResponse.failure("9999",resp.getMessage());
+    }
 
     /**
      * 是否能打开客户详情权限