积分服务页面只能开启15个编辑调整

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletCustomPageApiServiceImpl.java

@@ -97,7 +97,7 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
         //设置人群的页面
         if (AppletPageTypeEnum.needCrowdWidget(pageType)) {
             //如果是积分服务页面并且是保存并发布，则校验，不能超过15条
-            validIntegralServicePageNum(pageType, saveType, enterpriseId, appType, appId);
+            validIntegralServicePageNum(pageId, pageType, saveType, enterpriseId, appType, appId);
 
             Long crowdWidgetId = jsonObject.getLong("crowdWidgetId");
             record.setCrowdWidgetId(crowdWidgetId);
@@ -417,7 +417,7 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
             appletCustomPageService.disableFetch(record.getEnterpriseId(), record.getAppType(), record.getAppId(),
                     record.getPageType());
         }
-        validIntegralServicePageNum(record.getPageType(), 1, record.getEnterpriseId(), record.getAppType(), record.getAppId());
+        validIntegralServicePageNum(null, record.getPageType(), 1, record.getEnterpriseId(), record.getAppType(), record.getAppId());
 
         appletCustomPageService.updateStatus(pageId, 1);
         return ServiceResponse.success(record.getTitle());
@@ -540,9 +540,14 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
         return record;
     }
 
-    private void validIntegralServicePageNum(Integer pageType, Integer saveType, Integer enterpriseId, Integer appType, String appId) {
+    private void validIntegralServicePageNum(Integer pageId, Integer pageType, Integer saveType, Integer enterpriseId, Integer appType, String appId) {
         //如果是积分服务页面并且是保存并发布，则校验，不能超过15条
         if (pageType == AppletPageTypeEnum.INTEGRAL_SERVICE.getCode() && saveType == 1) {
+            TabAppletCustomPage record = exist(pageId);
+            if (record != null && record.getStatus() == 1) {
+                //如果本身就是发布状态，则不占用名额
+                return;
+            }
             List<TabAppletCustomPage> integralServiceList = getPageListByAppId(enterpriseId, appType, appId, AppletPageTypeEnum.INTEGRAL_SERVICE.getCode());
             if (integralServiceList != null && integralServiceList.size() >= 15) {
                 throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "积分服务页面只能开启15个");