企微托管

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

@@ -164,6 +164,10 @@ public class QywxOpenController {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         String enterpriseId = login.getEnterpriseId();
+        String checkMsg = this.check(wxEnterpriseId, enterpriseId);
+        if (null != checkMsg) {
+            return RestResponse.failure("9999", checkMsg);
+        }
         if (StringUtils.isBlank(staffId)) {
             return RestResponse.failure("9999", "请先选择成员");
         }
@@ -179,10 +183,6 @@ public class QywxOpenController {
         if (CollectionUtils.isEmpty(relationList)) {
             return RestResponse.failure("9999", "成员需关联gic商户下导购");
         }
-        String checkMsg = this.check(wxEnterpriseId, enterpriseId);
-        if (null != this.check(wxEnterpriseId, enterpriseId)) {
-            return RestResponse.failure("9999", checkMsg);
-        }
         OpenStaffInitQDTO initQDTO = new OpenStaffInitQDTO();
         initQDTO.setWxEnterpriseId(wxEnterpriseId);
         initQDTO.setEnterpriseId(enterpriseId);
@@ -296,8 +296,14 @@ public class QywxOpenController {
 
     private String check(String wxEnterpriseId, String enterpriseId) {
         OpenQwAccountInfoVO vo = this.getCheckInfo(wxEnterpriseId,enterpriseId) ;
-        if(vo.getStatus() == 1) {
-            return null ;
+        if(vo.getStatus()==0) {
+            return "请联系商务经理购买服务后再进行账号托管" ;
+        }
+        if(vo.getStatus()==2) {
+            return "当前企微服务已过期" ;
+        }
+        if(vo.getGicTotal() <= vo.getUseNum()) {
+            return "托管账号数量已达上线" ;
         }
         return null ;
     }

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

@@ -290,6 +290,9 @@ public class QywxOpenTaskController {
         AddTaskMemberPageQDTO qdto = EntityUtil.changeEntityByJSON(AddTaskMemberPageQDTO.class, qo);
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        if (null != qdto.getEndDate()) {
+            qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
+        }
         BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(1);
         basePageInfo.setPageSize(1);