开通服务修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/impl/ContactLogServiceImpl.java

@@ -9,6 +9,7 @@ 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.UniqueIdUtils;
+import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.app.customer.dto.CustomerDTO;
@@ -27,6 +28,7 @@ import com.gic.haoban.manage.service.entity.contact.TabContactLog;
 import com.gic.haoban.manage.service.service.contact.ContactConfigService;
 import com.gic.haoban.manage.service.service.contact.ContactFollowService;
 import com.gic.haoban.manage.service.service.contact.ContactLogService;
+import com.gic.haoban.manage.service.service.content.adaptor.EnterpriseAdaptor;
 import com.gic.member.api.dto.MemberStoreClerkDTO;
 import com.gic.member.api.dto.es.MemberDataDTO;
 import com.gic.member.api.service.MemberService;
@@ -68,6 +70,8 @@ public class ContactLogServiceImpl implements ContactLogService {
     private CustomerApiService customerApiService;
     @Autowired
     private ESDataDynamicOperationApiService esDataDynamicOperationApiService;
+    @Autowired
+    private EnterpriseAdaptor enterpriseAdaptor;
 
     public boolean contactCheck(String enterpriseId,String memberId,ClerkDTO clerkDTO) {
         if (clerkDTO == null) {
@@ -189,6 +193,10 @@ public class ContactLogServiceImpl implements ContactLogService {
         if (qdto == null) {
             return;
         }
+        boolean hasRight = enterpriseAdaptor.checkEnterpriseHasRight(qdto.getEnterpriseId(), EnterpriseServiceEnum.POTENTIAL.getRightMenuCode());
+        if (!hasRight) {
+            return ;
+        }
         String enterpriseId = qdto.getEnterpriseId();
         Integer contactAutoType = qdto.getContactAutoType();
         ContactConfigDTO contactConfig = contactConfigService.getContactConfig(enterpriseId);

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

@@ -23,8 +23,6 @@ public class QwSendApiServiceImpl implements QwSendApiService {
 
     @Autowired
     private QwSendMsgService qwSendMsgService;
-    @Autowired
-    private EnterpriseAdaptor enterpriseAdaptor;
 
     @Override
     public ServiceResponse<Void> qwSendRefreshByMQ(String message) {
@@ -32,10 +30,6 @@ public class QwSendApiServiceImpl implements QwSendApiService {
             return ServiceResponse.success();
         }
         DealQwSendDTO dealQwSendDTO = JSONObject.parseObject(message, DealQwSendDTO.class);
-        boolean hasRight = enterpriseAdaptor.checkEnterpriseHasRight(dealQwSendDTO.getEnterpriseId(), EnterpriseServiceEnum.POTENTIAL.getRightMenuCode());
-        if (!hasRight) {
-            return ServiceResponse.success();
-        }
         Integer refreshType = dealQwSendDTO.getRefreshType();
         log.info("刷新企微发送记录:{}", message);