Merge branch 'feature-biz202506' into 'master'

Feature biz202506

See merge request !3059

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/EnterpriseAdaptor.java

@@ -51,6 +51,11 @@ public class EnterpriseAdaptor {
             EnterpriseServiceEnum.GOODS_ANALYSIS.getRightMenuCode()
     );
 
+    public static final List<String> newRightCodeList = Lists.newArrayList(
+            EnterpriseServiceEnum.POTENTIAL.getRightMenuCode(),
+            EnterpriseServiceEnum.CONTENT.getRightMenuCode()
+    );
+
     @Autowired
     EnterpriseUseForbidService enterpriseUseForbidService;
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.content.api.dto.setting.ContentSettingDTO;
 import com.gic.content.api.service.ContentSettingApiService;
+import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.haoban.manage.api.enums.content.MaterialInteractRecordEventType;
+import com.gic.haoban.manage.api.enums.content.ShareBizType;
 import com.gic.haoban.manage.service.pojo.bo.content.InteractRecordBO;
 import com.gic.haoban.manage.service.pojo.bo.content.InteractRecordExtendInfoBO;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
@@ -15,6 +17,7 @@ import com.gic.haoban.manage.service.pojo.bo.content.context.PotentialCustomerNo
 import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessageBO;
 import com.gic.haoban.manage.service.service.content.InteractRecordService;
 import com.gic.haoban.manage.service.service.content.PotentialCustomerService;
+import com.gic.haoban.manage.service.service.content.adaptor.EnterpriseAdaptor;
 import com.gic.haoban.manage.service.service.content.adaptor.InteractRecordBuilder;
 import com.gic.haoban.manage.service.service.content.adaptor.InteractRecordMessageBuilder;
 import com.gic.haoban.manage.service.util.IntervalUtils;
@@ -46,6 +49,8 @@ public class InteractRecordMessageService {
     @Autowired
     InteractRecordBuilder interactRecordBuilder;
     @Autowired
+    EnterpriseAdaptor enterpriseAdaptor;
+    @Autowired
     PotentialCustomerService potentialCustomerService;
     @Autowired
     ContentSettingApiService contentSettingApiService;
@@ -67,6 +72,19 @@ public class InteractRecordMessageService {
         }
 
         InteractRecordMessageContext context = InteractRecordMessageContext.create(interactRecordMessageBO);
+
+        log.info("业务类型:{}", context.getBizType());
+
+        // 普通商品分享校验服务是否到期
+        if (Objects.equals(context.getBizType(), ShareBizType.GOODS.getCode())
+                && (Objects.isNull(interactRecordMessageBO.getShareSource()) || Objects.equals(interactRecordMessageBO.getShareSource(), -1))) {
+            log.info("普通商品分享");
+            if (!enterpriseAdaptor.checkEnterpriseHasRights(interactRecordMessageBO.getEnterpriseId(), EnterpriseAdaptor.newRightCodeList)) {
+                log.info("企业 {} 没权限", interactRecordMessageBO.getEnterpriseId());
+                return;
+            }
+        }
+
         // 参数是否完整
         // 根据businessId clerkId memberId materialId 构建唯一标识key
         String recordKey = context.buildRecordKey();