Merge remote-tracking branch 'origin/developer' into developer

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -45,6 +45,17 @@ public interface StoreApiService {
      * @throws
      */
     ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNO);
+
+    /**
+     * @Title: countByOverflowStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     * @throws
+     */
+    ServiceResponse<Integer> countByOverflowStatus(Integer enterpriseId);
+
     /**
      * @Title: listStore
      * @Description: 分页门店列表 查es

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -284,6 +284,12 @@ public class StoreApiServiceImpl implements StoreApiService {
         return EnterpriseServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "商户没有门店license");
     }
 
+    @Override
+    public ServiceResponse<Integer> countByOverflowStatus(Integer enterpriseId) {
+        this.storeService.countByOverflowStatus(enterpriseId, 0);
+        return EnterpriseServiceResponse.success(this.storeService.countByOverflowStatus(enterpriseId, 0));
+    }
+
     /**
      * 修改日志
      */

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -280,10 +280,12 @@ public class StoreController extends DownloadUtils {
 
     @RequestMapping("store-license-limit")
     public RestResponse storeLicenseLimit() {
-        ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(UserDetailUtils.getUserDetail().getEnterpriseId());
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         if (listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())) {
             if (listEnterpriseLicense.getResult().size() == 4) {
-                return RestResponse.success(listEnterpriseLicense.getResult().get(3).getUpperLimit());
+                Integer result = this.storeApiService.countByOverflowStatus(enterpriseId).getResult();
+                return RestResponse.success(listEnterpriseLicense.getResult().get(3).getUpperLimit() - result);
             }
         }
         return RestResponse.success();