小程序-好友详情

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

@@ -62,7 +62,7 @@ public interface MemberUnionidRelatedApiService {
      * @param storeId
      * @return
      */
-    List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId, String storeId);
+    List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId);
 
     void cleanByCid(String cid);
 

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

@@ -38,7 +38,7 @@ public interface ExternalClerkRelatedService {
 
 	TabHaobanExternalClerkRelated getByParams(String staffId, String wxEnterpriseId, String name, String createTime);
 
-	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
+	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String staffId);
 
 	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId);
 

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

@@ -173,8 +173,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     }
 
     @Override
-    public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) {
-        return mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 1);
+    public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String staffId) {
+        return mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 1);
     }
 
     @Override

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

@@ -239,14 +239,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     @Override
-    public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId, String storeId) {
-        List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId);
+    public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId) {
+        List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExTernalUseridAndWxUserId(externalUserid, staffId);
         List<MemberStoreDTO> result = new ArrayList<>();
         if (CollectionUtil.isEmpty(list)) {
             return null;
         }
-        String wxEnterpriseId = list.get(0).getWxEnterpriseId();
-        TabHaobanStaff haobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+        TabHaobanStaff haobanStaff = staffService.selectById(staffId) ;
         if (null == haobanStaff) {
             log.info("staff不存在");
             return null;

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

@@ -390,7 +390,7 @@
         and ecr.member_id in
         <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
             #{item}
-        </foreach>;
+        </foreach>
     </select>
 
 
@@ -417,7 +417,7 @@
         and ecr.member_id in
         <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
             #{item}
-        </foreach>;
+        </foreach>
     </select>
 
 

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

@@ -437,11 +437,11 @@ public class WxEnterpriseInfoController extends WebBaseController {
     }
 
     @RequestMapping("get-member-store")
-    public HaobanResponse getMemberStore(String externalUserid, String wxUserId, String storeId) {
-        if (StringUtils.isAnyBlank(externalUserid, wxUserId)) {
+    public HaobanResponse getMemberStore(String externalUserid, String staffId, String storeId) {
+        if (StringUtils.isAnyBlank(externalUserid, staffId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, storeId);
+        List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, staffId, storeId);
         return resultResponse(HaoBanErrCode.ERR_1, result);
     }