Merge remote-tracking branch 'origin/developer' into developer

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

 package com.gic.haoban.manage.api.dto.welcome.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import java.io.Serializable;
 
 /**
@@ -13,6 +16,7 @@ public class FriendSettingDetailDTO implements Serializable {
     /**
      * 加好友配置id
      */
+    @JsonSerialize(using= ToStringSerializer.class)
     private Long friendSettingId;
     /**
      * 微信企业id

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java

@@ -7,28 +7,32 @@ import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
  * Created by tgs on 2020/2/20.
  */
 public interface MessageApiService {
-	/**
-	 * 接收企业微信的推送消息
-	 *
-	 * @param gicMessageDTO
-	 */
-	@Deprecated
-	void gicMessageReceive(GicMessageDTO gicMessageDTO);
-
-	/**
-	 * 接收企业微信的推送消息
-	 *
-	 * @param qywxCallBackDTO
-	 */
-	void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
-
-	/**
-	 * 队列消费企业微信推送数据
-	 * @param param
+    /**
+     * 接收企业微信的推送消息
+     *
+     * @param gicMessageDTO
+     */
+    @Deprecated
+    void gicMessageReceive(GicMessageDTO gicMessageDTO);
+
+    /**
+     * 接收企业微信的推送消息
+     *
+     * @param qywxCallBackDTO
+     */
+    @Deprecated
+    void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
+
+    /**
+     * 队列消费企业微信推送数据
+     *
+     * @param param
      */
     void dealWxMessage(String param);
+
     /**
      * 发送消费消息
+     *
      * @param clerkId
      * @param memberId
      * @param memberName
@@ -36,28 +40,38 @@ public interface MessageApiService {
      * @param storeId
      * @return
      */
-	Boolean sendFaceMessage(String clerkId, String memberId, String memberName, String arrivalTime, String storeId);
-
-	/**
-	 * 发送完善标签信息
-	 *
-	 * @param clerkId
-	 * @param clerkId
-	 * @param memberName
-	 * @param customerTime
-	 * @param orderId
-	 * @param storeId
-	 */
-	Boolean sendPerfectRemarkMessage(String clerkId, String memberId, String memberName, String customerTime, String orderId, String storeId);
-
-
-	/**
-	 * 通用发送企业微信消息
-	 *
-	 * @param param 参数
-	 * @author xuwenqian
-	 * @date 2021-07-16 10:09:00
-	 */
-	void sendWxMessage(String param);
+    Boolean sendFaceMessage(String clerkId, String memberId, String memberName, String arrivalTime, String storeId);
+
+    /**
+     * 发送完善标签信息
+     *
+     * @param clerkId
+     * @param clerkId
+     * @param memberName
+     * @param customerTime
+     * @param orderId
+     * @param storeId
+     */
+    Boolean sendPerfectRemarkMessage(String clerkId, String memberId, String memberName, String customerTime, String orderId, String storeId);
+
+
+    /**
+     * 通用发送企业微信消息
+     *
+     * @param param 参数
+     * @author xuwenqian
+     * @date 2021-07-16 10:09:00
+     */
+    void sendWxMessage(String param);
+
+    /**
+     * 获取新的微信用户id
+     *
+     * @param wxEnterpriseId 微信企业id
+     * @param wxUserId       微信用户id
+     * @author xuwenqian
+     * @date 2021-07-16 10:09:00
+     */
+    String getNewWxUserId(String wxEnterpriseId, String wxUserId);
 
 }

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

@@ -645,4 +645,21 @@ public class MessageApiServiceImpl implements MessageApiService {
         messageDTO.setItems(items);
         qywxSuiteApiService.sendMessage(wxEnterprise.getCorpid(), config.getWxSuiteid(), messageDTO);
     }
+
+    @Override
+    public String getNewWxUserId(String wxEnterpriseId, String wxUserId) {
+        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        String corpid = wxEnterpriseDTO.getCorpid();
+
+        TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+
+        if (corpid.length() > 20) {
+            wxUserId = tabHaobanStaff.getWxOpenUseId();
+        } else {
+            wxUserId = tabHaobanStaff.getWxUserId();
+        }
+        return wxUserId;
+    }
+
+
 }

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

@@ -8,9 +8,11 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
 import com.gic.haoban.manage.service.pojo.bo.welcome.*;
 import com.gic.haoban.manage.service.service.WelcomeService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,9 +69,16 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
             dto.setOperatorId(one.getOperatorId());
             dto.setOperatorName(one.getOperatorName());
             // 媒体列表
-            dto.setWelcomeMediaList(EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, one.getWelcomeMediaList()));
+            dto.setWelcomeMediaList(
+                    CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList()
+                            : EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, one.getWelcomeMediaList())
+            );
             // 适用部门列表
-            dto.setSuitDepartmentList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, one.getSuitDepartmentList()));
+
+            dto.setSuitDepartmentList(
+                    CollectionUtils.isEmpty(one.getSuitDepartmentList()) ? Collections.emptyList()
+                            : EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, one.getSuitDepartmentList())
+            );
             // 员工暂时不做
             return dto;
         }).collect(Collectors.toList());
@@ -87,9 +96,16 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         dto.setWelcomeContent(welcome.getWelcomeContent());
         dto.setOpenFlag(welcome.getOpenFlag());
         // 媒体列表
-        dto.setWelcomeMediaList(EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, welcome.getWelcomeMediaList()));
+        dto.setWelcomeMediaList(
+                CollectionUtils.isEmpty(welcome.getWelcomeMediaList()) ? Collections.emptyList()
+                        : EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, welcome.getWelcomeMediaList())
+        );
         // 适用部门列表
-        dto.setSuitDepartmentList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, welcome.getSuitDepartmentList()));
+
+        dto.setSuitDepartmentList(
+                CollectionUtils.isEmpty(welcome.getSuitDepartmentList()) ? Collections.emptyList()
+                        : EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, welcome.getSuitDepartmentList())
+        );
         // 员工暂时不做
         return ServiceResponse.success(dto);
     }