@eliboo/biz-logic 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eliboo/biz-logic",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "type": "module",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/pending/biz-pending/biz-data.d.ts

@@ -11,7 +11,7 @@ export declare class LdCcaseStepListDto {
     remark?: string;
 }
 export declare class UserPendingStatusDto {
-    backlogName: '网签待办' | '验证码上传待办' | '材料补全待办' | '支付宝实名认证待办' | '营业执照上传待办' | '税务登记待办' | '税务申报待办' | '税费缴纳待办' | '个税申报密码提交待办' | '个税密码提交待办' | '个税登录密码提交待办' | '电子税务局登录待办' | '票种核定待办' | '个税验证码上传待办' | '电子税务局验证码上传待办' | '税务申报处理待办' | '退款金额确认待办' | '通知待办' | '续费待办';
+    backlogName: '网签待办' | '验证码上传待办' | '材料补全待办' | '支付宝实名认证待办' | '营业执照上传待办' | '税务登记待办' | '税务申报待办' | '税费缴纳待办' | '个税申报密码提交待办' | '个税密码提交待办' | '个税登录密码提交待办' | '电子税务局登录待办' | '票种核定待办' | '个税验证码上传待办' | '电子税务局验证码上传待办' | '税务申报处理待办' | '退款金额确认待办' | '通知待办' | '续费待办' | '服务终止待办';
     /** 是否催办 0:是 1:否 */
     urgeToStatus: 0 | 1;
     /** 待办类型 */

package/src/pending/biz-pending/biz-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"biz-data.js","sourceRoot":"","sources":["../../../../../../packages/biz-logic/src/pending/biz-pending/biz-data.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAkB;CAe9B;AAED,MAAM,OAAO,oBAAoB;CA0DhC"}
+{"version":3,"file":"biz-data.js","sourceRoot":"","sources":["../../../../../../packages/biz-logic/src/pending/biz-pending/biz-data.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAkB;CAe9B;AAED,MAAM,OAAO,oBAAoB;CA2DhC"}

package/src/pending/tax-pending/need-renewal.pending.js

@@ -9,15 +9,16 @@ export function checkNeedRenewal(context) {
     const { userData, userTaxStatus } = context;
     // 使用 isNeedRenewal 判断是否需要续费
     // userData 类型为 ILdCcaseGetCustDto，正好匹配 isNeedRenewal 的参数
-    if (isNeedRenewal(userData)) {
+    const checkRes = isNeedRenewal(userData);
+    if (checkRes) {
         const item = {
-            backlogName: '续费待办',
+            backlogName: checkRes.isOverdue ? '服务终止待办' : '续费待办',
             urgeToStatus: 1,
             source: 'tax', // 归类为系统/通用待办
             type: 'taxServiceRenewal',
             isCompleted: false,
             url: '/tax/main/renewal', // 假设的续费页面 URL，具体需根据实际路由调整
-            message: '您的服务即将到期或已到期，请及时续费',
+            message: checkRes.isOverdue ? '您的服务已过期，将终止一切服务，请及时续费' : '您的服务即将到期或已到期，请及时续费',
         };
         userTaxStatus.push(item);
     }

package/src/pending/tax-pending/need-renewal.pending.js.map

@@ -1 +1 @@
-{"version":3,"file":"need-renewal.pending.js","sourceRoot":"","sources":["../../../../../../packages/biz-logic/src/pending/tax-pending/need-renewal.pending.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,EAAE,EAAE,MAAM,MAAM,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAgC,OAAU;IACxE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAE5C,4BAA4B;IAC5B,yDAAyD;IACzD,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAyB;YACjC,WAAW,EAAE,MAAM;YACnB,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,KAAK,EAAE,aAAa;YAC5B,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,mBAAmB,EAAE,0BAA0B;YACpD,OAAO,EAAE,oBAAoB;SAC9B,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC"}
+{"version":3,"file":"need-renewal.pending.js","sourceRoot":"","sources":["../../../../../../packages/biz-logic/src/pending/tax-pending/need-renewal.pending.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,EAAE,EAAE,MAAM,MAAM,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAgC,OAAU;IACxE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAE5C,4BAA4B;IAC5B,yDAAyD;IACzD,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,GAAyB;YACjC,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;YACnD,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,KAAK,EAAE,aAAa;YAC5B,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,mBAAmB,EAAE,0BAA0B;YACpD,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,oBAAoB;SAC7E,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC"}

package/src/user/need-renewal.d.ts

@@ -1,2 +1,5 @@
 import { ILdCcaseGetCustDto } from '../interfaces';
-export declare function isNeedRenewal(custDTO: ILdCcaseGetCustDto): boolean;
+export declare function isNeedRenewal(custDTO: ILdCcaseGetCustDto): false | {
+    isOverdue: boolean;
+    isNearDeadline: boolean;
+};

package/src/user/need-renewal.js

@@ -15,6 +15,12 @@ export function isNeedRenewal(custDTO) {
     // 核心续费判断：超出期限 或 临期60天内（已过开始时间才判定临期）
     const isOverdue = current >= endDateTime; // 超出服务期限
     const isNearDeadline = daysRemaining <= 60 && current >= new Date(startDate); // 临近60天且已开始服务
-    return isOverdue || isNearDeadline;
+    const res = isOverdue || isNearDeadline;
+    return res
+        ? {
+            isOverdue,
+            isNearDeadline,
+        }
+        : false;
 }
 //# sourceMappingURL=need-renewal.js.map

package/src/user/need-renewal.js.map

@@ -1 +1 @@
-{"version":3,"file":"need-renewal.js","sourceRoot":"","sources":["../../../../../packages/biz-logic/src/user/need-renewal.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,OAA2B;IACvD,cAAc;IACd,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAE3B,8BAA8B;IAC9B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAEzC,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAEtC,+BAA+B;IAC/B,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAElE,oCAAoC;IACpC,MAAM,SAAS,GAAG,OAAO,IAAI,WAAW,CAAC,CAAC,SAAS;IACnD,MAAM,cAAc,GAAG,aAAa,IAAI,EAAE,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;IAE5F,OAAO,SAAS,IAAI,cAAc,CAAC;AACrC,CAAC"}
+{"version":3,"file":"need-renewal.js","sourceRoot":"","sources":["../../../../../packages/biz-logic/src/user/need-renewal.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,OAA2B;IACvD,cAAc;IACd,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAE3B,8BAA8B;IAC9B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAEzC,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAEtC,+BAA+B;IAC/B,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAElE,oCAAoC;IACpC,MAAM,SAAS,GAAG,OAAO,IAAI,WAAW,CAAC,CAAC,SAAS;IACnD,MAAM,cAAc,GAAG,aAAa,IAAI,EAAE,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;IAC5F,MAAM,GAAG,GAAG,SAAS,IAAI,cAAc,CAAC;IACxC,OAAO,GAAG;QACR,CAAC,CAAC;YACE,SAAS;YACT,cAAc;SACf;QACH,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC"}