Merge branch 'master-xgh-好办停用' into 'developer'

Master xgh 好办停用

See merge request !214

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

@@ -3,24 +3,28 @@ package com.gic.haoban.manage.api.dto;
 import java.io.Serializable;
 
 public class CommonMQDTO implements Serializable {
-    
+
     /**
     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
     */
     private static final long serialVersionUID = -5681421708810402425L;
-    
-    private int type ;
-    private String params ;
+
+    private int type;
+    private Object params;
+
     public int getType() {
         return type;
     }
-    public String getParams() {
-        return params;
-    }
+
     public void setType(int type) {
         this.type = type;
     }
-    public void setParams(String params) {
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
         this.params = params;
     }
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java

@@ -11,7 +11,9 @@ import com.gic.haoban.manage.api.dto.CommonMQDTO;
 *
  */
 public interface HaobanCommonMQApiService {
-    
-    public void commonHandler(CommonMQDTO dto) ;
-    
+
+    public void putCommonMessage(CommonMQDTO dto);
+
+    public void commonHandler(String message);
+
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -78,7 +78,7 @@ public interface MemberUnionidRelatedApiService {
      * @date 2022-01-13 10:50:44
      */
     String sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, String materialId);
-
+    
     /**
      * 创建企业群发, 支出素材批量发送
      *
@@ -89,6 +89,9 @@ public interface MemberUnionidRelatedApiService {
      * @return : 返回群发执行结果
      */
     JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, List<String> materialIdList);
+    
+    JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, List<String> materialIdList , String ecmPlanId);
+
 
     /**
      * 获取群发成员发送任务列表

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.manage.api.dto.CommonMQDTO;
 import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
+import com.gic.mq.sdk.GicMQClient;
+import com.gic.quartz.api.dto.QuartzTaskDTO;
+import com.gic.quartz.api.service.QuartzService;
 
 @Service("haobanCommonMQApiService")
 public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
+
+    private final Logger log = LogManager.getLogger(HaobanCommonMQApiService.class);
+
+    private static GicMQClient mqClient = GICMQClientUtil.getClientInstance();
     
+    @Autowired
+    private QuartzService quartzService ;
+
     @Override
-    public void commonHandler(CommonMQDTO dto) {
-        
+    public void putCommonMessage(CommonMQDTO dto) {
+        String message = JSONObject.toJSONString(dto);
+        log.info("接收信息={}",message);
+        try {
+            mqClient.sendCommonMessage("marketingCommonRouter", message,
+                    "com.gic.haoban.manage.api.service.HaobanCommonMQApiService", "commonHandler");
+        } catch (Exception e) {
+            log.error("发送MQ异常");
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void commonHandler(String message) {
+        CommonMQDTO dto = JSON.parseObject(message, CommonMQDTO.class);
+        // 好办停用,删除定时
+        if(dto.getType()==1) {
+            Map<String,String> map = (Map<String, String>) dto.getParams() ;
+            String enterpriseId = map.get("enterpriseId") ;
+            this.deleteQuartz(enterpriseId);
+        }
     }
     
-} 
+    private void deleteQuartz(String enterpriseId) {
+        log.info("删除好办定时eid={}",enterpriseId);
+        QuartzTaskDTO task = new QuartzTaskDTO();
+        task.setTaskService("com.gic.haoban.app.daily.api.service.DailyReportJobApiService");
+        task.setTaskMethod("callBack");
+        task.setReferId(enterpriseId);
+        this.quartzService.delQuartzTask(task);
+    }
+}

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

@@ -1127,7 +1127,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         Map<String, Object> returnMap = jp.getReturnMap();
         return returnMap.get("msgid") == null ? "" : returnMap.get("msgid").toString();
     }
-
+    
+    @Override
+    public JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList,
+            List<String> materialIdList, String ecmPlanId) {
+        return this.sendMessage(wxEnterpriseId, staffId, extendUserList, materialIdList);
+    }
     /**
      * 创建企业群发, 支出素材批量发送
      *
@@ -1166,6 +1171,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         qywxExternalMessageDTO.setChatType("single");
         qywxExternalMessageDTO.setExternalUserid(extendUserList);
         TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
+        if(null == tabHaobanStaff) {
+            log.info("staff不存在,staffId={}",staffId);
+            JSONResponse jp = new JSONResponse();
+            jp.setErrorCode(-1);
+            jp.setErrorMessage("群发失败,成员查不到," + staffId);
+            return jp ;
+        }
         if (qwDTO.needOpenUserId3th()) {
             qywxExternalMessageDTO.setSenderUserId(tabHaobanStaff.getWxOpenUseId());
         } else {

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
-import com.gic.enterprise.api.dto.EnterpriseDTO;
-import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
+import com.gic.enterprise.api.dto.EnterpriseUsingPermissionDto;
+import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.CommonMQDTO;
+import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
+import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.StaffPrivacyUseLogDTO;
+import com.gic.haoban.manage.api.dto.WelcomeDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
+import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
-import com.gic.haoban.manage.service.entity.*;
+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.TabMiniprogramSetting;
+import com.gic.haoban.manage.service.entity.TabWelcome;
 import com.gic.haoban.manage.service.pojo.bo.StaffPrivacyUseLogBO;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.MiniprogramSettingService;
+import com.gic.haoban.manage.service.service.SecretSettingService;
+import com.gic.haoban.manage.service.service.StaffPrivacyUseLogService;
+import com.gic.haoban.manage.service.service.WxApplicationService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
 
 @Service
 public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@@ -40,8 +68,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     @Autowired
     private WxApplicationService wxApplicationService;
     @Autowired
-    private EnterpriseService enterpriseService;
-    @Autowired
     private SecretSettingService secretSettingService;
     @Autowired
     private MiniprogramSettingService miniprogramSettingService;
@@ -55,6 +81,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
     @Autowired
     private QywxUserApiService qywxUserApiService;
+    @Autowired
+    private EnterpriseUseForbidService enterpriseUseForbidService;
+    @Autowired
+    private HaobanCommonMQApiService haobanCommonMQApiService ;
 
     @Override
     public void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto) {
@@ -249,14 +279,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     public ServiceResponse<Boolean> isStopHaoban(String corpId) {
         TabHaobanWxEnterprise entity = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
         if (null == entity) {
-            return ServiceResponse.failure("9999", "企微不存在");
+            return ServiceResponse.failure("9999", "企微企业信息不存在");
         }
         String wxEnterpriseId = entity.getWxEnterpriseId();
-        log.info("企微状态 ={}，{}", wxEnterpriseId, entity.getStatusFlag());
-        if (entity.getStatusFlag() == 1) {
-            return ServiceResponse.success();
-        }
-        List<TabHaobanWxEnterpriseRelated> list = this.wxEnterpriseRelatedMapper.listByWxEnterpriseIdAndNoStatus(wxEnterpriseId);
+        List<TabHaobanWxEnterpriseRelated> list = this.wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
         if (CollectionUtils.isEmpty(list)) {
             return ServiceResponse.failure("1000", "无关联商户");
         }
@@ -264,16 +290,16 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         log.info("企微关联数={}，{}", count, JSON.toJSONString(list));
         String msg = "好办服务已到期";
         if (count == 1) {
-          /*  List<EnterpriseUsingPermissionDto>  enList =  this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
+            List<EnterpriseUsingPermissionDto>  enList =  this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
             log.info("企微商户状态={}",JSON.toJSONString(list));
             if(CollectionUtils.isNotEmpty(list)) {
                 for(EnterpriseUsingPermissionDto dto : enList) {
-                    if(null != dto.getRightMenuCode() && dto.getRightMenuCode().equals("haoban-3") && null != dto.getServiceEndDate()) {
+                    if(null != dto.getRightMenuCode() && dto.getRightMenuCode().equals(EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) && null != dto.getServiceEndDate()) {
                         msg = "好办服务已于"+DateUtil.dateToStr(dto.getServiceEndDate(), "yyyy-MM-dd")+"到期" ;
                         break ;
                     }
                 }
-            }*/
+            }
             return ServiceResponse.failure("2000", msg);
         } else {
             return ServiceResponse.failure("3000", msg);
@@ -287,31 +313,17 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 
     @Override
     public boolean enterpriseIsOver(String enterpriseId) {
-       /* try {
-            log.info("是否停用查询={}", enterpriseId);
-            Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId, "haoban-3");
-            log.info("是否停用={},{}", enterpriseId, code);
+        try {
+            Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode());
+            log.info("是否停用查询={},{}", enterpriseId, code);
             // 不能用
             if (!(code == 0 || code == 1)) {
                 return true;
             }
         } catch (Exception e) {
             e.printStackTrace();
-        }*/
-        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-        if (enterprise == null || enterprise.getStatus() != 1) {
-            return true;
-        }
-        if (enterprise.getExpireTime() == null) {
-            if (enterprise.getEnabledState() == null) {
-                return false;
-            } else {
-                return enterprise.getEnabledState() != 1;
-            }
-        } else {
-            return enterprise.getExpireTime().getTime() <= System.currentTimeMillis()
-                    || enterprise.getEnabledState() != 1;
         }
+        return false ;
     }
 
     @Override
@@ -473,6 +485,12 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 
     @Override
     public void stopHaoban(String enterpriseId) {
+        log.info("停用好办eid={}",enterpriseId);
         this.wxEnterpriseService.stopHaoban(enterpriseId);
+        CommonMQDTO dto = new CommonMQDTO();
+        dto.setType(1);
+        Map<String,String> map = new HashMap<>() ;
+        map.put("enterpriseId", enterpriseId) ;
+        this.haobanCommonMQApiService.putCommonMessage(dto);
     }
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -131,7 +131,7 @@
                    timeout="10000"/>
     <dubbo:service interface="com.gic.haoban.manage.api.service.ValidationCodeApiService" ref="validationCodeApiServiceImpl"/>
 
-
+	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>                  
     <dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="gicDepartmentService"/>
     <dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxDepartmentApiService"
                      id="qywxDepartmentApiService"/>

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -376,15 +376,15 @@
 	        scr.clerk_id as staffClerkId
 	        from    tab_haoban_external_clerk_related as ecr 
 	         left join
-	        (select a.staff_id,
+	        (select b.staff_id,
 	        a.clerk_id
 	        from tab_haoban_staff_clerk_relation a
-	        left join tab_haoban_staff b on a.staff_id = b.staff_id
+	        left join tab_haoban_staff b on a.staff_id = b.staff_id and b.status_flag = 1 
 	        where a.clerk_id in
 	        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
 	            #{item}
 	        </foreach>
-	        and a.status_flag = 1
+	        and a.status_flag = 1 
 	        group by a.staff_id, a.clerk_id) as scr   on scr.staff_id = ecr.staff_id
 	        where ecr.status_flag = 1
 	        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}

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

@@ -23,10 +23,12 @@ import com.gic.dict.api.dto.CityDTO;
 import com.gic.dict.api.dto.CountyDTO;
 import com.gic.dict.api.dto.GlobalDictMap;
 import com.gic.dict.api.dto.ProvinceDTO;
+import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StorePhotoDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -84,6 +86,9 @@ public class StoreController extends WebBaseController {
     private StaffApiService staffApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
+    @Autowired
+    private EnterpriseUseForbidService enterpriseUseForbidService ;
+
 
     /**
      * 会员小程序-门店列表
@@ -131,20 +136,14 @@ public class StoreController extends WebBaseController {
                     continue ;
                 }
             }else {
-                boolean enterpriseOver = isEnterpriseOver(enterprsieId);
-                if (enterpriseOver) {
-                    logger.info("该企业过期,{}", staffId, enterprsieId);
-                    map.put(enterprsieId, false) ;
-                    continue;
-                }
-          /*      Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, "haoban-3") ;
+                Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
                 logger.info("是否停用={},{}",enterprsieId,code);
                 // 不能用
                 if(!(code ==0 || code==1)) {
                     logger.info("该企业过期,{}", staffId, enterprsieId);
                     map.put(enterprsieId, false) ;
                     continue;
-                }*/
+                }
             }
             map.put(enterprsieId, true) ;
             ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
