From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能

---
 service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java
index e411197..593328c 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java
@@ -14,6 +14,7 @@
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
@@ -59,6 +60,11 @@
             reqJson.put("userId", headers.get("userid"));
         }
 
+        //鏍规嵁 openId 鏌ヨ鐨�
+        if(reqJson.containsKey("openId") && !StringUtil.isEmpty(reqJson.getString("openId"))){
+            reqJson.put("userId", "");
+        }
+
         OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
 
 
@@ -97,12 +103,16 @@
                     ownerAppUserDto.setAreaName(tmpCommunityDto.getAreaName());
                     ownerAppUserDto.setParentAreaCode(tmpCommunityDto.getParentAreaCode());
                     ownerAppUserDto.setParentAreaName(tmpCommunityDto.getParentAreaName());
+                    ownerAppUserDto.setCommunityQrCode(tmpCommunityDto.getQrCode());
                 }
             }
         }
 
         List<String> ownerIds = new ArrayList<>();
         for(OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos){
+            if(StringUtil.isEmpty(ownerAppUserDto.getMemberId()) || "-1".equals(ownerAppUserDto.getMemberId())){
+                continue;
+            }
             ownerIds.add(ownerAppUserDto.getMemberId());
         }
 
@@ -118,13 +128,13 @@
         if(fileRelDtos == null || fileRelDtos.size() < 1){
             return ;
         }
-        String imgUrl = MappingCache.getValue("IMG_PATH");
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
         for(OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos){
             for(FileRelDto tmpFileRelDto : fileRelDtos){
                 if(!ownerAppUserDto.getMemberId().equals(tmpFileRelDto.getObjId())){
                     continue;
                 }
-                ownerAppUserDto.setHeadImgUrl(imgUrl +tmpFileRelDto.getFileRealName() );
+                ownerAppUserDto.setHeadImgUrl(imgUrl +tmpFileRelDto.getFileSaveName() );
             }
         }
     }

--
Gitblit v1.8.0