@freedom_sky/feige-lib 5.21.0 → 5.23.0

package/src/interfaces/store/subscription.interface.ts

@@ -1,43 +1,43 @@
-export interface Subscription {
-    base: {
-        expires: string | Date;
-        permanent: boolean;
-        note?: string;
-        activation?: Activation;
-    };
-    waiter: {
-        expires: string | Date;
-        permanent: boolean;
-    };
-    kds: {
-        expires: string | Date;
-        permanent: boolean;
-    };
-    baseTakeaway: {
-        expires: string | Date;
-        permanent: boolean;
-    };
-    multiLanguage: {
-        expires: string | Date;
-        permanent: boolean;
-        allow: string[];
-    };
-    superMultiLanguage: {
-        expires: string | Date;
-        permanent: boolean;
-    };
-}
-export interface Activation {
-    readonly receptionPrinterCountLimit: number;
-    readonly chefPrinterCountLimit: number;
-    readonly labelPrinterCountLimit: number;
-    readonly dishCountLimit: number;
-    readonly tableCountLimit: number;
-    readonly memberFunction: boolean;
-    readonly deliveryFunction: boolean;
-    readonly buffetFunction: boolean;
-    readonly waiterCountLimit: number;
-    readonly kdsCountLimit: number;
-    readonly multiLanguageCountLimit: number;
-    readonly renewPrice: number;
-}
+export interface Subscription {
+    base: {
+        expires: string | Date;
+        permanent: boolean;
+        note?: string;
+        activation?: Activation;
+    };
+    waiter: {
+        expires: string | Date;
+        permanent: boolean;
+    };
+    kds: {
+        expires: string | Date;
+        permanent: boolean;
+    };
+    baseTakeaway: {
+        expires: string | Date;
+        permanent: boolean;
+    };
+    multiLanguage: {
+        expires: string | Date;
+        permanent: boolean;
+        allow: string[];
+    };
+    superMultiLanguage: {
+        expires: string | Date;
+        permanent: boolean;
+    };
+}
+export interface Activation {
+    readonly receptionPrinterCountLimit: number;
+    readonly chefPrinterCountLimit: number;
+    readonly labelPrinterCountLimit: number;
+    readonly dishCountLimit: number;
+    readonly tableCountLimit: number;
+    readonly memberFunction: boolean;
+    readonly deliveryFunction: boolean;
+    readonly buffetFunction: boolean;
+    readonly waiterCountLimit: number;
+    readonly kdsCountLimit: number;
+    readonly multiLanguageCountLimit: number;
+    readonly renewPrice: number;
+}

package/src/interfaces/user/user.interface.ts

