@be-link/pos-cli-nodejs 1.0.60 → 1.0.62

package/package.json

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

package/pos/modules/orderCore/service.d.ts

@@ -30,6 +30,7 @@ declare class OrderCoreService extends BaseService implements Service.OrderCoreC
         orderId: string;
         isPaidCheck: boolean;
     }): Promise<void>;
+    orderCreateV2(request: Service.Request.orderCreateV2): Promise<Service.Response.orderCreateV2>;
 }
 declare const orderCoreService: OrderCoreService;
 export default orderCoreService;

package/pos/modules/orderCore/service.js

@@ -76,6 +76,9 @@ class OrderCoreService extends service_1.default {
     compensateOrderPended(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.compensateOrderPended), request);
     }
+    orderCreateV2(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.orderCreateV2), request);
+    }
 }
 const orderCoreService = new OrderCoreService();
 exports.default = orderCoreService;

package/pos/modules/orderCore/types.d.ts

@@ -122,6 +122,111 @@ export declare namespace Service {
                 rightsIds?: string[];
             };
         }
+        interface orderCreateV2 {
+            /** 基础信息 */
+            basicInfo: {
+                /** 用户id */
+                unionId: string;
+                /** 实际支付 */
+                actuallyPaidFee: number;
+                /** 交易场景 */
+                sceneInfo: {
+                    /** 场景1 */
+                    scene1: string;
+                    /** 场景2 */
+                    scene2: string;
+                    /** app场景 */
+                    appScene: number;
+                };
+                /** 用户openId */
+                openId: string;
+                /** 用户订单备注 */
+                orderNote: string;
+                /** 来源人Id */
+                fromUnionId: string;
+                /** 来源人身份 */
+                fromUserRole: string;
+                /** 主单Id */
+                rootOrderId: string;
+                /** 联系人 */
+                contactInfo: {
+                    /** 联系人姓名 */
+                    name: string;
+                    /** 联系人手机号 */
+                    mobile: string;
+                    /** 身份证号 */
+                    idCard?: string;
+                };
+            };
+            /** 出行人信息 */
+            tourismInfo: {
+                /** 出行人id列表 */
+                touristIdList: string[];
+            };
+            /** 商品信息 */
+            itemInfo: {
+                /** 商品ID */
+                id: string;
+                /** 商品二级分类 */
+                categoryTwo: string;
+                /** 套餐信息 */
+                combos: {
+                    /** 套餐ID */
+                    id: string;
+                    /** SKU ID列表 */
+                    skus: string[];
+                    /** SKU购买份数 */
+                    quantity: number;
+                    /** 快捷套餐ID */
+                    comboShortcutId?: string;
+                }[];
+            };
+            /** 班车信息 */
+            shuttleBusInfo: {
+                /** 关系id */
+                relationId: string;
+                /** 班车类型 */
+                quantity: number;
+            };
+            /** 优惠开关 */
+            switches: {
+                /** 是否使用单品券 */
+                useItemCoupon?: boolean;
+                /** 是否使用订单券 */
+                useOrderCoupon?: boolean;
+                /** 是否使用金币抵扣 */
+                useCreditCoin?: boolean;
+                /** 是否使用会员价 */
+                useMemberPrice?: boolean;
+                /** 是否使用连住优惠 */
+                useStayMoreSaveMoreActivity?: boolean;
+            };
+            /** 房型信息 */
+            roomInfo?: {
+                /** 房型ID */
+                roomId: string;
+                /** 份数 */
+                quantity: number;
+            }[];
+            /** 履约信息 */
+            fulfillInfo?: {
+                /** 生日蛋糕券码 */
+                cakeCouponCode?: string;
+                /** 权益id */
+                rightsIds?: string[];
+            };
+            /** 订单备注 */
+            orderNote?: string;
+            /** 拼团信息 */
+            groupBookingInfo?: {
+                /** 是否是拼团子单 */
+                isGroupSubOrder: boolean;
+                /** 是否是拼团主单 */
+                isGroupMainOrder: boolean;
+                /** 拼团类型: 默认0, 1代表A类, 2代表B类, 依次累加 */
+                groupBookingType: number;
+            };
+        }
         interface thirdOrderInfoConfirmed {
             /** 订单id */
             tradeOrderId: string;
@@ -284,6 +389,26 @@ export declare namespace Service {
                 paySign: string;
             };
         }
+        interface orderCreateV2 {
+            orderId: string;
+            /** 是否是微信渠道交易 */
+            isWxChannelTrade: boolean;
+            /** 微信支付参数 */
+            wxPaymentParam: {
+                /** appId */
+                appId: string;
+                /** 支付时间戳 */
+                timeStamp: string;
+                /** 随机字符串 */
+                nonceStr: string;
+                /** 订单详情扩展字符串 */
+                package: string;
+                /** 签名类型 */
+                signType: string;
+                /** 支付签名 */
+                paySign: string;
+            };
+        }
     }
     interface OrderCoreController {
         /**
@@ -392,5 +517,7 @@ export declare namespace Service {
             orderId: string;
             isPaidCheck: boolean;
         }): Promise<void>;
+        /** 创建订单 */
+        orderCreateV2(request: Request.orderCreateV2): Promise<Response.orderCreateV2>;
     }
 }

