Merge branch 'feature/xgh/202506基础' into 'master'

Feature/xgh/202506基础

See merge request !2993

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

@@ -604,7 +604,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         }
         List<MemberExternalUserDTO> retList = new ArrayList<>() ;
         String externalUserId = null ;
-        Map<String,String> map = new HashMap<>() ;
+        //Map<String,String> map = new HashMap<>() ;
         for(TabHaobanExternalClerkRelated item : list) {
             MemberExternalUserDTO dto = new MemberExternalUserDTO() ;
             if(null == externalUserId) {
@@ -612,17 +612,23 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             }else if(!externalUserId.equals(item.getExternalUserId())) {
                continue;
             }
-            String staffId = item.getStaffId() ;
+            /*String staffId = item.getStaffId() ;
             String clerkId = item.getClerkId() ;
             if(null != map.get(staffId) && !map.get(staffId).equals(clerkId)) {
                 continue;
             }
-            map.put(staffId,clerkId) ;
+            map.put(staffId,clerkId) ;*/
             dto.setMemberId(memberId);
             dto.setClerkId(item.getClerkId());
             dto.setStoreId(item.getStoreId());
             dto.setExternalStatus(item.getExternalStatus());
             dto.setHalfDelTime(item.getHalfDelTime());
+            if(null == item.getAddTime() && null != item.getAddCreateTime()) {
+                item.setAddTime(Long.valueOf(item.getAddCreateTime()));
+            }
+            if(null == item.getAddTime()) {
+                continue;
+            }
             dto.setAddTime(new Date(item.getAddTime()*1000));
             dto.setStatusFlag(item.getStatusFlag());
             if(dto.getStatusFlag()==2) {

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

@@ -286,7 +286,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public void addMemberQywxFlag(String enterpriseId, String memberId) {
-        List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,"1");
+        List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,null);
         Date date = new Date();
         Date opTime = new Date(0);
         Date firstTime = new Date();