@@ -321,7 +320,7 @@ public class StoreController extends WebBaseController {
             AuditDTO auditDTO = auditApiService.findByStoreIdAndChangeField(storeId, changeField);
             if (auditDTO == null) {
                 //为空，可继续提交审核
-                int i = auditApiService.save(1, wxEnterpriseId, enterpriseId, staffId, storeId, changeField, oldValue, newValue);
+                auditApiService.save(1, wxEnterpriseId, enterpriseId, staffId, storeId, changeField, oldValue, newValue);
             } else {
                 return resultResponse(HaoBanErrCode.ERR_400018);
             }
@@ -380,23 +379,4 @@ public class StoreController extends WebBaseController {
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
-
-    
-    public boolean isEnterpriseOver(String enterpriseId) {
-        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-        if (enterprise == null || enterprise.getStatus() != 1) {
-            return true;
-        }
-        if (enterprise.getExpireTime() == null) {
-            if (enterprise.getEnabledState() == null) {
-                return false;
-            } else {
-                return enterprise.getEnabledState() != 1;
-            }
-        } else {
-            return enterprise.getExpireTime().getTime() <= System.currentTimeMillis() || enterprise.getEnabledState() != 1;
-        }
-    }
-
-
 }

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

 package com.gic.haoban.manage.web.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -12,7 +32,11 @@ import com.gic.dict.api.service.ManagerDictService;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.haoban.app.customer.dto.*;
+import com.gic.haoban.app.customer.dto.ChildDTO;
+import com.gic.haoban.app.customer.dto.CustomerDTO;
+import com.gic.haoban.app.customer.dto.FilterListDTO;
+import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
+import com.gic.haoban.app.customer.dto.StaffOpenRelatedDTO;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.StaffMemberRelationApiService;
 import com.gic.haoban.common.anno.HttpLimit;
@@ -21,9 +45,29 @@ import com.gic.haoban.common.utils.AuthRequestWellDoneUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.JwtUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalUserDTO;
+import com.gic.haoban.manage.api.dto.MemberStoreDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.StaffPrivacyUseLogDTO;
+import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.GetUserByMemberCodeQo;
@@ -38,21 +82,9 @@ import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 
 @RestController
 public class WxEnterpriseInfoController extends WebBaseController {
@@ -90,8 +122,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
     @Autowired
     private Config config;
     @Autowired
-    private WxApplicationApiService wxApplicationApiService;
-    @Autowired
     private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
     @Autowired
     private CustomerApiService customerApiService;
@@ -117,6 +147,14 @@ public class WxEnterpriseInfoController extends WebBaseController {
         }
         String userId = user.getUserid();
         String corpId = user.getCorpid();
+        // 判断好办是否到期
+        ServiceResponse<Boolean> resp = this.wxEnterpriseApiService.isStopHaoban(corpId);
+        if (!resp.isSuccess()) {
+            HaobanResponse response = new HaobanResponse();
+            response.setErrorCode(-888);
+            response.setMessage(resp.getMessage());
+            return response;
+        }
         WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
         StaffDTO loginStaff = null;
         if (enterprise != null) {

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -13,7 +13,7 @@
     <!-- 应用名称 -->
     <dubbo:application name="haoban-manage3-wx"/>
     <dubbo:protocol name="dubbo" port="30010"/>
-
+	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>
     <dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService"
                      id="staffDepartmentRelatedApiService"/>
     <dubbo:reference interface="com.gic.clerk.api.service.ClerkService" id="clerkService"/>