自建欢迎语

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

@@ -14,6 +14,16 @@ public class WxEnterpriseQwDTO implements Serializable {
     private String memberCorpid;
     // 第三方
     private String thirdCorpid;
+    
+    private String selfSecret ;
+
+    public String getSelfSecret() {
+        return selfSecret;
+    }
+
+    public void setSelfSecret(String selfSecret) {
+        this.selfSecret = selfSecret;
+    }
 
     // 第三方使用的加密的userid
     public boolean needOpenUserId3th() {

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

@@ -207,8 +207,14 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
             qywxWelcomeMsgDTO.setAttachments(attachments);
         }
         qywxWelcomeMsgDTO.setWelcomeCode(welcomeCode);
-        String result = this.qywxUserApiService.sendWelcomeMsgByExternal(corpid, config.getWxSuiteid(),
-                qywxWelcomeMsgDTO);
+        String result = null ;
+        if(qwDTO.getWxSecurityType()==5) {
+            result = this.qywxUserApiService.sendSelfWelcomeMsgByExternal(corpid, qwDTO.getSelfSecret(),
+                    qywxWelcomeMsgDTO);
+        }else {
+            result = this.qywxUserApiService.sendWelcomeMsgByExternal(corpid, config.getWxSuiteid(),
+                    qywxWelcomeMsgDTO);
+        }
         log.info("发送欢迎语 params:{},返回={}", JSON.toJSONString(qywxWelcomeMsgDTO), result);
         if (StringUtils.isNotBlank(result)) {
             JSONObject json = JSON.parseObject(result);

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

@@ -18,6 +18,8 @@ import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.enums.SecretTypeEnum;
+import com.gic.haoban.manage.service.dao.mapper.SecretSettingMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
@@ -25,6 +27,7 @@ import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.entity.TabSecretSetting;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 
 @Service
@@ -39,6 +42,8 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     private WxApplicationMapper wxApplicationMapper ;
     @Autowired
     private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper ;
+    @Autowired
+    private SecretSettingMapper secretSettingMapper;
 
     @Override
     public String add(WxEnterpriseDTO wxDTO) {
@@ -94,8 +99,11 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
                 qw.setMemberCorpid(wxEnterprise.getWxCorpid());
             }
         }
-        if(null == qw.getDkCorpid() && null == qw.getThirdCorpid()) {
+        if(qw.getWxSecurityType()==5) {
             qw.setDkCorpid(wxEnterprise.getWxCorpid());
+            qw.setThirdCorpid(wxEnterprise.getWxCorpid());
+            TabSecretSetting secret = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
+            qw.setSelfSecret(secret.getSecretVal());
         }
         logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
         return qw;