@be-link/pos-cli-nodejs 1.0.51-beta.4 → 1.0.51-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "1.0.51-beta.4",
+  "version": "1.0.51-beta.5",
   "description": "正向订单服务Nodejs客户端",
   "main": "index.js",
   "scripts": {

package/types.d.ts

@@ -450,6 +450,7 @@ export interface IPositiveSkuInfoV2 {
 export interface IPositiveShuttleBusSkuInfo {
     itemId: string;
     quantity: number;
+    departureDate: number;
     relationInfo: {
         id: string;
         createdAt: number;
@@ -477,7 +478,9 @@ export type IPositiveOrderComboInfo = {
     createdAt: number;
     updatedAt: number;
     orderId: string;
-    comboInfo: CSDto.IItemCombo | CSDto.IItemComboShortcut;
+    comboInfo: CSDto.IItemCombo & {
+        nightNum: number;
+    } | CSDto.IItemComboShortcut;
     comboId: string;
     type: PosConstants.ComboTypeEnum;
 };

package/utils/posProxy/comboInfoProxy.d.ts

@@ -2,18 +2,24 @@ import { PosDto } from '../..';
 export declare abstract class ComboInfoProxy {
     abstract get raw(): PosDto.IPositiveOrderComboInfo | PosDto.IPositiveSkuInfo;
     abstract get name(): string | undefined;
+    abstract get costDays(): number | undefined;
+    abstract get nightNum(): number | undefined;
 }
 declare class ComboInfoProxyV1 extends ComboInfoProxy {
     private readonly orderComboInfo;
     constructor(orderComboInfo: PosDto.IPositiveSkuInfo);
     get raw(): PosDto.IPositiveSkuInfo;
     get name(): string | undefined;
+    get costDays(): number | undefined;
+    get nightNum(): number | undefined;
 }
 declare class ComboInfoProxyV2 extends ComboInfoProxy {
     private readonly orderComboInfo;
     constructor(orderComboInfo: PosDto.IPositiveOrderComboInfo);
     get raw(): PosDto.IPositiveOrderComboInfo;
     get name(): string;
+    get costDays(): number;
+    get nightNum(): number;
 }
 export declare function createComboInfoProxy(orderComboInfo: PosDto.IPositiveOrderComboInfo | PosDto.IPositiveSkuInfo, version: 'V1' | 'V2'): ComboInfoProxyV1 | ComboInfoProxyV2;
 export {};

package/utils/posProxy/comboInfoProxy.js

@@ -12,6 +12,8 @@ class ComboInfoProxyV1 extends ComboInfoProxy {
     // share
     get raw() { return this.orderComboInfo; }
     get name() { return this.orderComboInfo.combo; }
+    get costDays() { return this.orderComboInfo.costDays; }
+    get nightNum() { return this.orderComboInfo.costDays ? this.orderComboInfo.costDays - 1 : undefined; }
 }
 class ComboInfoProxyV2 extends ComboInfoProxy {
     constructor(orderComboInfo) {
@@ -21,6 +23,8 @@ class ComboInfoProxyV2 extends ComboInfoProxy {
     // share
     get raw() { return this.orderComboInfo; }
     get name() { return this.orderComboInfo.comboInfo.name; }
+    get costDays() { return this.orderComboInfo.comboInfo.nightNum + 1; }
+    get nightNum() { return this.orderComboInfo.comboInfo.nightNum; }
 }
 function createComboInfoProxy(orderComboInfo, version) {
     if (version === 'V2')

package/utils/posProxy/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const pos_1 = require("vitality-meta/enums/pos");
 const comboInfoProxy_1 = require("./comboInfoProxy");
 const itemInfoProxy_1 = require("./itemInfoProxy");
 const skuInfoProxy_1 = require("./skuInfoProxy");
@@ -20,7 +19,7 @@ class PosProxyFactory {
         if (order.skuInfo) {
             skuInfoProxy = order.skuInfo.map(sku => (0, skuInfoProxy_1.createSkuInfoProxy)(sku, version, sku.type));
             if (version === 'V1')
-                comboInfoProxy = order.skuInfo.filter(sku => sku.type === pos_1.SkuTypeEnum.ITEM).map(sku => (0, comboInfoProxy_1.createComboInfoProxy)(sku, version));
+                comboInfoProxy = [(0, comboInfoProxy_1.createComboInfoProxy)(order.skuInfo[0], version)];
         }
         if (order.comboInfo) {
             comboInfoProxy = order.comboInfo.map(combo => (0, comboInfoProxy_1.createComboInfoProxy)(combo, version));

package/utils/posProxy/skuInfoProxy.d.ts

@@ -9,6 +9,7 @@ export declare abstract class SkuInfoProxy {
     abstract get settlementPrice(): number;
     abstract get quantity(): number;
     abstract get remainingQuantity(): number;
+    abstract get departureDate(): number;
     abstract get applicablePeople(): string | undefined;
     abstract get singleRoomPrice(): number | undefined;
     abstract get singleRoomSettlementPrice(): number | undefined;
@@ -45,6 +46,7 @@ declare class SkuInfoProxyV2 extends SkuInfoProxy {
     get settlementPrice(): number;
     get quantity(): number;
     get remainingQuantity(): number;
+    get departureDate(): number;
     get applicablePeople(): undefined;
     get singleRoomPrice(): number;
     get singleRoomSettlementPrice(): number;
@@ -62,6 +64,7 @@ declare class ShuttleBusSkuInfoProxyV2 extends SkuInfoProxy {
     get settlementPrice(): number;
     get quantity(): number;
     get remainingQuantity(): number;
+    get departureDate(): number;
     get applicablePeople(): undefined;
     get singleRoomPrice(): undefined;
     get singleRoomSettlementPrice(): undefined;

package/utils/posProxy/skuInfoProxy.js

@@ -45,6 +45,7 @@ class SkuInfoProxyV2 extends SkuInfoProxy {
     get settlementPrice() { return this.orderSkuInfo.settlementPrice; }
     get quantity() { return this.orderSkuInfo.quantity; }
     get remainingQuantity() { return this.orderSkuInfo.remainQuantity; }
+    get departureDate() { return this.orderSkuInfo.departureDate; }
     // uniq V1
     get applicablePeople() { return undefined; }
     // uniq item V2
@@ -67,6 +68,7 @@ class ShuttleBusSkuInfoProxyV2 extends SkuInfoProxy {
     get settlementPrice() { return this.orderSkuInfo.relationInfo.settlementPrice; }
     get quantity() { return this.orderSkuInfo.quantity; }
     get remainingQuantity() { return this.orderSkuInfo.remainQuantity; }
+    get departureDate() { return this.orderSkuInfo.departureDate; }
     // uniq V1
     get applicablePeople() { return undefined; }
     // uniq V2