@@ -1,139 +1,139 @@
-import { YeepayTypeEnum } from '../../enum/yeepay.enum';
-import { FromEnum } from '../../enum/from.enum';
-import { UserStatusEnum } from '../../enum/user-status.enum';
-import { PayCompanyEnum } from '../../enum/pay-company.enum';
-export interface CertificatePath {
-    origin: string;
-    yeepay: string;
-    fubei: string;
-}
-export interface UserSafe {
-    readonly mobile?: string;
-    readonly email?: string;
-    readonly countryCode: string;
-    readonly password: string;
-    readonly salt: string;
-    readonly _id: string;
-    readonly deviceId: string;
-    readonly arrearsCountdown: number;
-    readonly online: boolean;
-    readonly clientId: string;
-    readonly originAgentId: string;
-    readonly responseAgentId: string;
-    readonly status: UserStatusEnum;
-    readonly abandonReason: string;
-    readonly lostReason: string;
-    readonly from: FromEnum;
-    readonly visitCycle: number;
-    readonly purchased: boolean;
-    readonly disabled: boolean;
-    readonly geoIp: {
-        ip: string;
-        city: string;
-        region: string;
-        country: string;
-        loc: string;
-        org: string;
-        postal: string;
-        timezone: string;
-        lastUpdateDate: Date;
-    };
-}
-export interface User extends UserSafe {
-    readonly certificate: {
-        IDCARD_FRONT: CertificatePath;
-        IDCARD_BACK: CertificatePath;
-        UNI_CREDIT_CODE: CertificatePath;
-        OP_BANK_CODE: CertificatePath;
-        HAND_IDCARD: CertificatePath;
-        SETTLE_BANKCARD: CertificatePath;
-        CORP_CODE: CertificatePath;
-        BUSINESS_PLACE: CertificatePath;
-        BUSINESS_SITE: CertificatePath;
-        CASHIER_SCENE: CertificatePath;
-        OTHER_IDCARD_FRONT?: CertificatePath;
-        OTHER_IDCARD_BACK?: CertificatePath;
-        OTHER_AUTH_PHOTO?: CertificatePath;
-        FOOD_SAFETY_LICENSE?: CertificatePath;
-    };
-    readonly realInfo: {
-        type: YeepayTypeEnum;
-        toOther: boolean;
-        legalName: string;
-        merLegalPhone: string;
-        legalIdCard: string;
-        merAddress: string;
-        merProvince: string;
-        merCity: string;
-        merDistrict: string;
-        cardNo: string;
-        merFullName: string;
-        merShortName: string;
-        merCertNo: string;
-        merCertType: string;
-        merContactName: string;
-        merContactPhone: string;
-        accountLicense: string;
-        headBankCode: string;
-        bankCode: string;
-        serviceTel: string;
-        contactName: string;
-        contactPhone: string;
-        contactMobile: string;
-        contactEmail: string;
-        contactType: string;
-        bankCardPhone: string;
-        toOtherName?: string;
-        toOtherIdCard?: string;
-        licenseTimeBegin: string;
-        licenseTimeEnd: string;
-        legalTimeBegin?: string;
-        legalTimeEnd?: string;
-        merCertAddress?: string;
-    };
-    readonly pay: {
-        active: boolean;
-        company: PayCompanyEnum;
-    };
-    readonly yeepay: {
-        payRate: number;
-        userEditLock: boolean;
-        merchantNo: string;
-        merNetInOutStatus: string;
-        merNetInOutStatusRemark: string;
-        merHmacKey: string;
-        reportStatus: string;
-        configStatus: string;
-        active: boolean;
-    };
-    readonly fubei: {
-        payRate: number;
-        merchant_id: number; // 付呗商户号
-        merchant_code: string; // 付呗登陆账号
-        app_id: string;
-        app_secret: string;
-        store_id: number; // 门店id
-        sub_mch_id: string; // 当前渠道下对应的微信子商户号
-        alipay_msid: string; // 当前渠道下对应的支付宝子商户号
-        merchant_status: number; // 商户实名认证状态：0 未认证、1 认证中、2 认证成功、3 认证失败
-        wechat_auth_status: string; // 商户微信认证状态：UNAUTHORIZED 未认证、AUTHORIZED 已认证、UNKNOWN 未知
-        store_status: number; // 门店状态：1 待审核、2 审核通过、3 审核驳回
-        error_msg: string; // 错误信息
-    };
-    readonly mpAlipay?: {
-        authAppId: string;
-        componentAppId: string;
-        appRefreshToken: string;
-        appAuthToken: string;
-        templateVersion: string;
-        pid: string;
-    };
-    readonly mpWechat?: {
-        fasteRegisterStatus: string;
-        fasteRegisterMsg: string;
-        authAppId: string;
-        componentAppId: string;
-        appRefreshToken: string;
-        templateVersion: string;
-    };
-}
+import { YeepayTypeEnum } from '../../enum/yeepay.enum';
+import { FromEnum } from '../../enum/from.enum';
+import { UserStatusEnum } from '../../enum/user-status.enum';
+import { PayCompanyEnum } from '../../enum/pay-company.enum';
+export interface CertificatePath {
+    origin: string;
+    yeepay: string;
+    fubei: string;
+}
+export interface UserSafe {
+    readonly mobile?: string;
+    readonly email?: string;
+    readonly countryCode: string;
+    readonly password: string;
+    readonly salt: string;
+    readonly _id: string;
+    readonly deviceId: string;
+    readonly arrearsCountdown: number;
+    readonly online: boolean;
+    readonly clientId: string;
+    readonly originAgentId: string;
+    readonly responseAgentId: string;
+    readonly status: UserStatusEnum;
+    readonly abandonReason: string;
+    readonly lostReason: string;
+    readonly from: FromEnum;
+    readonly visitCycle: number;
+    readonly purchased: boolean;
+    readonly disabled: boolean;
+    readonly geoIp: {
+        ip: string;
+        city: string;
+        region: string;
+        country: string;
+        loc: string;
+        org: string;
+        postal: string;
+        timezone: string;
+        lastUpdateDate: Date;
+    };
+}
+export interface User extends UserSafe {
+    readonly certificate: {
+        IDCARD_FRONT: CertificatePath;
+        IDCARD_BACK: CertificatePath;
+        UNI_CREDIT_CODE: CertificatePath;
+        OP_BANK_CODE: CertificatePath;
+        HAND_IDCARD: CertificatePath;
+        SETTLE_BANKCARD: CertificatePath;
+        CORP_CODE: CertificatePath;
+        BUSINESS_PLACE: CertificatePath;
+        BUSINESS_SITE: CertificatePath;
+        CASHIER_SCENE: CertificatePath;
+        OTHER_IDCARD_FRONT?: CertificatePath;
+        OTHER_IDCARD_BACK?: CertificatePath;
+        OTHER_AUTH_PHOTO?: CertificatePath;
+        FOOD_SAFETY_LICENSE?: CertificatePath;
+    };
+    readonly realInfo: {
+        type: YeepayTypeEnum;
+        toOther: boolean;
+        legalName: string;
+        merLegalPhone: string;
+        legalIdCard: string;
+        merAddress: string;
+        merProvince: string;
+        merCity: string;
+        merDistrict: string;
+        cardNo: string;
+        merFullName: string;
+        merShortName: string;
+        merCertNo: string;
+        merCertType: string;
+        merContactName: string;
+        merContactPhone: string;
+        accountLicense: string;
+        headBankCode: string;
+        bankCode: string;
+        serviceTel: string;
+        contactName: string;
+        contactPhone: string;
+        contactMobile: string;
+        contactEmail: string;
+        contactType: string;
+        bankCardPhone: string;
+        toOtherName?: string;
+        toOtherIdCard?: string;
+        licenseTimeBegin: string;
+        licenseTimeEnd: string;
+        legalTimeBegin?: string;
+        legalTimeEnd?: string;
+        merCertAddress?: string;
+    };
+    readonly pay: {
+        active: boolean;
+        company: PayCompanyEnum;
+    };
+    readonly yeepay: {
+        payRate: number;
+        userEditLock: boolean;
+        merchantNo: string;
+        merNetInOutStatus: string;
+        merNetInOutStatusRemark: string;
+        merHmacKey: string;
+        reportStatus: string;
+        configStatus: string;
+        active: boolean;
+    };
+    readonly fubei: {
+        payRate: number;
+        merchant_id: number; // 付呗商户号
+        merchant_code: string; // 付呗登陆账号
+        app_id: string;
+        app_secret: string;
+        store_id: number; // 门店id
+        sub_mch_id: string; // 当前渠道下对应的微信子商户号
+        alipay_msid: string; // 当前渠道下对应的支付宝子商户号
+        merchant_status: number; // 商户实名认证状态：0 未认证、1 认证中、2 认证成功、3 认证失败
+        wechat_auth_status: string; // 商户微信认证状态：UNAUTHORIZED 未认证、AUTHORIZED 已认证、UNKNOWN 未知
+        store_status: number; // 门店状态：1 待审核、2 审核通过、3 审核驳回
+        error_msg: string; // 错误信息
+    };
+    readonly mpAlipay?: {
+        authAppId: string;
+        componentAppId: string;
+        appRefreshToken: string;
+        appAuthToken: string;
+        templateVersion: string;
+        pid: string;
+    };
+    readonly mpWechat?: {
+        fasteRegisterStatus: string;
+        fasteRegisterMsg: string;
+        authAppId: string;
+        componentAppId: string;
+        appRefreshToken: string;
+        templateVersion: string;
+    };
+}

