Merge branch 'feature/xgh/bug/0415' into 'master'

Feature/xgh/bug/0415

See merge request !1750

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

 package com.gic.haoban.manage.api.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 public class ExternalClerkRelatedShortInfoDTO implements Serializable {
     private String externalUserId;
@@ -10,6 +11,16 @@ public class ExternalClerkRelatedShortInfoDTO implements Serializable {
     private String wxEnterpriseId;
     private String storeId;
     private String clerkId;
+    private Date addTime ;
+
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
 
     private static final long serialVersionUID = 1L;
 

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

@@ -604,7 +604,17 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     @Override
     public List<ExternalClerkRelatedShortInfoDTO> listByMemberIdAndEnterpriseId(String memberId, String enterpriseId) {
         List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, enterpriseId);
-        return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
+        List<ExternalClerkRelatedShortInfoDTO> retList = new ArrayList<>() ;
+        if(CollectionUtils.isNotEmpty(list)) {
+            for (TabHaobanExternalClerkRelated item : list) {
+                ExternalClerkRelatedShortInfoDTO dto = EntityUtil.changeEntityByJSON(ExternalClerkRelatedShortInfoDTO.class,item) ;
+                if(null != item.getAddTime()) {
+                    dto.setAddTime(new Date(item.getAddTime()*1000));
+                    retList.add(dto) ;
+                }
+            }
+        }
+        return retList ;
     }
 
     @Override

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

@@ -501,6 +501,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             List<StoreDTO> dtoList = this.storeService.getStores(storeIds);
             Map<String, StoreDTO> map = dtoList.stream()
                     .collect(Collectors.toMap(StoreDTO::getStoreId, dto -> dto, (k1, k2) -> k1));
+            storeList = storeList.stream().filter(o->null != map.get(o.getStoreId())  && map.get(o.getStoreId()).getStatus()==2)
+                            .collect(Collectors.toList());
             storeList.forEach(item -> {
                 if (null != map.get(item.getStoreId())) {
                     item.setStoreAddress(map.get(item.getStoreId()).getStoreAddress());