自建

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -256,7 +256,12 @@ public class WxEnterpriseInfoController extends WebBaseController {
 
         wxEnterpriseId = loginStaff.getWxEnterpriseId();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId);
-        String accesstoken = qywxCorpApiService.getCorpAccessToken(qwDTO.getThirdCorpid(), config.getWxSuiteid());
+        String accesstoken = null ;
+        if(qwDTO.isSelf()) {
+            accesstoken = qywxCorpApiService.getCorpAccessToken(qwDTO.getThirdCorpid(), config.getWxSuiteid());
+        }else {
+            accesstoken = qywxCorpApiService.getToken(qwDTO.getThirdCorpid(), qwDTO.getSelfSecret()) ;
+        }
         WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
         wellDoneLoginInfoVo.setAccessToken(accesstoken);
         wellDoneLoginInfoVo.setStaffId(staffId);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -43,7 +43,6 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
-import com.gic.enterprise.api.dto.EnterpriseUsingPermissionDto;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.dto.enterprise.EnterpriseUsingStatusDTO;
@@ -112,8 +111,6 @@ import com.gic.haoban.manage.web.vo.notify.CustomerFriendMemberVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 
 @RestController
 public class WxStaffController extends WebBaseController {
@@ -1435,8 +1432,12 @@ public class WxStaffController extends WebBaseController {
         if (qwDTO.needOpenUserId3th()) {
             wxUserId = staffDTO.getWxOpenUseId();
         }
-        String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), config.getWxSuiteid(),
-                wxUserId);
+        String secret = config.getWxSuiteid();
+        if (qwDTO.isSelf()) {
+            secret = qwDTO.getSelfSecret();
+        }
+        String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), secret,
+                wxUserId,qwDTO.isSelf(),qwDTO.getUrlHost());
         if (StringUtils.isBlank(openid)) {
             int code = HaoBanErrCode.ERR_600003.getCode();
             return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_600003.getMsg());