package/types.d.ts

@@ -453,9 +453,6 @@ export interface IPositiveShuttleBusSkuInfo {
     departureDate: number;
     relationInfo: {
         id: string;
-        createdAt: number;
-        updatedAt: number;
-        deletedAt: number;
         itemId: string;
         supplierId: string;
         routeId: string;
@@ -464,7 +461,7 @@ export interface IPositiveShuttleBusSkuInfo {
         settlementPrice: number;
         saleDesc: string;
         minOrderCount: number;
-        isLimitStock: number;
+        isLimitStock: boolean;
         pickUpTime: string;
     };
     type: PosConstants.SkuTypeEnum;
@@ -477,10 +474,13 @@ export type IPositiveOrderComboInfo = {
     id: string;
     createdAt: number;
     updatedAt: number;
+    deletedAt: number;
     orderId: string;
-    comboInfo: CSDto.IItemCombo & {
+    itemId: string;
+    comboInfo: (CSDto.IItemCombo | CSDto.IItemComboShortcut) & {
         nightNum: number;
-    } | CSDto.IItemComboShortcut;
+        displayName: string;
+    };
     comboId: string;
     type: PosConstants.ComboTypeEnum;
 };
@@ -556,6 +556,7 @@ export interface IPositiveRoomInfo {
     orderId: string;
     roomInfo: ServiceVenueDto.ServiceVenue.Response.IGetRoomTypeInfoRes;
     roomId: string;
+    venueId: string;
 }
 export interface IPositiveVenueInfo {
     id: string;
@@ -727,19 +728,13 @@ export interface IPositiveFulfillmentInfo {
     /** 订单 ID */
     positiveOrderId: string;
     /** 房间信息。 */
-    roomInfo: {
-        /** 房间单人床数量。 */
-        DOUBLE_BED: {
-            count: number;
-            remain: number;
-        };
-        /** 房间双人床数量。 */
-        SINGLE_BED: {
-            count: number;
-            remain: number;
-        };
-    };
-    /** 定制餐食信息。 */
+    roomInfo: Record<string, {
+        /** 房间单人床数量 */
+        count: number;
+        /** 房间剩余数量 */
+        remain: number;
+    }>;
+    /** 定制餐食信息 */
     customMealInfo: string;
     /** 权益信息 */
     rightsInfo: string[];
@@ -954,10 +949,10 @@ export interface IRawOrderStructure {
         skus: IPositiveSkuInfo[];
         storeInfo?: IStore;
     })[];
-    itemInfo?: IPositiveItemInfoV2;
-    skuInfoList?: (IPositiveSkuInfoV2 | IPositiveShuttleBusSkuInfo)[];
-    comboInfoList?: IPositiveOrderComboInfo[];
-    roomInfoList?: IPositiveRoomInfo[];
+    itemInfo?: IPositiveItemInfoV2[];
+    skuInfo?: (IPositiveSkuInfoV2 | IPositiveShuttleBusSkuInfo)[];
+    comboInfo?: IPositiveOrderComboInfo[];
+    roomInfo?: IPositiveRoomInfo[];
     venueInfo?: IPositiveVenueInfo[];
     feeDetailInfo?: IPositiveFeeDetailInfo[];
     paymentInfo?: IPositivePaymentInfo[];

package/utils/posProxy/comboInfoProxy.d.ts

@@ -7,6 +7,7 @@ export declare abstract class ComboInfoProxy {
     abstract get nightNum(): number | undefined;
     abstract get minOrderCount(): number | undefined;
     abstract get type(): ComboTypeEnum | undefined;
+    abstract get displayName(): string | undefined;
 }
 declare class ComboInfoProxyV1 extends ComboInfoProxy {
     private readonly orderComboInfo;
@@ -17,6 +18,7 @@ declare class ComboInfoProxyV1 extends ComboInfoProxy {
     get nightNum(): number | undefined;
     get minOrderCount(): number;
     get type(): ComboTypeEnum;
+    get displayName(): string | undefined;
 }
 declare class ComboInfoProxyV2 extends ComboInfoProxy {
     private readonly orderComboInfo;
@@ -27,6 +29,7 @@ declare class ComboInfoProxyV2 extends ComboInfoProxy {
     get nightNum(): number;
     get minOrderCount(): number | undefined;
     get type(): ComboTypeEnum;
+    get displayName(): string;
 }
 export declare function createComboInfoProxy(orderComboInfo: PosDto.IPositiveOrderComboInfo | PosDto.IPositiveSkuInfo, version: 'V1' | 'V2'): ComboInfoProxyV1 | ComboInfoProxyV2;
 export {};

package/utils/posProxy/comboInfoProxy.js

@@ -17,6 +17,7 @@ class ComboInfoProxyV1 extends ComboInfoProxy {
     get nightNum() { return this.orderComboInfo.costDays ? this.orderComboInfo.costDays - 1 : undefined; }
     get minOrderCount() { return this.orderComboInfo.minOrderQuantity; }
     get type() { return pos_1.ComboTypeEnum.BASIC; }
+    get displayName() { return this.orderComboInfo.combo; }
 }
 class ComboInfoProxyV2 extends ComboInfoProxy {
     constructor(orderComboInfo) {
@@ -30,6 +31,7 @@ class ComboInfoProxyV2 extends ComboInfoProxy {
     get nightNum() { return this.orderComboInfo.comboInfo.nightNum; }
     get minOrderCount() { return 'minOrderCount' in this.orderComboInfo.comboInfo ? this.orderComboInfo.comboInfo.minOrderCount : undefined; }
     get type() { return this.orderComboInfo.type; }
+    get displayName() { return this.orderComboInfo.comboInfo.displayName; }
 }
 function createComboInfoProxy(orderComboInfo, version) {
     if (version === 'V2')

package/utils/posProxy/skuInfoProxy.d.ts

@@ -8,6 +8,8 @@ export declare abstract class SkuInfoProxy {
     abstract get memberPriceLimitTimes(): number | undefined;
     abstract get settlementPrice(): number;
     abstract get quantity(): number;
+    abstract get remainQuantity(): number;
+    /** @deprecated 请使用 `remainQuantity` 代替 */
     abstract get remainingQuantity(): number;
     abstract get departureDate(): number;
     abstract get type(): SkuTypeEnum;
@@ -28,6 +30,7 @@ declare class SkuInfoProxyV1 extends SkuInfoProxy {
     get memberPriceLimitTimes(): number | undefined;
     get settlementPrice(): number;
     get quantity(): number;
+    get remainQuantity(): number;
     get remainingQuantity(): number;
     get departureDate(): number;
     get costDays(): number | undefined;
@@ -49,6 +52,7 @@ declare class SkuInfoProxyV2 extends SkuInfoProxy {
     get memberPriceLimitTimes(): number;
     get settlementPrice(): number;
     get quantity(): number;
+    get remainQuantity(): number;
     get remainingQuantity(): number;
     get departureDate(): number;
     get type(): SkuTypeEnum;
@@ -69,6 +73,7 @@ declare class ShuttleBusSkuInfoProxyV2 extends SkuInfoProxy {
     get memberPriceLimitTimes(): undefined;
     get settlementPrice(): number;
     get quantity(): number;
+    get remainQuantity(): number;
     get remainingQuantity(): number;
     get departureDate(): number;
     get type(): SkuTypeEnum;

package/utils/posProxy/skuInfoProxy.js

@@ -20,6 +20,7 @@ class SkuInfoProxyV1 extends SkuInfoProxy {
     get memberPriceLimitTimes() { return this.orderSkuInfo.memberPriceLimitTimes; }
     get settlementPrice() { return this.orderSkuInfo.settlementPrice; }
     get quantity() { return this.orderSkuInfo.quantity; }
+    get remainQuantity() { return this.orderSkuInfo.remainQuantity; }
     get remainingQuantity() { return this.orderSkuInfo.remainQuantity; }
     get departureDate() { return this.orderSkuInfo.departureDate; }
     get costDays() { return this.orderSkuInfo.costDays; }
@@ -46,6 +47,7 @@ class SkuInfoProxyV2 extends SkuInfoProxy {
     get memberPriceLimitTimes() { return this.orderSkuInfo.memberPriceLimitCnt; }
     get settlementPrice() { return this.orderSkuInfo.settlementPrice; }
     get quantity() { return this.orderSkuInfo.quantity; }
+    get remainQuantity() { return this.orderSkuInfo.remainQuantity; }
     get remainingQuantity() { return this.orderSkuInfo.remainQuantity; }
     get departureDate() { return this.orderSkuInfo.departureDate; }
     get type() { return this.orderSkuInfo.type; }
@@ -71,6 +73,7 @@ class ShuttleBusSkuInfoProxyV2 extends SkuInfoProxy {
     get memberPriceLimitTimes() { return undefined; }
     get settlementPrice() { return this.orderSkuInfo.relationInfo.settlementPrice; }
     get quantity() { return this.orderSkuInfo.quantity; }
+    get remainQuantity() { return this.orderSkuInfo.remainQuantity; }
     get remainingQuantity() { return this.orderSkuInfo.remainQuantity; }
     get departureDate() { return this.orderSkuInfo.departureDate; }
     get type() { return this.orderSkuInfo.type; }