Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -82,6 +82,9 @@ public class HmQrcodeDTO implements Serializable {
     private String clerkName;
     
     private String clerkCode;
+    private String staffId;
+    private String staffName;
+
     /**
      * 多人活码人数
      */
@@ -92,6 +95,7 @@ public class HmQrcodeDTO implements Serializable {
     private Long hmGroupId;
 
     private String memberLabelName;
+    private Integer memberLabelStatus;
     private String hmGroupName;
 
     private List<HmClerkDTO> clerkList;
@@ -361,5 +365,29 @@ public class HmQrcodeDTO implements Serializable {
     public void setStoreList(List<HmStoreDTO> storeList) {
         this.storeList = storeList;
     }
+
+    public Integer getMemberLabelStatus() {
+        return memberLabelStatus;
+    }
+
+    public void setMemberLabelStatus(Integer memberLabelStatus) {
+        this.memberLabelStatus = memberLabelStatus;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmQrcodeBO.java

@@ -96,6 +96,7 @@ public class HmQrcodeBO implements Serializable {
     private String staffId;
     private String staffName;
     private String memberLabelName;
+    private Integer memberLabelStatus;
     private String hmGroupName;
 
     private List<HmClerkDTO> clerkList;
@@ -381,5 +382,13 @@ public class HmQrcodeBO implements Serializable {
     public void setStoreList(List<HmStoreDTO> storeList) {
         this.storeList = storeList;
     }
+
+    public Integer getMemberLabelStatus() {
+        return memberLabelStatus;
+    }
+
+    public void setMemberLabelStatus(Integer memberLabelStatus) {
+        this.memberLabelStatus = memberLabelStatus;
+    }
 }
 

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

 package com.gic.haoban.manage.service.service.hm;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
 
@@ -123,6 +125,18 @@ public interface HmClerkRelationService {
 
 
     /**
+     * 获取导购分页
+     *
+     * @param basePageInfo 基本信息页
+     * @param hmId         hm id
+     * @return {@link List }<{@link HmClerkRelationBO }>
+     * @author mozhu
+     * @date 2022-07-20 15:04:40
+     */
+    Page<HmClerkRelationBO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId);
+
+
+    /**
      * 获取导购
      *
      * @param hmId    hm id

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

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmClerkRelation;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
 import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -91,6 +96,13 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
     }
 
     @Override
+    public Page<HmClerkRelationBO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId) {
+        PageHelper.startPage(basePageInfo.getPageNum(),basePageInfo.getPageSize());
+        List<TabHaobanHmClerkRelation> hmClerkByHmId = tabHaobanHmClerkRelationMapper.getHmClerkByHmId(hmId);
+        return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(hmClerkByHmId), HmClerkRelationBO.class);
+    }
+
+    @Override
     public HmClerkRelationBO getHmClerkByHmIdAndStaffId(Long hmId, String staffId) {
         return EntityUtil.changeEntityByOrika(HmClerkRelationBO.class,tabHaobanHmClerkRelationMapper.getHmClerkByHmIdAndStaffId(hmId,staffId));
     }

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

@@ -50,8 +50,6 @@ import com.gic.wechat.api.dto.qywx.response.QywxResponseDTO;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactResultDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -474,6 +472,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             MemberTagDTO memberTagDTO = memberTagApiService.getMemberTagById(hmQrcodeBO.getMemberLabelId());
             if (memberTagDTO != null) {
                 hmQrcodeBO.setMemberLabelName(memberTagDTO.getTagName());
+                hmQrcodeBO.setMemberLabelStatus(memberTagDTO.getStatus());
             }
             Integer hmType = hmQrcodeBO.getHmType();
             List<HmClerkDTO> clerkDTOList = new ArrayList<>();
@@ -718,9 +717,8 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
 
     @Override
     public Page<HmClerkRelationDTO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId) {
-        PageHelper.startPage(basePageInfo);
-        List<HmClerkRelationBO> hmClerkByHmId = hmClerkRelationService.getHmClerkByHmId(hmId);
-        return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(hmClerkByHmId), HmClerkRelationDTO.class);
+        Page<HmClerkRelationBO> hmClerkByHmId = hmClerkRelationService.getHmClerkByHmId(basePageInfo, hmId);
+        return PageUtil.changeToCurrentPage(hmClerkByHmId,HmClerkRelationDTO.class);
     }
 
     /**