@pisell/pisellos 0.10.10 → 0.10.11

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/Order/index.d.ts

@@ -60,6 +60,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * orderModule.updateOtherParams({ cacheId: 'cache-2', channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
+    isOnlineStorePlatform(): boolean;
     /**
      * 记录信息日志
      */

package/dist/modules/Order/index.js

@@ -459,6 +459,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.otherParams = otherParams;
     }
 
+    /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
+  }, {
+    key: "isOnlineStorePlatform",
+    value: function isOnlineStorePlatform() {
+      var _this$otherParams;
+      var platform = String(((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform) || '').trim().toLowerCase();
+      return platform === 'pc' || platform === 'h5';
+    }
+
     /**
      * 记录信息日志
      */
@@ -2892,7 +2901,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams;
+      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -2945,7 +2954,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (holderNames.length) {
         nextHolder.name = holderNames.join(',');
       }
-      if ((_baseHolder3 = baseHolder) !== null && _baseHolder3 !== void 0 && _baseHolder3.is_source_shop || (_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.isFranchisee) {
+      if ((_baseHolder3 = baseHolder) !== null && _baseHolder3 !== void 0 && _baseHolder3.is_source_shop || (_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.isFranchisee) {
         nextHolder.is_source_shop = 1;
       }
       return nextHolder;
@@ -3044,7 +3053,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
-        var _this$otherParams2, _ref46, _salesSummaryResult$e;
+        var _this$otherParams3, _ref46, _salesSummaryResult$e;
         var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
@@ -3111,7 +3120,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount,
                 virtualSettlementMode: this.shouldUseVirtualSettlementSummary(tempOrder)
-              }, (_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.channel ? {
+              }, (_this$otherParams3 = this.otherParams) !== null && _this$otherParams3 !== void 0 && _this$otherParams3.channel ? {
                 channel: this.otherParams.channel
               } : {}));
             case 28:
@@ -3987,8 +3996,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isMultiCurrencySettlementEnabled",
     value: function isMultiCurrencySettlementEnabled() {
-      var _this$otherParams3;
-      return ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.enableMultiCurrencySettlement) === true;
+      var _this$otherParams4;
+      return ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.enableMultiCurrencySettlement) === true;
     }
   }, {
     key: "isActiveVirtualSettlementOrder",
@@ -5249,14 +5258,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams4, _ref71, _params$businessCode, _this$otherParams5, _this$otherParams6;
+      var _params$cacheId, _this$otherParams5, _ref71, _params$businessCode, _this$otherParams6, _this$otherParams7;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
-        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform),
-        businessCode: (_ref71 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.business_code,
+        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
+        businessCode: (_ref71 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
@@ -5316,7 +5325,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "saveTempOrderAsDraft",
     value: function () {
       var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
-        var _params$cacheId2, _this$otherParams7, _this$otherParams8, _this$otherParams9, _params$type, _this$otherParams10, _payload$products;
+        var _params$cacheId2, _this$otherParams8, _this$otherParams9, _this$otherParams10, _params$type, _this$otherParams11, _payload$products;
         var tempOrder, latestSummary, payload;
         return _regeneratorRuntime().wrap(function _callee30$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
@@ -5347,10 +5356,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.platform),
-                businessCode: (params === null || params === void 0 ? void 0 : params.businessCode) || ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.businessCode) || ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.business_code) || tempOrder.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.platform),
+                businessCode: (params === null || params === void 0 ? void 0 : params.businessCode) || ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.businessCode) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.business_code) || tempOrder.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
-                type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.type,
+                type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.type,
                 summary: latestSummary,
                 enhance: params === null || params === void 0 ? void 0 : params.enhancePayload
               });
@@ -5429,16 +5438,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
-        var _params$cacheId3, _this$otherParams11, _ref75, _ref76, _submitSnapshot$busin, _this$otherParams12, _this$otherParams13, _submitSnapshot$type;
-        var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
+        var _params$cacheId3, _this$otherParams12, _ref75, _ref76, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
+        var tempOrder, isOnlineStorePlatform, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee33$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.prepareVirtualSettlementTempOrder(tempOrder);
+              isOnlineStorePlatform = this.isOnlineStorePlatform();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
               hasPaymentOverride = (params === null || params === void 0 ? void 0 : params.payments) !== undefined;
