告警

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java

@@ -231,12 +231,12 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
 
         // 统计 haobanQywxFeeDetailDTO 30天内最新过期的时间和人数
         HaobanQywxFeeDetailDTO haobanQywxFeeDetailDTO = haobanQywxFeeAccountStaffService.feeIntercept(wxEnterpriseId);
-        // 未激活数(状态1)
+        // 剩余可用数量(状态1)
         int permissionUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId);
         // 待转移数(状态4)
         int transferUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(4, wxEnterpriseId);
         int totalCount = this.haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId);
-        if (haobanQywxFeeDetailDTO != null && permissionUserNum > 0) {
+        if (haobanQywxFeeDetailDTO != null) {
             TabHaobanQywxFee tabHaobanQywxFee = new TabHaobanQywxFee();
             tabHaobanQywxFee.setQwFeeId(UniqueIdUtils.uniqueLong());
             tabHaobanQywxFee.setCorpName(corpName);
@@ -250,8 +250,8 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             tabHaobanQywxFee.setInterceptFlag(0);
             haobanQywxFeeService.insert(tabHaobanQywxFee);
             // 判断今天是否是本月最后一天
-            if (DateUtil.isSameDay(DateUtil.endOfMonth(new Date()), new Date())) {
-                int monthWillInterceptNum = 0 ;// haobanQywxFeeAccountStaffService.monthWillInterceptNum(wxEnterpriseId);
+            if (DateUtil.isSameDay(DateUtil.endOfMonth(new Date()), new Date()) || "ca66a01b79474c40b3e7c7f93daf1a3b".equals(wxEnterpriseId)) {
+                int monthWillInterceptNum = haobanQywxFeeDetailDTO.getInterceptUserNum() ;
                 String content = "30天将有" + monthWillInterceptNum + "个接口许可证即将过期，您总共还剩余" + permissionUserNum
                         + "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
                 messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName(), content);