欢迎语

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

@@ -54,10 +54,6 @@ public interface StaffDepartmentRelatedApiService {
 
 	List<StaffDepartmentRelatedDTO> listByStaffIds(List<String> staffIds);
 
-	void sendClerkBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason);
-
-	void sendStaffBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason);
-
 	void sendClerkAdd(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason);
 
 	void sendClerkDel(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/ExternalMemberLogMapper.java

@@ -20,7 +20,7 @@ public interface ExternalMemberLogMapper {
     public int updateStatus(@Param("enterpriseId") String enterpriseId, @Param("unionid") String unionid,
             @Param("statusFlag") int statusFlag);
 
-    public TabExternalMemberLog selectUnionid(@Param("enterpriseId") String enterpriseId,
-            @Param("unionid") String unionid);
+    public TabExternalMemberLog selectRelationKey(@Param("enterpriseId") String enterpriseId,
+            @Param("relationKey") String relationKey);
 
 }
\ No newline at end of file

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

@@ -7,6 +7,6 @@ public interface ExternalMemberService {
 
     public int insert(ExternalMemberLogDTO log);
 
-    public TabExternalMemberLog selectUnionid(String enterpriseId, String unioinid);
+    public TabExternalMemberLog selectRelationKey(String enterpriseId, String relationKey);
 
 }

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

@@ -25,8 +25,9 @@ public class ExternalMemberServiceImpl implements ExternalMemberService {
     }
 
     @Override
-    public TabExternalMemberLog selectUnionid(String enterpriseId, String unioinid) {
-        return null;
+    public TabExternalMemberLog selectRelationKey(String enterpriseId, String relationKey) {
+        TabExternalMemberLog log = this.externalMemberLogMapper.selectRelationKey(enterpriseId, relationKey) ;
+        return log;
     }
 
 }

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

@@ -65,6 +65,7 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper;
+import com.gic.haoban.manage.service.entity.TabExternalMemberLog;
 import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
@@ -360,8 +361,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(this.mqCheck(dto)) {
             mqName = "dealQywxExternalUserMq2";
         }
+        Object t = RedisUtil.getCache("dealQywxExternalUserMqWelcome-test");
+        int delay = 0 ;
+        if(null != t) {
+            delay = (int) t ;
+        }
         try {
-            instance.sendMessage(mqName, JSONObject.toJSONString(dealQywxExternalUserPojo),180);
+            instance.sendMessage(mqName, JSONObject.toJSONString(dealQywxExternalUserPojo),delay);
         } catch (Exception e) {
             log.info("异步处理异常：{}", e);
         }
@@ -558,7 +564,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(addByWelcome) {
             unionid = null ;
             dto.setUnionid(unionid);
-            this.addFriendByWelcome(dto, staffClerkRelationDTO,qwDTO);
+            // 查询
+            String relationKey = SecureUtil.md5(staffId + dto.getExternalUserid());
+            TabExternalMemberLog externalMemberLog = this.externalMemberService.selectRelationKey(enterpriseId, relationKey) ;
+            if(null != externalMemberLog && StringUtils.isNotEmpty(externalMemberLog.getUnionid())) {
+                log.info("通过欢迎语,但查询到unionid,relationkey={}",relationKey) ;
+                unionid = externalMemberLog.getUnionid() ;
+                dto.setUnionid(unionid);
+                memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated, mobile,qwDTO);
+            }else {
+                this.addFriendByWelcome(dto, staffClerkRelationDTO,qwDTO);
+            }
         }else {
             dto.setUnionid(unionid);
             memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated, mobile,qwDTO);

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

@@ -154,84 +154,6 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         return map;
     }
 
-    //导购绑定，，审核记录，，消息发送
-    @Override
-    public void sendStaffBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason) {
-        StaffDTO staffDTO = staffApiService.selectById(staffId);
-        if (staffDTO == null) {
-            logger.info("staff不存在，发送消息失败{}", staffId);
-            return;
-        }
-        String messageTitle = "账号申请";
-        String content = staffDTO.getStaffName() + "关联导购code（" + clerkCode + "）";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("storeId", storeId);
-        String data = jsonObject.toJSONString();
-        String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
-        String name = staffDTO.getStaffName();
-        if (content.length() > 30) {
-            content = content.substring(0, 26);
-            content = content + "...";
-        }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(staffDTO.getWxEnterpriseId());
-        String wxUserId = "";
-        if (qwDTO.needOpenUserId3th()) {
-            wxUserId = staffDTO.getWxOpenUseId();
-        } else {
-            wxUserId = staffDTO.getWxUserId();
-        }
-        //先发送下，试试
-        QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-        List<ItemDTO> items = new ArrayList<>();
-        ItemDTO dto1 = new ItemDTO();
-        ItemDTO dto2 = new ItemDTO();
-        ItemDTO dto3 = new ItemDTO();
-        ItemDTO dto4 = new ItemDTO();
-
-        dto1.setKey("接收人");
-        dto1.setValue(name);
-        dto2.setKey("接收事件");
-        dto2.setValue(content);
-        dto3.setKey("结果");
-        dto3.setValue(auditStatus == 1 ? "已同意" : "已拒绝");
-        items.add(dto1);
-        items.add(dto2);
-        items.add(dto3);
-        if (StringUtils.isNotEmpty(auditReason)) {
-            dto4.setKey("理由");
-            dto4.setValue(auditReason);
-            items.add(dto4);
-        }
-        ArrayList<String> list = new ArrayList<>();
-        list.add(wxUserId);
-        messageDTO.setAppid(config.getAppid());
-        messageDTO.setUserIds(list);
-        messageDTO.setPage(pageUrl);
-        messageDTO.setTitle(messageTitle);
-        messageDTO.setItems(items);
-        logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},", qwDTO.getThirdCorpid(), config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-        boolean b = qywxSuiteApiService.sendMessage(qwDTO.getThirdCorpid(), config.getWxSuiteid(), messageDTO);
-        logger.info("发送===============》{}", b);
-    }
-
-    //导购绑定，，审核记录，，消息发送
-    @Override
-    public void sendClerkBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason) {
-        StaffDTO staffDTO = staffApiService.selectById(staffId);
-        if (staffDTO == null) {
-            logger.info("staff不存在，发送消息失败{}", staffId);
-            return;
-        }
-        String messageTitle = "账号申请";
-        String messageContent = staffDTO.getStaffName() + "申请关联导购code（" + clerkCode + "）";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("storeId", storeId);
-        String data = jsonObject.toJSONString();
-        String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
-        this.sendAuditMessage(staffId, messageTitle, messageContent, pageUrl, auditStatus, auditReason);
-    }
-
-
     //导购新增，，审核记录，，消息发送
     @Override
     public void sendClerkAdd(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason) {

haoban-manage3-service/src/main/resources/mapper/ExternalMemberLogMapper.xml

@@ -59,9 +59,9 @@
   </update>
   
   <!-- ============ 查询=============-->
-  <select id="selectUnionid"  resultMap="result-map-tabHaobanExternalMemberLog">
+  <select id="selectRelationKey"  resultMap="result-map-tabHaobanExternalMemberLog">
  	 SELECT <include refid="result-map-tabHaobanExternalMemberLog" /> FROM tab_haoban_external_member_log 
- 	  where enterprise_id = #{enterpriseId} and unionid=#{unionid}
+ 	  where enterprise_id = #{enterpriseId} and relation_key=#{relationKey}
   </select>
   
 </mapper> 
\ No newline at end of file