-              preparedPaymentOverride = hasPaymentOverride ? this.prepareVoucherPaymentsForSubmit((params === null || params === void 0 ? void 0 : params.payments) || [], shouldConfirmPendingVoucherPayments) : undefined;
+              if (hasPaymentOverride) {
+                preparedPaymentOverride = isOnlineStorePlatform ? (params === null || params === void 0 ? void 0 : params.payments) || [] : this.prepareVoucherPaymentsForSubmit((params === null || params === void 0 ? void 0 : params.payments) || [], shouldConfirmPendingVoucherPayments);
+              }
               if (!hasPaymentOverride) {
                 if (shouldConfirmPendingVoucherPayments) {
                   this.confirmPendingVoucherPayments({
@@ -5453,25 +5465,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context36.next = 9;
+              _context36.next = 10;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 9:
+            case 10:
               _context36.t1 = _context36.sent;
               if (_context36.t1) {
-                _context36.next = 12;
+                _context36.next = 13;
                 break;
               }
               _context36.t1 = this.store.summary;
-            case 12:
+            case 13:
               _context36.t0 = _context36.t1;
               if (_context36.t0) {
-                _context36.next = 15;
+                _context36.next = 16;
                 break;
               }
               _context36.t0 = createEmptySummary();
-            case 15:
+            case 16:
               latestSummary = _context36.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
@@ -5479,7 +5491,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || params !== null && params !== void 0 && params.enhancePayload ? function (payload, ctx) {
                 var nextPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, payload), hasPaymentOverride ? {
                   payments: preparedPaymentOverride || []
-                } : {}), hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? {
+                } : {}), hasPaymentStatusOverride && !isOnlineStorePlatform && !shouldConfirmPendingVoucherPayments ? {
                   payment_status: params === null || params === void 0 ? void 0 : params.paymentStatus
                 } : {}), hasSmallTicketDataFlagOverride ? {
                   small_ticket_data_flag: params === null || params === void 0 ? void 0 : params.smallTicketDataFlag
@@ -5491,12 +5503,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.platform),
-                businessCode: (_ref75 = (_ref76 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref76 !== void 0 ? _ref76 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.platform),
+                businessCode: (_ref75 = (_ref76 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref76 !== void 0 ? _ref76 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
                 request_unique_idempotency_token: params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token,
+                includePaymentStatus: !isOnlineStorePlatform,
                 enhance: enhancePayload
               });
               console.log('[Order.runSubmitTempOrder.payload]', payload);
@@ -5507,10 +5520,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context36.next = 27;
+              _context36.next = 28;
               return this.saveDraft();
-            case 27:
-              _context36.prev = 27;
+            case 28:
+              _context36.prev = 28;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5520,26 +5533,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context36.next = 31;
+              _context36.next = 32;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 31:
+            case 32:
               result = _context36.sent;
-              _context36.next = 44;
+              _context36.next = 45;
               break;
-            case 34:
-              _context36.prev = 34;
-              _context36.t2 = _context36["catch"](27);
+            case 35:
+              _context36.prev = 35;
+              _context36.t2 = _context36["catch"](28);
               backendErrorResponse = this.extractSubmitErrorResponse(_context36.t2);
               if (!backendErrorResponse) {
-                _context36.next = 41;
+                _context36.next = 42;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context36.abrupt("return", backendErrorResponse);
-            case 41:
+            case 42:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context36.t2 instanceof Error ? _context36.t2.message : String(_context36.t2),
@@ -5549,15 +5562,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context36.t2;
-            case 44:
+            case 45:
               if (!this.isSubmitResponseRejected(result)) {
-                _context36.next = 48;
+                _context36.next = 49;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context36.abrupt("return", result);
-            case 48:
+            case 49:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
@@ -5567,29 +5580,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context36.next = 57;
+                _context36.next = 58;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context36.next = 55;
+              _context36.next = 56;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 55:
-              _context36.next = 58;
+            case 56:
+              _context36.next = 59;
               break;
-            case 57:
+            case 58:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 58:
-              return _context36.abrupt("return", result);
             case 59:
+              return _context36.abrupt("return", result);
+            case 60:
             case "end":
               return _context36.stop();
           }
-        }, _callee33, this, [[27, 34]]);
+        }, _callee33, this, [[28, 35]]);
       }));
       function runSubmitTempOrder(_x39) {
         return _runSubmitTempOrder.apply(this, arguments);

package/dist/modules/Order/types.d.ts

@@ -295,8 +295,9 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: OrderProductSku;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list' | 'created_at'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list' | 'created_at' | 'payment_status'> {
     platform: string;
+    payment_status?: string;
     created_at?: string | undefined;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -449,7 +450,7 @@ export interface SubmitSalesOrderParams {
         sales_channel: string;
         order_sales_channel: string;
         status: string;
-        payment_status: string;
+        payment_status?: string;
         shipping_status: string;
         customer_id: number | null;
         customer_name: string;
@@ -776,6 +777,8 @@ export interface OrderModuleAPI {
     isTempOrderPersistEnabled: () => boolean;
     /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
     notifyTempOrderChanged: () => void;
+    /** PC/H5 为在线店铺；其它或缺失平台统一按 POS 处理。 */
+    isOnlineStorePlatform: () => boolean;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

package/dist/modules/Order/utils.d.ts

@@ -220,6 +220,7 @@ export declare function buildSubmitPayload(params: {
     type?: string;
     summary?: OrderSummary | null;
     request_unique_idempotency_token?: string;
+    includePaymentStatus?: boolean;
     enhance?: SubmitPayloadEnhancer;
 }): OrderSubmitPayload;
 export declare function mapPaymentItemToOrderPayment(paymentItem: OrderPaymentSource): OrderPaymentData;

package/dist/modules/Order/utils.js

@@ -1,7 +1,7 @@
 var _excluded = ["custom_product_bundle_map_id"],
   _excluded2 = ["unique_identification_number"],
   _excluded3 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
-  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
+  _excluded4 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id", "payment_status"],
   _excluded5 = ["collect_pax", "table_occupancy_duration", "cart_settlement_key", "cart_settlement_snapshot", "legal_currency_snapshot"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -1148,6 +1148,7 @@ export function buildSubmitPayload(params) {
     _totalRefundAmount = _ref30.total_refund_amount,
     _createDate = _ref30.create_date,
     _holderId = _ref30.holder_id,
+    _paymentStatus = _ref30.payment_status,
     tempOrderRest = _objectWithoutProperties(_ref30, _excluded4);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
@@ -1159,7 +1160,7 @@ export function buildSubmitPayload(params) {
       submitType = 'virtual';
     }
   }
-  var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var payload = _objectSpread(_objectSpread(_objectSpread({}, tempOrderRest), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
@@ -1174,8 +1175,10 @@ export function buildSubmitPayload(params) {
     business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: (_ref31 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref31 !== void 0 ? _ref31 : 'online_store',
-    status: tempOrder.status || 'normal',
-    payment_status: tempOrder.payment_status || 'payment_processing',
+    status: tempOrder.status || 'normal'
+  }, params.includePaymentStatus !== false ? {
+    payment_status: tempOrder.payment_status || 'payment_processing'
+  } : {}), {}, {
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
     is_price_include_tax: (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : 1,
     currency_format: tempOrder.currency_format || 'symbol_first',

package/dist/solution/BaseSales/index.js

@@ -3012,8 +3012,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "buildVirtualSettlementSubmitData",
     value: function () {
       var _buildVirtualSettlementSubmitData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _tempOrder$metadata$c, _tempOrder$metadata2, _paymentMethod$custom;
-        var tempOrder, snapshot, currencyProductId, summary, amount, customerId, asset, currencyCode, currencySymbol, currencyFormat, balance, paymentMethods, paymentMethod, amountText, payment;
+        var _tempOrder$metadata$c, _tempOrder$metadata2;
+        var tempOrder, snapshot, currencyProductId, summary, amount, customerId, asset, currencyCode, currencySymbol, currencyFormat, balance, amountText, paymentNumber, payment, _paymentMethod$custom, paymentMethods, paymentMethod;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -3090,22 +3090,44 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('Insufficient virtual currency balance.');
             case 28:
-              _context29.next = 30;
+              amountText = amount.toFixed(2);
+              paymentNumber = "LOCAL_".concat(createUuidV4());
+              if (!this.store.order.isOnlineStorePlatform()) {
+                _context29.next = 34;
+                break;
+              }
+              payment = {
+                payment_number: paymentNumber,
+                amount: amount.toNumber(),
+                metadata: {
+                  unique_payment_number: createUuidV4()
+                },
+                tag: asset.tag,
+                voucher_id: asset.id,
+                wallet_pass_usage_unit: {
+                  price: 1,
+                  points: 1
+                },
+                wallet_pass_use_value: amountText
+              };
+              _context29.next = 41;
+              break;
+            case 34:
+              _context29.next = 36;
               return this.getPaymentMethodsAsync();
-            case 30:
+            case 36:
               paymentMethods = _context29.sent;
               paymentMethod = paymentMethods.find(function (method) {
                 return String(method.code || '').toUpperCase() === 'PRODUCTVOUCHER';
               });
               if (paymentMethod) {
-                _context29.next = 34;
+                _context29.next = 40;
                 break;
               }
               throw new Error('PRODUCTVOUCHER payment method is unavailable.');
-            case 34:
-              amountText = amount.toFixed(2);
+            case 40:
               payment = {
-                payment_number: "LOCAL_".concat(createUuidV4()),
+                payment_number: paymentNumber,
                 amount: amountText,
                 origin_amount: amountText,
                 code: paymentMethod.code,
@@ -3122,6 +3144,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 wallet_pass_use_value: amountText,
                 metadata: {}
               };
+            case 41:
               return _context29.abrupt("return", {
                 payments: [payment],
                 snapshot: snapshot,
@@ -3130,7 +3153,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 currencySymbol: currencySymbol,
                 currencyFormat: currencyFormat
               });
-            case 37:
+            case 42:
             case "end":
               return _context29.stop();
           }

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/modules/Order/index.d.ts

@@ -60,6 +60,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * orderModule.updateOtherParams({ cacheId: 'cache-2', channel: 'pos' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
+    isOnlineStorePlatform(): boolean;
     /**
      * 记录信息日志
      */

package/lib/modules/Order/index.js

@@ -425,6 +425,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
     this.otherParams = otherParams;
   }
+  /** PC/H5 属于在线店铺；其它或缺失平台统一沿用 POS 行为。 */
+  isOnlineStorePlatform() {
+    var _a;
+    const platform = String(((_a = this.otherParams) == null ? void 0 : _a.platform) || "").trim().toLowerCase();
+    return platform === "pc" || platform === "h5";
+  }
   /**
    * 记录信息日志
    */
@@ -4148,12 +4154,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
     this.prepareVirtualSettlementTempOrder(tempOrder);
+    const isOnlineStorePlatform = this.isOnlineStorePlatform();
     const shouldConfirmPendingVoucherPayments = (params == null ? void 0 : params.confirmPendingVoucherPayments) !== false;
     const hasPaymentOverride = (params == null ? void 0 : params.payments) !== void 0;
-    const preparedPaymentOverride = hasPaymentOverride ? this.prepareVoucherPaymentsForSubmit(
-      (params == null ? void 0 : params.payments) || [],
-      shouldConfirmPendingVoucherPayments
-    ) : void 0;
+    let preparedPaymentOverride;
+    if (hasPaymentOverride) {
+      preparedPaymentOverride = isOnlineStorePlatform ? (params == null ? void 0 : params.payments) || [] : this.prepareVoucherPaymentsForSubmit(
+        (params == null ? void 0 : params.payments) || [],
+        shouldConfirmPendingVoucherPayments
+      );
+    }
     if (!hasPaymentOverride) {
       if (shouldConfirmPendingVoucherPayments) {
         this.confirmPendingVoucherPayments({
@@ -4178,7 +4188,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...hasPaymentOverride ? {
           payments: preparedPaymentOverride || []
         } : {},
-        ...hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
+        ...hasPaymentStatusOverride && !isOnlineStorePlatform && !shouldConfirmPendingVoucherPayments ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
         ...hasSmallTicketDataFlagOverride ? { small_ticket_data_flag: params == null ? void 0 : params.smallTicketDataFlag } : {}
       };
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
@@ -4194,6 +4204,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       type: submitSnapshot.type ?? (params == null ? void 0 : params.type),
       summary: latestSummary,
       request_unique_idempotency_token: params == null ? void 0 : params.request_unique_idempotency_token,
+      includePaymentStatus: !isOnlineStorePlatform,
       enhance: enhancePayload
     });
     console.log("[Order.runSubmitTempOrder.payload]", payload);

package/lib/modules/Order/types.d.ts

@@ -295,8 +295,9 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: OrderProductSku;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list' | 'created_at'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list' | 'created_at' | 'payment_status'> {
     platform: string;
+    payment_status?: string;
     created_at?: string | undefined;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -449,7 +450,7 @@ export interface SubmitSalesOrderParams {
         sales_channel: string;
         order_sales_channel: string;
         status: string;
-        payment_status: string;
+        payment_status?: string;
         shipping_status: string;
         customer_id: number | null;
         customer_name: string;
@@ -776,6 +777,8 @@ export interface OrderModuleAPI {
     isTempOrderPersistEnabled: () => boolean;
     /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
     notifyTempOrderChanged: () => void;
+    /** PC/H5 为在线店铺；其它或缺失平台统一按 POS 处理。 */
+    isOnlineStorePlatform: () => boolean;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

package/lib/modules/Order/utils.d.ts

@@ -220,6 +220,7 @@ export declare function buildSubmitPayload(params: {
     type?: string;
     summary?: OrderSummary | null;
     request_unique_idempotency_token?: string;
+    includePaymentStatus?: boolean;
     enhance?: SubmitPayloadEnhancer;
 }): OrderSubmitPayload;
 export declare function mapPaymentItemToOrderPayment(paymentItem: OrderPaymentSource): OrderPaymentData;

package/lib/modules/Order/utils.js

@@ -1027,6 +1027,7 @@ function buildSubmitPayload(params) {
     total_refund_amount: _totalRefundAmount,
     create_date: _createDate,
     holder_id: _holderId,
+    payment_status: _paymentStatus,
     ...tempOrderRest
   } = tempOrder;
   let submitType = type ?? tempOrder.type;
@@ -1054,7 +1055,7 @@ function buildSubmitPayload(params) {
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
-    payment_status: tempOrder.payment_status || "payment_processing",
+    ...params.includePaymentStatus !== false ? { payment_status: tempOrder.payment_status || "payment_processing" } : {},
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
     is_price_include_tax: tempOrder.is_price_include_tax ?? 1,
     currency_format: tempOrder.currency_format || "symbol_first",

package/lib/solution/BaseSales/index.js

@@ -2093,29 +2093,45 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (balance.lt(amount)) {
       throw new Error("Insufficient virtual currency balance.");
     }
-    const paymentMethods = await this.getPaymentMethodsAsync();
-    const paymentMethod = paymentMethods.find(
-      (method) => String(method.code || "").toUpperCase() === "PRODUCTVOUCHER"
-    );
-    if (!paymentMethod) {
-      throw new Error("PRODUCTVOUCHER payment method is unavailable.");
-    }
     const amountText = amount.toFixed(2);
-    const payment = {
-      payment_number: `LOCAL_${(0, import_utils.createUuidV4)()}`,
-      amount: amountText,
-      origin_amount: amountText,
-      code: paymentMethod.code,
-      custom_payment_id: paymentMethod.id,
-      custom_payment_type: paymentMethod.custom_payment_type ?? paymentMethod.type,
-      name: paymentMethod.name,
-      type: "normal",
-      voucher_id: asset.id,
-      order_payment_type: "normal",
-      wallet_pass_usage_unit: { price: 1, points: 1 },
-      wallet_pass_use_value: amountText,
-      metadata: {}
-    };
+    const paymentNumber = `LOCAL_${(0, import_utils.createUuidV4)()}`;
+    let payment;
+    if (this.store.order.isOnlineStorePlatform()) {
+      payment = {
+        payment_number: paymentNumber,
+        amount: amount.toNumber(),
+        metadata: {
+          unique_payment_number: (0, import_utils.createUuidV4)()
+        },
+        tag: asset.tag,
+        voucher_id: asset.id,
+        wallet_pass_usage_unit: { price: 1, points: 1 },
+        wallet_pass_use_value: amountText
+      };
+    } else {
+      const paymentMethods = await this.getPaymentMethodsAsync();
+      const paymentMethod = paymentMethods.find(
+        (method) => String(method.code || "").toUpperCase() === "PRODUCTVOUCHER"
+      );
+      if (!paymentMethod) {
+        throw new Error("PRODUCTVOUCHER payment method is unavailable.");
+      }
+      payment = {
+        payment_number: paymentNumber,
+        amount: amountText,
+        origin_amount: amountText,
+        code: paymentMethod.code,
+        custom_payment_id: paymentMethod.id,
+        custom_payment_type: paymentMethod.custom_payment_type ?? paymentMethod.type,
+        name: paymentMethod.name,
+        type: "normal",
+        voucher_id: asset.id,
+        order_payment_type: "normal",
+        wallet_pass_usage_unit: { price: 1, points: 1 },
+        wallet_pass_use_value: amountText,
+        metadata: {}
+      };
+    }
     return {
       payments: [payment],
       snapshot,

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.10",
+  "version": "0.10.11",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",