企微托管

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenController.java

@@ -164,7 +164,8 @@ public class QywxOpenController {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         String enterpriseId = login.getEnterpriseId();
-        String checkMsg = this.check(wxEnterpriseId, enterpriseId);
+        ServiceResponse<OpenStaffDTO> staffResp = this.openStaffApiService.getByStaffId(staffId) ;
+        String checkMsg = this.check(wxEnterpriseId, enterpriseId , null != staffResp.getResult());
         if (null != checkMsg) {
             return RestResponse.failure("9999", checkMsg);
         }
@@ -288,7 +289,7 @@ public class QywxOpenController {
         return RestResponse.successResult();
     }
 
-    private String check(String wxEnterpriseId, String enterpriseId) {
+    private String check(String wxEnterpriseId, String enterpriseId , boolean useFlag) {
         OpenQwAccountInfoVO vo = this.getCheckInfo(wxEnterpriseId, enterpriseId);
         if (vo.getStatus() == 0) {
             return "请联系商务经理购买服务后再进行账号托管";
@@ -296,8 +297,10 @@ public class QywxOpenController {
         if (vo.getStatus() == 2) {
             return "当前企微服务已过期";
         }
-        if (vo.getGicTotal() <= vo.getUseNum()) {
-            return "托管账号数量已达上线";
+        if(!useFlag) {
+            if (vo.getGicTotal() <= vo.getUseNum()) {
+                return "托管账号数量已达上线";
+            }
         }
         return null;
     }