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

好办停用

See merge request !224

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

@@ -232,5 +232,9 @@ public interface WxEnterpriseApiService {
     * @throws
      */
     void stopHaoban(String enterpriseId) ;
+    
+    public boolean haobanIsStop(String eid) ;
+    
+    public String getEndDate(String enterpriseId) ;
 
 }

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

@@ -489,7 +489,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         this.haobanCommonMQApiService.putCommonMessage(dto);
     }
     
-    private boolean haobanIsStop(String eid) {
+    public boolean haobanIsStop(String eid) {
         Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(eid,EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
         log.info("好办是否到期停用={},{}",eid,code);
         if(code ==0 || code==1) {
@@ -507,7 +507,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         return true ;
     }
     
-    private String getEndDate(String enterpriseId) {
+    public String getEndDate(String enterpriseId) {
+        if(!haobanIsStop(enterpriseId)) {
+            return null ;
+        }
         ServiceResponse<EnterpriseUsingPermissionDto> resp =  this.enterpriseUseForbidService.getPermisssionByCode(enterpriseId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
         log.info("返回权限信息={}",JSON.toJSONString(resp));
         if(resp.isSuccess()) {

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -11,6 +11,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
@@ -42,12 +43,17 @@ public class HmPageServiceTest {
 
     @Autowired
     private HmWelcomeRelationApiService welcomeRelationApiService;
+    @Autowired
+    private WxEnterpriseApiService wxEnterpriseApiService ;
 
     @Test
     public void test(){
-        HmPageQDTO pageQDTO = new HmPageQDTO();
+        
+        this.wxEnterpriseApiService.stopHaoban("ff8080815dacd3a2015dacd3ef5c0000");
+        
+     /*   HmPageQDTO pageQDTO = new HmPageQDTO();
         pageQDTO.setPageSearchText("MB01419872763172380673");
-        ServiceResponse<Page<HmPageDTO>> pageServiceResponse = pageService.queryPageList(pageQDTO);
+        ServiceResponse<Page<HmPageDTO>> pageServiceResponse = pageService.queryPageList(pageQDTO);*/
     }
 
 

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

@@ -482,10 +482,10 @@ public class LoginController extends WebBaseController {
         loginUser.setClerkPhone(clerk.getPhoneNumber()) ;
         AuthWebRequestUtil.setSessionUser(loginUser);
         AuthWebRequestUtil.setAppLoginUser(token, loginUser);
-        boolean flag = wxEnterpriseApiService.enterpriseIsOver(enterpriseId);
-        if (flag) {
+        String endMessage = wxEnterpriseApiService.getEndDate(enterpriseId);
+        if (StringUtils.isNotBlank(endMessage)) {
             logger.info("切换商户失败,商户已过期,eid={},phone={}", enterpriseId, phoneNumber);
-            return this.fail("切换商户失败,商户已过期");
+            return this.fail(endMessage);
         }
         return resultResponse(HaoBanErrCode.ERR_1, false);
     }

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

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
-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.util.EntityUtil;
@@ -25,13 +24,10 @@ 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.EnterpriseUsingPermissionDto;
 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;
@@ -89,9 +85,6 @@ public class StoreController extends WebBaseController {
     private StaffApiService staffApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
-    @Autowired
-    private EnterpriseUseForbidService enterpriseUseForbidService ;
-
 
     /**
      * 会员小程序-门店列表
@@ -115,7 +108,7 @@ public class StoreController extends WebBaseController {
         }
         List<String> enterpriseIdList = enterpriseList.stream().filter(dto->{
             String enterpriseId = dto.getEnterpriseId() ;
-            return !this.haobanIsStop(enterpriseId);
+            return !this.wxEnterpriseApiService.haobanIsStop(enterpriseId);
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
         
         if (CollectionUtils.isEmpty(enterpriseIdList)) {
@@ -369,22 +362,4 @@ public class StoreController extends WebBaseController {
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
-    
-    private boolean haobanIsStop(String enterpriseId) {
-        Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId,EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
-        logger.info("好办是否到期停用={},{}",enterpriseId,code);
-        if(code ==0 || code==1) {
-            ServiceResponse<EnterpriseUsingPermissionDto> resp = this.enterpriseUseForbidService.getPermisssionByCode(enterpriseId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
-            logger.info("返回权限信息={}",JSON.toJSONString(resp));
-            if(resp.isSuccess()) {
-                EnterpriseUsingPermissionDto dto = resp.getResult() ;
-                if(null != dto.getServiceEndDate() && dto.getServiceEndDate().before(new Date())) {
-                    logger.info("过期停用={}",enterpriseId);
-                    return true ;
-                }
-            }
-            return false ;
-        }
-        return true ;
-    }
 }