Merge branch 'feature-recommend' into 'master'

销售线索服务校验

See merge request !2814

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

@@ -76,6 +76,8 @@ public interface InteractRecordService {
      */
     InteractRecordBO queryLeastRecord(String enterpriseId, String clerkId, String bizId, String memberId);
 
+    void modifyFollowTime(String enterpriseId,String clerkId, String memberId);
+
     /**
      * 更新unionId
      * @param enterpriseId

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

@@ -41,6 +41,15 @@ public class EnterpriseAdaptor {
 
     private static final Long cache_hour_sec = 5 * 60L;
 
+    /**
+     * 销售线索处理微盟订单的服务
+     */
+    public static final List<String> rightCodeList = Lists.newArrayList(
+            EnterpriseServiceEnum.POTENTIAL.getRightMenuCode(),
+            EnterpriseServiceEnum.CONTENT.getRightMenuCode(),
+            EnterpriseServiceEnum.GOODS_ANALYSIS.getRightMenuCode()
+    );
+
     @Autowired
     EnterpriseUseForbidService enterpriseUseForbidService;
 

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

@@ -269,8 +269,7 @@ public class InteractRecordApiServiceImpl implements InteractRecordApiService {
         CreateMemberEventParam createMemberEventParam = JSON.parseObject(params, CreateMemberEventParam.class);
         String enterpriseId = createMemberEventParam.getEnterpriseId();
         String memberId = createMemberEventParam.getMemberId();
-
-        if (!enterpriseAdaptor.checkEnterpriseHasContentRight(enterpriseId)) {
+        if (!enterpriseAdaptor.checkEnterpriseHasRights(enterpriseId, EnterpriseAdaptor.rightCodeList)) {
             log.info("企业 {} 没有内容权限", enterpriseId);
             return ServiceResponse.success();
         }

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

@@ -84,14 +84,6 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
 
     private static final Long cache_hour_sec = 300L;
 
-    /**
-     * 销售线索处理微盟订单的服务
-     */
-    private static final List<String> rightCodeList = Lists.newArrayList(
-            EnterpriseServiceEnum.POTENTIAL.getRightMenuCode(),
-            EnterpriseServiceEnum.CONTENT.getRightMenuCode(),
-            EnterpriseServiceEnum.GOODS_ANALYSIS.getRightMenuCode()
-    );
     /***
      * 订单状态变更事件
      * @param params
@@ -241,7 +233,7 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
             return ServiceResponse.success();
         }
         String enterpriseId = memberOrderBo.getEnterpriseId();
-        boolean check = enterpriseAdaptor.checkEnterpriseHasRights(enterpriseId, rightCodeList);
+        boolean check = enterpriseAdaptor.checkEnterpriseHasRights(enterpriseId, EnterpriseAdaptor.rightCodeList);
         if (!check) {
             log.info("企业 {} 没有权限", enterpriseId);
             return ServiceResponse.success();