登录

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

@@ -489,41 +489,54 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				exsitDTO.setClerkId(staffClerkRelationDTO.getClerkId());
 				externalClerkRelatedService.update(exsitDTO);
 			}
-		}
+
+            sendWelcome(dto, staffClerkRelationDTO, false);
+        }
 
     }
 
-    /**
-     * 欢迎语新增好友
-     *
-     * @param dto
-     */
-    private void addFriendByWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO) {
-		String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
-		TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
-		if (null == miniprogramSetting) {
-			log.info("需要配置小程序配置：{}", dto.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
-			return;
-		}
+    private void sendWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO, boolean sendApp) {
+        String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
 
-        TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(dto.getWxEnterpriseId());
 
+        TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId());
+        if (tabWelcome.getOpenFlag() == 0) {
+            log.info("不用发送欢迎语：{},{}", dto.getWxEnterpriseId(), JSONObject.toJSONString(tabWelcome));
+            return;
+        }
         QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();
         qywxWelcomeMsgDTO.setText(tabWelcome == null ? "欢迎您！" : tabWelcome.getWelcomeContent());
         QywxMiniprogramExternalBaseDTO messageBaseDTO = new QywxMiniprogramExternalBaseDTO();
-		messageBaseDTO.setAppid(miniprogramSetting.getAppId());
-		messageBaseDTO.setPicMediaId(miniprogramSetting.getMediaId());
-		messageBaseDTO.setTitle(miniprogramSetting.getTitle());
-		messageBaseDTO.setPage(config.getMemberOpenPage() + relationKey);
-		qywxWelcomeMsgDTO.setAttachments(new ArrayList<>());
+        //发送小吃店哪个系
+        if (sendApp) {
+            TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
+            if (null == miniprogramSetting) {
+                log.info("需要配置小程序配置：{}", staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
+                return;
+            }
+            messageBaseDTO.setAppid(miniprogramSetting.getAppId());
+            messageBaseDTO.setPicMediaId(miniprogramSetting.getMediaId());
+            messageBaseDTO.setTitle(miniprogramSetting.getTitle());
+            messageBaseDTO.setPage(config.getMemberOpenPage() + relationKey);
+        }
+        qywxWelcomeMsgDTO.setAttachments(new ArrayList<>());
         qywxWelcomeMsgDTO.getAttachments().add(messageBaseDTO);
-		qywxWelcomeMsgDTO.setWelcomeCode(dto.getWelcomeCode());
-		if (dto.getSuiteid().equals(SELF_APP)) {
+        qywxWelcomeMsgDTO.setWelcomeCode(dto.getWelcomeCode());
+        if (dto.getSuiteid().equals(SELF_APP)) {
             SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(dto.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
             qywxUserApiService.sendSelfWelcomeMsgByExternal(dto.getCorpid(), secretSetting.getSecretVal(), qywxWelcomeMsgDTO);
         } else {
             qywxUserApiService.sendWelcomeMsgByExternal(dto.getCorpid(), config.getWxSuiteid(), qywxWelcomeMsgDTO);
-		}
+        }
+    }
+
+    /**
+     * 欢迎语新增好友
+     *
+     * @param dto
+     */
+    private void addFriendByWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO) {
+		String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
 		//保存好友关系
 		List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserId(dto.getExternalUserid(), dto.getWxUserId());
 		if (CollectionUtils.isEmpty(externalClerkRelateds)) {
@@ -554,7 +567,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			exsitDTO.setRelationKey(relationKey);
 			externalClerkRelatedService.update(exsitDTO);
 		}
-	}
+        sendWelcome(dto, staffClerkRelationDTO, true);
+    }
 
     @Deprecated
     private String insertMemberUnionIdRelated(MemberUnionidRelatedDTO dto) {