package/src/interfaces/visit-task/visit-task.interface.ts

@@ -1,17 +1,17 @@
-export interface VisitTask {
-    readonly _id: string;
-    readonly userId: string;
-    readonly createDate: string | Date;
-    readonly effectiveDate: string | Date;
-    readonly endDate: string | Date;
-    readonly status: string;
-    readonly countryCode: string;
-    readonly mobile: string;
-    readonly storeId: string;
-    readonly storeName: string;
-    readonly storeCreateDate: string | Date;
-    readonly userStatus: string;
-    readonly type: string;
-    readonly result: string;
-    readonly fileList: string[];
-}
+export interface VisitTask {
+    readonly _id: string;
+    readonly userId: string;
+    readonly createDate: string | Date;
+    readonly effectiveDate: string | Date;
+    readonly endDate: string | Date;
+    readonly status: string;
+    readonly countryCode: string;
+    readonly mobile: string;
+    readonly storeId: string;
+    readonly storeName: string;
+    readonly storeCreateDate: string | Date;
+    readonly userStatus: string;
+    readonly type: string;
+    readonly result: string;
+    readonly fileList: string[];
+}

package/src/order/currency-settlement.spec.ts

@@ -0,0 +1,72 @@
+import { calcLeft, calcReceivablePrice, CONST, Order, TaxTypeEnum } from '../index';
+import { order as taxOrder } from '../../josn-hub/orders/tax-order';
+
+/**
+ * @param withTax
+ */
+function createOrder(withTax = false): Order {
+    return {
+        ...taxOrder,
+        checkout: [],
+        content: [
+            {
+                ...taxOrder.content[0],
+                count: 1,
+                dishSnapshot: {
+                    ...taxOrder.content[0].dishSnapshot,
+                    price: 123,
+                    selectedSpecifications: [],
+                    noFullOrderDiscount: false,
+                    taxes: withTax ? [{ name: 'Tax', rate: 0.11 }] : [],
+                },
+            },
+        ],
+        taxType: TaxTypeEnum.PriceNoTaxBindDish,
+    };
+}
+
+describe('currency settlement precision', () => {
+    it.each(CONST.LARGE_CURRENCY)('floors all fractional boundaries for %s', (currency) => {
+        [0.01, 0.49, 0.5, 0.99].forEach((fraction) => {
+            expect(calcLeft(123 + fraction, 0, currency)).toBe(123);
+        });
+    });
+
+    it('keeps discount and tax precision until settling the final balance', () => {
+        const discount = [{ type: CONST.RECEIVABLE_PROCESSING_TYPE.DISCOUNT.TYPE, value: 7.7 }];
+        const discounted = calcReceivablePrice(createOrder(), discount);
+        expect(discounted.receivablePrice).toBe(94.71);
+        expect(calcLeft(discounted.receivablePrice, 0, '￥')).toBe(94);
+
+        const taxed = calcReceivablePrice(createOrder(true), []);
+        expect(taxed.receivablePrice).toBe(136.53);
+        expect(calcLeft(taxed.receivablePrice, 0, '￥')).toBe(136);
+
+        const both = calcReceivablePrice(createOrder(true), discount);
+        expect(both.taxArr).toEqual([{ name: 'Tax(11%)', volume: 10.42 }]);
+        expect(both.receivablePrice).toBe(105.13);
+        expect(calcLeft(both.receivablePrice, 0, '￥')).toBe(105);
+    });
+
+    it('settles partial payments and change using integer amounts', () => {
+        expect(calcLeft(94.71, 40, '￥')).toBe(54);
+        expect(calcLeft(94.71, 94, '￥')).toBe(0);
+        expect(calcLeft(100, calcLeft(94.71, 0, '￥'))).toBe(6);
+    });
+
+    it('preserves historical fractional payments before settling the remaining balance', () => {
+        expect(calcLeft(94.71, 40.71, '￥')).toBe(54);
+        expect(calcLeft(94.71, 94.71, '￥')).toBe(0);
+        expect(calcLeft(94.71, 95, '￥')).toBe(-1);
+    });
+
+    it('does not hide a negative balance smaller than one unit', () => {
+        expect(calcLeft(0, 0.01, '￥')).toBe(-1);
+    });
+
+    it('preserves two-decimal precision for ordinary currencies and existing callers', () => {
+        expect(calcLeft(94.71, 40, '$')).toBe(54.71);
+        expect(calcLeft(94.71, 40)).toBe(54.71);
+        expect(calcLeft(100.5, 94.71, '$')).toBe(5.79);
+    });
+});

