apitable · zoe-icu · Feb 5, 2024 · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023
diff --git a/backend-server/application/build.gradle b/backend-server/application/build.gradle
@@ -90,6 +90,8 @@ dependencies {
     }
     implementation libs.auth0
     implementation libs.pingpp
+    implementation libs.alipay.easy
+    implementation libs.wechatpay
     implementation libs.stripe
     implementation(libs.aliyun.core) {
         exclude(group: 'commons-logging', module: 'commons-logging')

diff --git a/...rver/application/src/main/java/com/apitable/organization/controller/MemberController.java b/...rver/application/src/main/java/com/apitable/organization/controller/MemberController.java
@@ -36,6 +36,8 @@
 import com.apitable.core.exception.BusinessException;
 import com.apitable.core.support.ResponseData;
 import com.apitable.core.util.ExceptionUtil;
+import com.apitable.interfaces.billing.facade.EntitlementServiceFacade;
+import com.apitable.interfaces.billing.model.SubscriptionInfo;
 import com.apitable.interfaces.security.facade.BlackListServiceFacade;
 import com.apitable.interfaces.security.facade.HumanVerificationServiceFacade;
 import com.apitable.interfaces.security.model.NonRobotMetadata;
@@ -148,6 +150,9 @@ public class MemberController {
     @Resource
     private HumanVerificationServiceFacade humanVerificationServiceFacade;
 
+    @Resource
+    private EntitlementServiceFacade entitlementServiceFacade;
+
     /**
      * Fuzzy Search Members.
      */
@@ -508,6 +513,11 @@ public ResponseData<UploadParseResultVO> uploadExcel(UploadMemberTemplateRo data
         // check black space
         blackListServiceFacade.checkSpace(spaceId);
         iSpaceService.checkCanOperateSpaceUpdate(spaceId);
+        SubscriptionInfo subscriptionInfo =
+            entitlementServiceFacade.getSpaceSubscription(spaceId);
+        if (subscriptionInfo.isFree() && iMemberService.shouldPreventInvitation(spaceId)) {
+            return ResponseData.success(new UploadParseResultVO());
+        }
         UploadParseResultVO resultVo = iMemberService.parseExcelFile(spaceId, data.getFile());
         return ResponseData.success(resultVo);
     }

diff --git a/...nd-server/application/src/main/java/com/apitable/organization/service/IMemberService.java b/...nd-server/application/src/main/java/com/apitable/organization/service/IMemberService.java
@@ -752,4 +752,12 @@ void sendInviteNotification(Long fromUserId, List<Long> invitedMemberIds, String
      * @return space ids
      */
     List<String> getUserOwnSpaceIds(Long userId);
+
+    /**
+     * check space invited record.
+     *
+     * @param spaceId space id
+     * @return boolean
+     */
+    boolean shouldPreventInvitation(String spaceId);
 }
diff --git a/...r/application/src/main/java/com/apitable/organization/service/impl/MemberServiceImpl.java b/...r/application/src/main/java/com/apitable/organization/service/impl/MemberServiceImpl.java
@@ -114,6 +114,7 @@
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import jakarta.annotation.Resource;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -506,28 +507,6 @@ public void restoreMember(MemberEntity member) {
         baseMapper.restoreMember(member);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public List<String> emailInvitation(Long inviteUserId, String spaceId, List<String> emails) {
-        // remove empty string or null element in collection, then make it distinct
-        final List<String> distinctEmails =
-            CollectionUtil.distinctIgnoreCase(CollUtil.removeBlank(emails));
-        if (distinctEmails.isEmpty()) {
-            return new ArrayList<>();
-        }
-        List<String> emailsInSpace = memberMapper.selectEmailBySpaceIdAndEmails(spaceId, emails);
-        List<String> emailsNotInSpace = CollUtil.subtractToList(distinctEmails, emailsInSpace);
-        if (emailsNotInSpace.isEmpty()) {
-            return new ArrayList<>();
-        }
-        // create member
-        this.createInvitationMember(inviteUserId, spaceId, emailsNotInSpace);
-        // send email
-        invitationServiceFacade.sendInvitationEmail(
-            new MultiInvitationMetadata(inviteUserId, spaceId, emailsNotInSpace));
-        return emailsNotInSpace;
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createInvitationMember(Long inviteUserId, String spaceId,
@@ -951,10 +930,14 @@ public void batchDeleteMemberFromSpace(String spaceId, List<Long> memberIds,
             }
         }
         List<MemberEntity> memberEntities = baseMapper.selectBatchIds(memberIds);
+        List<Long> needSendEmailMemberIds = new ArrayList<>();
         // The invitation link is invalid and the public link it created is deleted
         if (CollUtil.isNotEmpty(memberEntities)) {
             List<String> deleteMails = new ArrayList<>();
             for (MemberEntity filter : memberEntities) {
+                if (filter.getIsActive()) {
+                    needSendEmailMemberIds.add(filter.getId());
+                }
                 if (StrUtil.isNotBlank(filter.getEmail())) {
                     deleteMails.add(filter.getEmail());
                 }
@@ -979,8 +962,11 @@ public void batchDeleteMemberFromSpace(String spaceId, List<Long> memberIds,
         if (!mailNotify) {
             return;
         }
+        if (needSendEmailMemberIds.isEmpty()) {
+            return;
+        }
         String spaceName = iSpaceService.getNameBySpaceId(spaceId);
-        final List<String> emails = this.getEmailsByMemberIds(memberIds);
+        final List<String> emails = this.getEmailsByMemberIds(needSendEmailMemberIds);
         Dict dict = Dict.create();
         dict.set("SPACE_NAME", spaceName);
         Dict mapDict = Dict.create();
@@ -1028,61 +1014,24 @@ public void preDelBySpaceId(String spaceId, Long userId) {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public UploadParseResultVO parseExcelFile(String spaceId, MultipartFile multipartFile) {
-        // subscribe to the limit
-        // iSubscriptionService.checkSeat(spaceId);
-        // manipulate user information in space
-        UserSpaceDto userSpaceDto = LoginContext.me().getUserSpaceDto(spaceId);
-        UploadParseResultVO resultVo = new UploadParseResultVO();
-        try {
-            // obtaining statistics
-            int currentMemberCount =
-                (int) SqlTool.retCount(staticsMapper.countMemberBySpaceId(spaceId));
-            SubscriptionInfo subscriptionInfo =
-                entitlementServiceFacade.getSpaceSubscription(spaceId);
-            long maxSeatNums = subscriptionInfo.getFeature().getSeat().getValue();
-            // long defaultMaxMemberCount = iSubscriptionService.getPlanSeats(spaceId);
-            // Use the object to read data row by row,
-            // set the number of rows in the table header,
-            // and start reading data at line 4, asynchronous reading.
-            UploadDataListener listener =
-                new UploadDataListener(spaceId, this, maxSeatNums, currentMemberCount)
-                    .resources(userSpaceDto.getResourceCodes());
-            EasyExcel.read(multipartFile.getInputStream(), listener).sheet().headRowNumber(3)
-                .doRead();
-            // gets the parse store record
-            resultVo.setRowCount(listener.getRowCount());
-            resultVo.setSuccessCount(listener.getSuccessCount());
-            resultVo.setErrorCount(listener.getErrorCount());
-            resultVo.setErrorList(listener.getErrorList());
-            // save the error message to the database
-            AuditUploadParseRecordEntity record = new AuditUploadParseRecordEntity();
-            record.setSpaceId(spaceId);
-            record.setRowSize(listener.getRowCount());
-            record.setSuccessCount(listener.getSuccessCount());
-            record.setErrorCount(listener.getErrorCount());
-            record.setErrorMsg(JSONUtil.toJsonStr(listener.getErrorList()));
-            auditUploadParseRecordMapper.insert(record);
-            // send an invitation email
-            this.batchSendInviteEmailOnUpload(spaceId, userSpaceDto.getMemberId(),
-                listener.getSendInviteEmails());
-            this.batchSendInviteNotifyEmailOnUpload(spaceId, userSpaceDto.getMemberId(),
-                listener.getSendNotifyEmails());
-            Long userId = userSpaceDto.getUserId();
-            TaskManager.me().execute(
-                () -> this.sendInviteNotification(userId, listener.getMemberIds(), spaceId, false));
-        } catch (IOException e) {
-            log.error("file cannot be read", e);
-            throw new BusinessException(OrganizationException.EXCEL_CAN_READ_ERROR);
-        } catch (BusinessException e) {
-            log.error("exceed over limit");
-            throw new BusinessException(LimitException.SEATS_OVER_LIMIT);
-        } catch (Exception e) {
-            log.error("fail to parse file", e);
-            throw new BusinessException(
-                "Failed to parse the file. Download the template and import it");
+    public List<String> emailInvitation(Long inviteUserId, String spaceId, List<String> emails) {
+        // remove empty string or null element in collection, then make it distinct
+        final List<String> distinctEmails =
+            CollectionUtil.distinctIgnoreCase(CollUtil.removeBlank(emails));
+        if (distinctEmails.isEmpty()) {
+            return new ArrayList<>();
         }
-        return resultVo;
+        List<String> emailsInSpace = memberMapper.selectEmailBySpaceIdAndEmails(spaceId, emails);
+        List<String> emailsNotInSpace = CollUtil.subtractToList(distinctEmails, emailsInSpace);
+        if (emailsNotInSpace.isEmpty()) {
+            return new ArrayList<>();
+        }
+        // create member
+        this.createInvitationMember(inviteUserId, spaceId, emailsNotInSpace);
+        // send email
+        invitationServiceFacade.sendInvitationEmail(
+            new MultiInvitationMetadata(inviteUserId, spaceId, emailsNotInSpace));
+        return emailsNotInSpace;
     }
 
     /**
@@ -1489,4 +1438,79 @@ public Long getMemberIdByUnitId(String spaceId, String unitId) {
     public List<String> getUserOwnSpaceIds(Long userId) {
         return baseMapper.selectSpaceIdsByUserIdAndIsAdmin(userId, true);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UploadParseResultVO parseExcelFile(String spaceId, MultipartFile multipartFile) {
+        // subscribe to the limit
+        // iSubscriptionService.checkSeat(spaceId);
+        // manipulate user information in space
+        UserSpaceDto userSpaceDto = LoginContext.me().getUserSpaceDto(spaceId);
+        UploadParseResultVO resultVo = new UploadParseResultVO();
+        try {
+            // obtaining statistics
+            int currentMemberCount =
+                (int) SqlTool.retCount(staticsMapper.countMemberBySpaceId(spaceId));
+            SubscriptionInfo subscriptionInfo =
+                entitlementServiceFacade.getSpaceSubscription(spaceId);
+            long maxSeatNums = subscriptionInfo.getFeature().getSeat().getValue();
+            // long defaultMaxMemberCount = iSubscriptionService.getPlanSeats(spaceId);
+            // Use the object to read data row by row,
+            // set the number of rows in the table header,
+            // and start reading data at line 4, asynchronous reading.
+            UploadDataListener listener =
+                new UploadDataListener(spaceId, this, maxSeatNums, currentMemberCount)
+                    .resources(userSpaceDto.getResourceCodes());
+            EasyExcel.read(multipartFile.getInputStream(), listener).sheet().headRowNumber(3)
+                .doRead();
+            // gets the parse store record
+            resultVo.setRowCount(listener.getRowCount());
+            resultVo.setSuccessCount(listener.getSuccessCount());
+            resultVo.setErrorCount(listener.getErrorCount());
+            resultVo.setErrorList(listener.getErrorList());
+            // save the error message to the database
+            AuditUploadParseRecordEntity record = new AuditUploadParseRecordEntity();
+            record.setSpaceId(spaceId);
+            record.setRowSize(listener.getRowCount());
+            record.setSuccessCount(listener.getSuccessCount());
+            record.setErrorCount(listener.getErrorCount());
+            record.setErrorMsg(JSONUtil.toJsonStr(listener.getErrorList()));
+            auditUploadParseRecordMapper.insert(record);
+            // send an invitation email
+            this.batchSendInviteEmailOnUpload(spaceId, userSpaceDto.getMemberId(),
+                listener.getSendInviteEmails());
+            this.batchSendInviteNotifyEmailOnUpload(spaceId, userSpaceDto.getMemberId(),
+                listener.getSendNotifyEmails());
+            Long userId = userSpaceDto.getUserId();
+            TaskManager.me().execute(
+                () -> this.sendInviteNotification(userId, listener.getMemberIds(), spaceId, false));
+        } catch (IOException e) {
+            log.error("file cannot be read", e);
+            throw new BusinessException(OrganizationException.EXCEL_CAN_READ_ERROR);
+        } catch (BusinessException e) {
+            log.error("exceed over limit");
+            throw new BusinessException(LimitException.SEATS_OVER_LIMIT);
+        } catch (Exception e) {
+            log.error("fail to parse file", e);
+            throw new BusinessException(
+                "Failed to parse the file. Download the template and import it");
+        }
+        return resultVo;
+    }
+
+    /**
+     * check space invited record.
+     *
+     * @param spaceId space id
+     * @return boolean
+     */
+    @Override
+    public boolean shouldPreventInvitation(String spaceId) {
+        LocalDateTime startAt = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
+        LocalDateTime endAt =
+            LocalDateTime.now().plusDays(1).withHour(0).withMinute(0).withSecond(0);
+        Integer count =
+            spaceInviteRecordMapper.selectCountBySpaceIdAndBetween(spaceId, startAt, endAt);
+        return count >= constProperties.getMaxInviteCountForFree();
+    }
 }
diff --git a/...ication/src/main/java/com/apitable/player/service/impl/PlayerNotificationServiceImpl.java b/...ication/src/main/java/com/apitable/player/service/impl/PlayerNotificationServiceImpl.java
@@ -681,13 +681,12 @@ private Dict formatEmailDetailVo(NotificationCreateRo ro) {
             dict.set(EMAIL_SPACE_NAME,
                 StrUtil.blankToDefault(iSpaceService.getNameBySpaceId(ro.getSpaceId()), ""));
         }
-        long fromUserId = Long.parseLong(ro.getFromUserId());
-        if (fromUserId > 0) {
-            String memberName =
-                StrUtil.blankToDefault(iMemberService.getMemberNameByUserIdAndSpaceId(fromUserId,
-                    ro.getSpaceId()), I18nStringsUtil.t("unnamed"));
-            dict.set(EMAIL_MEMBER_NAME, memberName);
-        }
+        String memberName = null != ro.getFromUserId()
+            ? StrUtil.blankToDefault(
+            iMemberService.getMemberNameByUserIdAndSpaceId(Long.parseLong(ro.getFromUserId()),
+                ro.getSpaceId()), I18nStringsUtil.t("unnamed"))
+            : I18nStringsUtil.t("unnamed");
+        dict.set(EMAIL_MEMBER_NAME, memberName);
         if (ObjectUtil.isNotNull(ro.getBody())) {
             JSONObject extras = NotificationHelper.getExtrasFromNotifyBody(ro.getBody());
             if (extras != null) {

diff --git a/...rver/application/src/main/java/com/apitable/shared/config/properties/ConstProperties.java b/...rver/application/src/main/java/com/apitable/shared/config/properties/ConstProperties.java
@@ -92,6 +92,12 @@ public class ConstProperties {
 
     private String emailVerificationUrl = "/user/email_verification";
 
+    /**
+     * max invited record for a single day.
+     */
+    private Integer maxInviteCountForFree = 10;
+
+
     public OssBucketInfo getOssBucketByAsset() {
         return Optional.ofNullable(ossBuckets).orElseGet(HashMap::new)
             .getOrDefault(BucketKey.ASSETS, new OssBucketInfo());

diff --git a/...er/application/src/main/java/com/apitable/space/controller/SpaceInvitationController.java b/...er/application/src/main/java/com/apitable/space/controller/SpaceInvitationController.java
@@ -27,6 +27,8 @@
 import cn.hutool.core.util.StrUtil;
 import com.apitable.core.support.ResponseData;
 import com.apitable.core.util.ExceptionUtil;
+import com.apitable.interfaces.billing.facade.EntitlementServiceFacade;
+import com.apitable.interfaces.billing.model.SubscriptionInfo;
 import com.apitable.interfaces.security.facade.BlackListServiceFacade;
 import com.apitable.interfaces.security.facade.HumanVerificationServiceFacade;
 import com.apitable.interfaces.security.model.NonRobotMetadata;
@@ -93,6 +95,9 @@ public class SpaceInvitationController {
     @Resource
     private RedisTemplate<String, String> redisTemplate;
 
+    @Resource
+    private EntitlementServiceFacade entitlementServiceFacade;
+
     /**
      * Valid email invitation.
      */
@@ -157,7 +162,6 @@ public ResponseData<EmailInvitationResultVO> sendEmailInvitation(
         // whether in black list
         blackListServiceFacade.checkSpace(spaceId);
         iSpaceService.checkSeatOverLimit(spaceId, data.getInvite().size());
-        Long userId = SessionContext.getUserId();
         // check whether space can invite user
         iSpaceService.checkCanOperateSpaceUpdate(spaceId);
         List<EmailInvitationMemberRo> inviteMembers = data.getInvite();
@@ -170,7 +174,13 @@ public ResponseData<EmailInvitationResultVO> sendEmailInvitation(
             // without email, response success directly
             return ResponseData.success(view);
         }
+        SubscriptionInfo subscriptionInfo =
+            entitlementServiceFacade.getSpaceSubscription(spaceId);
+        if (subscriptionInfo.isFree() && iMemberService.shouldPreventInvitation(spaceId)) {
+            return ResponseData.success(view);
+        }
         // invite new members
+        Long userId = SessionContext.getUserId();
         List<String> emails = iMemberService.emailInvitation(userId, spaceId, inviteEmails);
         view.setEmails(emails);
         return ResponseData.success(view);