名称

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.dto.ClerkQwDTO;
 import com.gic.clerk.api.service.ClerkService;
@@ -51,6 +52,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.DepartmentService;
+import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.SecretSettingService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.StaffService;
@@ -59,6 +61,7 @@ import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.member.api.dto.MemberDTO;
+import com.gic.member.api.dto.es.MemberDataDTO;
 import com.gic.member.api.service.MemberService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
@@ -123,6 +126,8 @@ public class MessageApiServiceImpl implements MessageApiService {
     private GroupChatService groupChatService;
     @Autowired
     private MemberService memberService;
+    @Autowired
+    private MemberQueryService memberQueryService ;
 
     @Override
     public void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO) {
@@ -613,7 +618,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         } else {
             extendContent.put("currentTab", 1);
         }
-        Map<String, String> map = this.toMapValue(memberId, valueList);
+        Map<String, String> map = this.toMapValue(enterpriseId,memberId, valueList);
         NoticeMessageQDTO qdto = this.getDTO(enterpriseId, clerkId, relationId, noticeType, map, extendContent);
         list.add(qdto);
         ClerkDTO dz = this.clerkService.getClerkLeaderByStoreId(storeId);
@@ -639,16 +644,29 @@ public class MessageApiServiceImpl implements MessageApiService {
         return qdto;
     }
 
-    private Map<String, String> toMapValue(String memberId, List<String> valueList) {
+    private Map<String, String> toMapValue(String enterpriseId ,String memberId, List<String> valueList) {
         Map<String, String> map = new HashMap<>();
         if (CollectionUtils.isNotEmpty(valueList)) {
             for (int i = 0; i < valueList.size(); i++) {
                 map.put("" + (i + 1), valueList.get(i));
             }
         }
-        MemberDTO member = this.memberService.getMember(memberId);
-        String name = member.getThirdNickname();
-        map.put("memberName", name);
+        MemberDataDTO member = this.findMember(enterpriseId,memberId);
+        map.put("memberName", member.getName());
         return map;
     }
+    
+    private MemberDataDTO findMember(String enterpriseId, String memberId) {
+        String returnFields = "memberId,mainStoreId,mainClerkId,openStoreId,openClerkId,name,nickName,phoneNumber,photoUrl,cardNo";
+        JSONObject memberObj = this.memberQueryService.queryDataSingle(enterpriseId, memberId, returnFields);
+        if (null == memberObj) {
+            return new MemberDataDTO();
+        }
+        MemberDataDTO memberDataDTO = memberObj.toJavaObject(MemberDataDTO.class);
+        if (StringUtils.isEmpty(memberDataDTO.getName())) {
+            memberDataDTO.setName(memberDataDTO.getNickName());
+        }
+        return memberDataDTO;
+    }
+
 }