package/src/order/index.ts

@@ -1,91 +1,91 @@
-import {
-    DishType,
-    Order,
-    CONST,
-    getNameFromNames,
-    Content,
-    calcBuffetTotalPrice,
-    calcContentPrice,
-    OrderTypeEnum,
-} from '../index';
-
-export interface PrinteDishInfo {
-    name: string;
-    count: number;
-    price: number;
-    specifications: string[];
-    note?: string;
-}
-
-/**
- *
- */
-export function getDishArrFromContents({
-    contents,
-    lang,
-    order,
-    showBuffet,
-    text,
-    addSpecificationsAfterName,
-}: {
-    contents: Content[];
-    lang: string;
-    order: Order;
-    showBuffet?: boolean;
-    text?: {
-        adult: string;
-        child: string;
-    };
-    addSpecificationsAfterName?: boolean;
-}): PrinteDishInfo[] {
-    const result: PrinteDishInfo[] = contents.map((dishGroup) => {
-        const selectedNames = [];
-        dishGroup.dishSnapshot.selectedSpecifications.forEach((selectedItems) => {
-            selectedItems.content.forEach((tag) => {
-                selectedNames.push(tag.name);
-            });
-        });
-        let name = getNameFromNames(dishGroup.dishSnapshot.names, lang, CONST.DEFALUT_LANGUAGE) || '';
-        if (dishGroup.dishSnapshot.type === DishType.Weigh) {
-            name += `(${dishGroup.weight}${
-                getNameFromNames(dishGroup.dishSnapshot.units, lang, CONST.DEFALUT_LANGUAGE) || ''
-            })`;
-        }
-        return {
-            name,
-            count: dishGroup.count,
-            price:
-                calcContentPrice({
-                    orderContentItem: dishGroup,
-                    buffetItem: order.buffet?.snapshot,
-                    orderType: order.type,
-                    adultNum: order.adultNum,
-                    childNum: order.childNum,
-                    contents: order.content,
-                }) / dishGroup.count,
-            specifications: selectedNames,
-            note: dishGroup.note,
-        };
-    });
-    if (showBuffet && order.type === OrderTypeEnum.Buffet) {
-        const specifications = [];
-        if (order.adultNum) {
-            specifications.push(`${text?.adult}${order.adultNum}`);
-        }
-        if (order.childNum) {
-            specifications.push(`${text?.child}${order.childNum}`);
-        }
-        result.unshift({
-            name: getNameFromNames(order.buffet.snapshot.names, lang, CONST.DEFALUT_LANGUAGE),
-            count: 1,
-            price: calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum),
-            specifications: specifications,
-        });
-    }
-    if (addSpecificationsAfterName) {
-        result.forEach((item) => {
-            item.name += item.specifications.length > 0 ? `(${item.specifications.join()})` : '';
-        });
-    }
-    return result;
-}
+import {
+    DishType,
+    Order,
+    CONST,
+    getNameFromNames,
+    Content,
+    calcBuffetTotalPrice,
+    calcContentPrice,
+    OrderTypeEnum,
+} from '../index';
+
+export interface PrinteDishInfo {
+    name: string;
+    count: number;
+    price: number;
+    specifications: string[];
+    note?: string;
+}
+
+/**
+ *
+ */
+export function getDishArrFromContents({
+    contents,
+    lang,
+    order,
+    showBuffet,
+    text,
+    addSpecificationsAfterName,
+}: {
+    contents: Content[];
+    lang: string;
+    order: Order;
+    showBuffet?: boolean;
+    text?: {
+        adult: string;
+        child: string;
+    };
+    addSpecificationsAfterName?: boolean;
+}): PrinteDishInfo[] {
+    const result: PrinteDishInfo[] = contents.map((dishGroup) => {
+        const selectedNames = [];
+        dishGroup.dishSnapshot.selectedSpecifications.forEach((selectedItems) => {
+            selectedItems.content.forEach((tag) => {
+                selectedNames.push(tag.name);
+            });
+        });
+        let name = getNameFromNames(dishGroup.dishSnapshot.names, lang, CONST.DEFALUT_LANGUAGE) || '';
+        if (dishGroup.dishSnapshot.type === DishType.Weigh) {
+            name += `(${dishGroup.weight}${
+                getNameFromNames(dishGroup.dishSnapshot.units, lang, CONST.DEFALUT_LANGUAGE) || ''
+            })`;
+        }
+        return {
+            name,
+            count: dishGroup.count,
+            price:
+                calcContentPrice({
+                    orderContentItem: dishGroup,
+                    buffetItem: order.buffet?.snapshot,
+                    orderType: order.type,
+                    adultNum: order.adultNum,
+                    childNum: order.childNum,
+                    contents: order.content,
+                }) / dishGroup.count,
+            specifications: selectedNames,
+            note: dishGroup.note,
+        };
+    });
+    if (showBuffet && order.type === OrderTypeEnum.Buffet) {
+        const specifications = [];
+        if (order.adultNum) {
+            specifications.push(`${text?.adult}${order.adultNum}`);
+        }
+        if (order.childNum) {
+            specifications.push(`${text?.child}${order.childNum}`);
+        }
+        result.unshift({
+            name: getNameFromNames(order.buffet.snapshot.names, lang, CONST.DEFALUT_LANGUAGE),
+            count: 1,
+            price: calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum),
+            specifications: specifications,
+        });
+    }
+    if (addSpecificationsAfterName) {
+        result.forEach((item) => {
+            item.name += item.specifications.length > 0 ? `(${item.specifications.join()})` : '';
+        });
+    }
+    return result;
+}