@trusted-solutions/sdit.models 0.66.0-alpha.1 → 0.66.0-alpha.3

package/lambda/online-ordering.d.ts

@@ -1,4 +1,4 @@
-import { Address, DayOfWeekTimePeriod, GalleryConfig, Operator, PointProvider } from '../models/store';
+import { Address, DayOfWeekTimePeriod, DeliveryFeeConfig, GalleryConfig, Operator, PointProvider } from '../models/store';
 import { CustomerPointDetail, MultiLanguageText, OrderDiscount } from '../models';
 import { PaymentServiceProvider, ServeType } from '../enums';
 import { SOPublicMenu, SOPublicCategory, SOPublicProduct, SOPublicProductAttribute, SOPublicProductAttributeCategory, SOPaymentMethod, SOValidateCart, SOOrderState, SOOrder, SOEater, SOPublicDiscountRule, SOMemberCoupon } from '../models/online-ordering';
@@ -139,6 +139,13 @@ export interface SOGetStoreInfoResponse {
      * 0=沒有限制
      */
     storeDeliveryDistanceLimit: number;
+    /** 新版外送費規則；未設定時仍依舊版三個 storeDelivery 欄位。 */
+    deliveryFeeConfig?: DeliveryFeeConfig;
+    /**
+     * 是否可使用地址定位與距離計算。
+     * 此值由後端依門市合約權限衍生，前端不得自行用方案 ID 推導。
+     */
+    deliveryLocationEnabled: boolean;
     /**
      * 內用桌ID
      */
@@ -315,6 +322,25 @@ export interface SOValidateMutationRequest {
     isUsePoints?: boolean;
     /** 要套用的會員優惠券 ID */
     memberCouponId?: string;
+    /** 消費者填寫的結構化外送地址。 */
+    deliveryAddress?: Address;
+    /**
+     * PROMAX 定位流程由後端簽發的短效 quote。
+     * 不接受由瀏覽器自行傳入的距離作為計價依據。
+     */
+    deliveryLocationQuoteId?: string;
+}
+/** 請求後端建立 PROMAX 外送定位與距離 quote。 */
+export interface SOCreateDeliveryLocationQuoteRequest {
+    storeId: string;
+    deliveryAddress: Address;
+}
+/** 後端簽發的短效配送 quote；座標與距離只供本次下單流程使用。 */
+export interface SOCreateDeliveryLocationQuoteResponse {
+    quoteId: string;
+    deliveryAddressLonLat: [number, number];
+    distanceKm: number;
+    expiresAt: number;
 }
 /**
  * @throw `SOOrderError`
@@ -415,6 +441,11 @@ export interface SOSendOrderRequest {
      * 這是消費者收件位置，不應從店家設定推導；serveType === deliveryByStore 時建議送出。
      */
     deliveryAddressLonLat?: number[];
+    /** 下單前驗價使用的配送距離（公里）。 */
+    /** @deprecated 改用 deliveryLocationQuoteId，後端不再信任瀏覽器傳入的距離。 */
+    deliveryDistanceKm?: number;
+    /** PROMAX 定位流程由後端簽發的短效配送 quote。 */
+    deliveryLocationQuoteId?: string;
     /** 內用桌ID serveType === dineIn 時有效 */
     tableId?: string;
     /** 折抵點數 */

package/lambda/request/delivery.d.ts

@@ -0,0 +1,16 @@
+import { DeliveryProvider } from '../../models/delivery';
+export interface GetStoreDeliveryProviderRequest {
+    storeId: string;
+    provider: DeliveryProvider;
+}
+/** 僅供受權限的 Admin 設定第三方物流門市資料。 */
+export interface UpsertStoreDeliveryProviderRequest {
+    storeId: string;
+    provider: DeliveryProvider;
+    providerStoreId: string;
+    enabled: boolean;
+    credentials: {
+        clientId: string;
+        clientSecret: string;
+    };
+}

package/lambda/request/delivery.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=delivery.js.map

package/lambda/request/delivery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../../../projects/sdit-model-lib/src/lambda/request/delivery.ts"],"names":[],"mappings":""}

package/lambda/request/index.d.ts

@@ -19,3 +19,4 @@ export * from './real-time-switch';
 export * from './custom-analysis-group';
 export * from './import-data';
 export * from './item-availability';
+export * from './delivery';

package/lambda/request/index.js

@@ -22,4 +22,5 @@ tslib_1.__exportStar(require("./real-time-switch"), exports);
 tslib_1.__exportStar(require("./custom-analysis-group"), exports);
 tslib_1.__exportStar(require("./import-data"), exports);
 tslib_1.__exportStar(require("./item-availability"), exports);
+tslib_1.__exportStar(require("./delivery"), exports);
 //# sourceMappingURL=index.js.map

package/lambda/request/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/sdit-model-lib/src/lambda/request/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,iDAAuB;AACvB,kDAAwB;AACxB,oDAA0B;AAC1B,iDAAuB;AACvB,oDAA0B;AAC1B,kDAAwB;AACxB,qDAA2B;AAC3B,mDAAyB;AACzB,kDAAwB;AACxB,qDAA2B;AAC3B,4DAAkC;AAClC,yDAA+B;AAC/B,oDAA0B;AAC1B,oDAA0B;AAC1B,oDAA0B;AAC1B,kDAAwB;AACxB,6DAAmC;AACnC,kEAAwC;AACxC,wDAA8B;AAC9B,8DAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/sdit-model-lib/src/lambda/request/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,iDAAuB;AACvB,kDAAwB;AACxB,oDAA0B;AAC1B,iDAAuB;AACvB,oDAA0B;AAC1B,kDAAwB;AACxB,qDAA2B;AAC3B,mDAAyB;AACzB,kDAAwB;AACxB,qDAA2B;AAC3B,4DAAkC;AAClC,yDAA+B;AAC/B,oDAA0B;AAC1B,oDAA0B;AAC1B,oDAA0B;AAC1B,kDAAwB;AACxB,6DAAmC;AACnC,kEAAwC;AACxC,wDAA8B;AAC9B,8DAAoC;AACpC,qDAA2B"}

package/lambda/response/delivery.d.ts

@@ -0,0 +1,7 @@
+import { StoreDeliveryProvider } from '../../models/delivery';
+export interface GetStoreDeliveryProviderResponse {
+    item?: StoreDeliveryProvider;
+}
+export interface UpsertStoreDeliveryProviderResponse {
+    item: StoreDeliveryProvider;
+}

package/lambda/response/delivery.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=delivery.js.map

package/lambda/response/delivery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../../../projects/sdit-model-lib/src/lambda/response/delivery.ts"],"names":[],"mappings":""}

package/lambda/response/index.d.ts

@@ -16,3 +16,4 @@ export * from './closing';
 export * from './chain';
 export * from './custom-analysis-group';
 export * from './item-availability';
+export * from './delivery';

package/lambda/response/index.js

@@ -19,4 +19,5 @@ tslib_1.__exportStar(require("./closing"), exports);
 tslib_1.__exportStar(require("./chain"), exports);
 tslib_1.__exportStar(require("./custom-analysis-group"), exports);
 tslib_1.__exportStar(require("./item-availability"), exports);
+tslib_1.__exportStar(require("./delivery"), exports);
 //# sourceMappingURL=index.js.map

package/lambda/response/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/sdit-model-lib/src/lambda/response/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,iDAAuB;AACvB,kDAAwB;AACxB,oDAA0B;AAC1B,iDAAuB;AACvB,oDAA0B;AAC1B,kDAAwB;AACxB,qDAA2B;AAC3B,mDAAyB;AACzB,kDAAwB;AACxB,qDAA2B;AAC3B,4DAAkC;AAClC,oDAA0B;AAC1B,oDAA0B;AAC1B,oDAA0B;AAC1B,kDAAwB;AACxB,kEAAwC;AACxC,8DAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/sdit-model-lib/src/lambda/response/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,iDAAuB;AACvB,kDAAwB;AACxB,oDAA0B;AAC1B,iDAAuB;AACvB,oDAA0B;AAC1B,kDAAwB;AACxB,qDAA2B;AAC3B,mDAAyB;AACzB,kDAAwB;AACxB,qDAA2B;AAC3B,4DAAkC;AAClC,oDAA0B;AAC1B,oDAA0B;AAC1B,oDAA0B;AAC1B,kDAAwB;AACxB,kEAAwC;AACxC,8DAAoC;AACpC,qDAA2B"}

package/models/delivery.d.ts

@@ -25,11 +25,31 @@ export interface DeliveryTaskProviderData {
 export declare enum DeliveryProvider {
     METE = "METE"
 }
+/**
+ * 儲存在 TS-SDIT-DataTable 的 StoreDeliveryProvider:* 項目。
+ * credentials 依產品決策以明文保存；此模型只能由專用的管理 Lambda 讀寫。
+ */
+export interface StoreDeliveryProvider {
+    storeId: string;
+    provider: DeliveryProvider;
+    providerStoreId: string;
+    enabled: boolean;
+    credentials: {
+        clientId: string;
+        clientSecret: string;
+    };
+    schemaVersion: 1;
+    createdBy?: string;
+    createdAt?: number;
+    updatedAt?: number;
+}
 /** POS/backend 使用的標準化第三方配送任務資料。 */
 export interface DeliveryTask {
     provider: DeliveryProvider;
     /** 我們給第三方的訂單 ID；目前 METE 使用 POS orderNo。 */
     clientOrderId: string;
+    /** 店家、司機與前端用來顯示及核對的配送編號。 */
+    deliveryReferenceOrderId: string;
     /** 第三方平台自己的配送單號。 */
     providerOrderId?: string;
     normalizedStatus?: DeliveryTaskStatus;

package/models/online-ordering.d.ts

@@ -104,6 +104,8 @@ export interface SOCart {
 export interface SODeliveryTask {
     /** 外送服務商，目前為 METE */
     provider: DeliveryProvider;
+    /** 店家、司機與前端用來顯示及核對的配送編號 */
+    deliveryReferenceOrderId: string;
     /** 後端標準化後的外送狀態 */
     normalizedStatus?: DeliveryTaskStatus;
     /** 配送狀態發生時間，timestamp ms */

package/models/online-ordering.js.map

@@ -1 +1 @@
-{"version":3,"file":"online-ordering.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/online-ordering.ts"],"names":[],"mappings":";;;AAiBA,IAAY,gBAmBX;AAnBD,WAAY,gBAAgB;IAC1B,YAAY;IACZ,qDAAiC,CAAA;IACjC,eAAe;IACf,iEAA6C,CAAA;IAC7C,WAAW;IACX,+CAA2B,CAAA;IAC3B,aAAa;IACb,mDAA+B,CAAA;IAC/B,YAAY;IACZ,uDAAmC,CAAA;IACnC,gBAAgB;IAChB,uDAAmC,CAAA;IACnC,YAAY;IACZ,6DAAyC,CAAA;IACzC,YAAY;IACZ,2DAAuC,CAAA;IACvC,cAAc;IACd,2DAAuC,CAAA;AACzC,CAAC,EAnBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAmB3B;AAoED,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AA8JD,IAAY,+BAGX;AAHD,WAAY,+BAA+B;IACzC,sDAAmB,CAAA;IACnB,kEAA+B,CAAA;AACjC,CAAC,EAHW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAG1C;AAuCD,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;AACvB,CAAC,EANW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAMvB"}
+{"version":3,"file":"online-ordering.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/online-ordering.ts"],"names":[],"mappings":";;;AAiBA,IAAY,gBAmBX;AAnBD,WAAY,gBAAgB;IAC1B,YAAY;IACZ,qDAAiC,CAAA;IACjC,eAAe;IACf,iEAA6C,CAAA;IAC7C,WAAW;IACX,+CAA2B,CAAA;IAC3B,aAAa;IACb,mDAA+B,CAAA;IAC/B,YAAY;IACZ,uDAAmC,CAAA;IACnC,gBAAgB;IAChB,uDAAmC,CAAA;IACnC,YAAY;IACZ,6DAAyC,CAAA;IACzC,YAAY;IACZ,2DAAuC,CAAA;IACvC,cAAc;IACd,2DAAuC,CAAA;AACzC,CAAC,EAnBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAmB3B;AAoED,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAgKD,IAAY,+BAGX;AAHD,WAAY,+BAA+B;IACzC,sDAAmB,CAAA;IACnB,kEAA+B,CAAA;AACjC,CAAC,EAHW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAG1C;AAuCD,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;AACvB,CAAC,EANW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAMvB"}

package/models/store.d.ts

@@ -223,6 +223,11 @@ export interface Store {
     onlineStoreDeliveryFreeThresholdAmount?: number;
     /** 最大外送距離(km) */
     onlineStoreDeliveryDistanceLimit?: number;
+    /**
+     * 外送費設定。新欄位優先於舊版的 onlineStoreDelivery* 欄位；
+     * 舊欄位會持續保留，以相容尚未進入外送設定頁的門市。
+     */
+    deliveryFeeConfig?: DeliveryFeeConfig;
     /** LINE LIFF ID */
     onlineLiffId?: string;
     /** Cognito user pool 登入的 OIDC provider */
@@ -326,6 +331,32 @@ export interface Address {
     zipCode?: number;
     address?: string;
     note?: string;
+    /** 地址座標，格式為 [longitude, latitude]。 */
+    lonLat?: [number, number];
+}
+export declare type DeliveryFeeMode = 'fixed' | 'tiered';
+/** 依直線配送距離的計費級距；upTo 為此級距的上限（公里）。 */
+export interface DeliveryDistanceTier {
+    upTo: number;
+    fee: number;
+}
+/** 訂單滿額之外送費折抵。discount 為 FREE 時代表免外送費。 */
+export interface DeliveryAmountTier {
+    amount: number;
+    discount: number | 'FREE';
+}
+export interface DeliveryFeeConfig {
+    /** 取件地址來源：店家基本資料或線上點餐地址。 */
+    origin: 'store' | 'online';
+    /** 超過此距離（公里）即不提供外送。 */
+    maxDistanceKm: number;
+    mode: DeliveryFeeMode;
+    /** mode 為 fixed 時使用的固定外送費。 */
+    fee?: number;
+    /** mode 為 tiered 時使用的距離級距，必須依 upTo 遞增。 */
+    distanceTiers?: DeliveryDistanceTier[];
+    /** 依訂單商品小計（折扣後）折抵外送費的級距。 */
+    amountTiers?: DeliveryAmountTier[];
 }
 export interface DayOfWeekTimePeriod {
     /** 每週星期幾 */

package/models/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/store.ts"],"names":[],"mappings":";;;AAEA,oCAAkJ;AA+SlJ,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,kDAAiC,CAAA;AACnC,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../projects/sdit-model-lib/src/models/store.ts"],"names":[],"mappings":";;;AAEA,oCAAkJ;AAoTlJ,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,kDAAiC,CAAA;AACnC,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trusted-solutions/sdit.models",
-  "version": "0.66.0-alpha.1",
+  "version": "0.66.0-alpha.3",
   "description": "TODO: Give a short introduction of your project. Let this section explain the objectives or the motivation behind this project.",
   "main": "index.js",
   "scripts": {