@pisell/pisellos 2.2.166 → 2.2.168

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

@@ -135,6 +135,7 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

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

@@ -3,10 +3,9 @@ import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderScanCodeResult, ReplaceTempOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
-import { UnavailableReason } from '../Rules/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -48,12 +47,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: Discount[];
-        type: 'server' | 'clientCalc';
-        unavailableReason?: UnavailableReason;
-    }>;
+    scanCode(code: string, customerId?: number): Promise<OrderScanCodeResult>;
     applyDiscount(): void;
     initTempOrder(params: {
         cacheId?: string;

package/dist/modules/Order/index.js

@@ -277,6 +277,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 type: 'clientCalc',
                 isAvailable: false,
                 discountList: this.getDiscountList(),
+                scannedDiscountList: resultDiscountList,
                 unavailableReason: UnavailableReason.Unknown
               });
             case 9:
@@ -287,7 +288,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context3.abrupt("return", {
                 type: 'server',
                 isAvailable: false,
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                scannedDiscountList: resultDiscountList
               });
             case 11:
               withScanList = resultDiscountList.map(function (item) {
@@ -309,7 +311,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context3.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: true,
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                scannedDiscountList: resultDiscountList
               });
             case 15:
               tempOrder = this.store.tempOrder;
@@ -335,6 +338,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
                 discountList: newDiscountList || this.getDiscountList(),
+                scannedDiscountList: resultDiscountList,
                 unavailableReason: unavailableReason
               });
             case 20:
@@ -829,6 +833,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.store.tempOrder = freshTempOrder;
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
+      this.store.syncState = undefined;
       void ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList([]));
       void ((_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.setDiscountList([]));
       this.persistTempOrder();
@@ -1411,6 +1416,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
+      this.logInfo('addOrderPayment', {
+        payment: payment
+      });
       var tempOrder = this.ensureTempOrder();
       var mapped = mapPaymentItemsToOrderPayments([payment]);
       tempOrder.payments = [].concat(_toConsumableArray(tempOrder.payments || []), _toConsumableArray(mapped));
@@ -2115,43 +2123,53 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
-        var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, submitResult;
+        var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, paymentStatus, submitResult;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
-              tempOrder.payments = mappedPayments;
-              if (params.paymentStatus) tempOrder.payment_status = params.paymentStatus;
-              this.persistTempOrder();
-              _context22.next = 7;
-              return this.saveDraft();
-            case 7:
               paymentTotal = this.calculatePaymentTotal(mappedPayments);
               targetAmount = this.getPaymentTargetAmount();
               isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
-              if (!(!isFullyPaid || !params.submitWhenPaid)) {
-                _context22.next = 12;
+              paymentStatus = isFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
+              tempOrder.payments = mappedPayments;
+              tempOrder.payment_status = paymentStatus;
+              this.persistTempOrder();
+              _context22.next = 11;
+              return this.saveDraft();
+            case 11:
+              if (params.submitWhenPaid) {
+                _context22.next = 13;
                 break;
               }
               return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
-            case 12:
-              _context22.next = 14;
+            case 13:
+              if (!(this.store.syncState === 'submitting')) {
+                _context22.next = 15;
+                break;
+              }
+              return _context22.abrupt("return", {
+                isFullyPaid: isFullyPaid
+              });
+            case 15:
+              this.store.syncState = 'submitting';
+              _context22.next = 18;
               return this.submitTempOrder({
                 payments: mappedPayments,
-                paymentStatus: params.paymentStatus || 'paid',
+                paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
                 channel: params.channel
               });
-            case 14:
+            case 18:
               submitResult = _context22.sent;
               return _context22.abrupt("return", {
                 isFullyPaid: isFullyPaid,
                 submitResult: submitResult
               });
-            case 16:
+            case 20:
             case "end":
               return _context22.stop();
           }

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

@@ -2,6 +2,7 @@ import { CartItem } from '../Cart/types';
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
+import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
@@ -48,6 +49,13 @@ export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
 }
+export interface OrderScanCodeResult {
+    isAvailable: boolean;
+    discountList: Discount[];
+    scannedDiscountList: Discount[];
+    type: 'server' | 'clientCalc';
+    unavailableReason?: UnavailableReason;
+}
 export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;

package/dist/modules/Order/utils.js

@@ -655,7 +655,7 @@ export function buildSubmitPayload(params) {
     note: tempOrder.note || '',
     delivery_type: tempOrder.delivery_type || 'nil',
     schedule_date: scheduleDate,
-    created_at: tempOrder.created_at || formatDateTime(now),
+    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(function (booking) {
       return Number(booking.parent_id) !== 0;
     }).map(function (booking) {

package/dist/server/modules/order/utils/filterOrders.js

@@ -1,4 +1,17 @@
 import dayjs from 'dayjs';
+/** 从订单 payments 提取支付方式 code，与 UI 筛选选项及 filterBookings 一致 */
+function getOrderPaymentCodes(order) {
+  var payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.code;
+  }).filter(function (code) {
+    return typeof code === 'string' && code.length > 0;
+  });
+}
+
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -126,22 +139,23 @@ export function filterOrders(orders, filters) {
       }
     }
 
-    // payment_methods - 支付方式
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      var orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      var hasMatch = order.payment_methods.some(function (pm) {
-        return safeFilters.payment_methods.includes(pm);
+      var hasMatch = orderPaymentCodes.some(function (code) {
+        return safeFilters.payment_methods.includes(code);
       });
       if (!hasMatch) {
         rejected.push({
@@ -149,7 +163,7 @@ export function filterOrders(orders, filters) {
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/dist/solution/BaseSales/index.js

@@ -27,6 +27,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
+import { BaseSalesHookNames } from "./types";
 import { OrderModule } from "../../modules/Order";
 import Decimal from 'decimal.js';
 import { createModule } from "../BookingByStep/types";
@@ -1347,17 +1348,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 48:
               this.store.order.persistTempOrder();
-              _context14.next = 54;
+              this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products,
+                discountList: nextDiscountList,
+                selectedDiscountList: tempOrder.discount_list,
+                tempOrder: tempOrder
+              });
+              _context14.next = 55;
               break;
-            case 51:
-              _context14.prev = 51;
+            case 52:
+              _context14.prev = 52;
               _context14.t1 = _context14["catch"](0);
               throw _context14.t1;
-            case 54:
+            case 55:
             case "end":
               return _context14.stop();
           }
-        }, _callee14, this, [[0, 51], [16, 36, 39, 42]]);
+        }, _callee14, this, [[0, 52], [16, 36, 39, 42]]);
       }));
       function setDiscountSelected(_x9) {
         return _setDiscountSelected.apply(this, arguments);
@@ -1500,7 +1507,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
         var _params$channel;
-        var channel;
+        var channel, syncParams, syncState, payments, syncResult;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1511,14 +1518,60 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('order 模块未初始化');
             case 2:
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
-              return _context18.abrupt("return", this.store.order.syncPaymentsToOrder(_objectSpread(_objectSpread({}, params), channel !== undefined ? {
+              syncParams = _objectSpread(_objectSpread({}, params), channel !== undefined ? {
                 channel: channel
-              } : {})));
-            case 4:
+              } : {});
+              syncState = this.store.order.getOrderSyncState();
+              if (!(params.submitWhenPaid && syncState === 'submitting')) {
+                _context18.next = 7;
+                break;
+              }
+              return _context18.abrupt("return", this.store.order.syncPaymentsToOrder(syncParams));
+            case 7:
+              payments = params.payments || [];
+              _context18.next = 10;
+              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncStart, {
+                payments: payments,
+                params: syncParams,
+                amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+                orderSnapshot: this.store.order.getOrderSnapshot()
+              });
+            case 10:
+              _context18.prev = 10;
+              _context18.next = 13;
+              return this.store.order.syncPaymentsToOrder(syncParams);
+            case 13:
+              syncResult = _context18.sent;
+              _context18.next = 16;
+              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
+                ok: true,
+                syncResult: syncResult,
+                payments: this.store.order.getOrderPayments(),
+                params: syncParams,
+                amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+                orderSnapshot: this.store.order.getOrderSnapshot()
+              });
+            case 16:
+              return _context18.abrupt("return", syncResult);
+            case 19:
+              _context18.prev = 19;
+              _context18.t0 = _context18["catch"](10);
+              _context18.next = 23;
+              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
+                ok: false,
+                error: _context18.t0,
+                payments: this.store.order.getOrderPayments(),
+                params: syncParams,
+                amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+                orderSnapshot: this.store.order.getOrderSnapshot()
+              });
+            case 23:
+              throw _context18.t0;
+            case 24:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this);
+        }, _callee18, this, [[10, 19]]);
       }));
       function syncPaymentsToOrder(_x13) {
         return _syncPaymentsToOrder.apply(this, arguments);
@@ -1544,8 +1597,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
+      var _this5 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
-      return this.store.order.addOrderPayment(payment);
+      var payments = this.store.order.addOrderPayment(payment);
+      var amountSnapshot = this.store.order.getOrderAmountSnapshot();
+      var syncState = this.store.order.getOrderSyncState();
+      if (amountSnapshot && syncState !== 'submitting') {
+        var paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? 'paid' : 'partially_paid';
+        void this.syncPaymentsToOrder({
+          payments: payments,
+          paymentStatus: paymentStatus,
+          submitWhenPaid: true,
+          smallTicketDataFlag: 1
+        }).catch(function (error) {
+          _this5.logError('auto sync payments failed', {
+            error: error instanceof Error ? error.message : String(error)
+          });
+        });
+      }
+      return payments;
     }
 
     /** 更新当前订单中的指定支付项。 */

package/dist/solution/BaseSales/types.d.ts

@@ -11,6 +11,8 @@ export declare const BaseSalesHookNames: {
     readonly onRetryInit: "onRetryInit";
     readonly onRefresh: "onRefresh";
     readonly onCartValidationChanged: "onCartValidationChanged";
+    readonly onPaymentSyncStart: "onPaymentSyncStart";
+    readonly onPaymentSyncEnd: "onPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/dist/solution/BaseSales/types.js

@@ -7,7 +7,9 @@ export var BaseSalesHookNames = {
   onDestroy: 'onDestroy',
   onRetryInit: 'onRetryInit',
   onRefresh: 'onRefresh',
-  onCartValidationChanged: 'onCartValidationChanged'
+  onCartValidationChanged: 'onCartValidationChanged',
+  onPaymentSyncStart: 'onPaymentSyncStart',
+  onPaymentSyncEnd: 'onPaymentSyncEnd'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -4,6 +4,7 @@ import type { ProductData } from '../../modules';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
 import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
+import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
 import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
@@ -43,6 +44,14 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 让现有 setActiveCustomer / getActiveCustomer 调用方零成本拿到详情态客户。
      */
     loadSalesDetail(orderIdOrParams: number | string | LoadSalesDetailParams): Promise<ISalesDetail>;
+    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    private hydrateOrderCustomerFromScanDiscounts;
+    private getDiscountCustomerId;
+    private resolveCustomerByDiscountCustomerId;
+    private findCustomerById;
+    private normalizeCustomer;
+    private getRawCustomerId;
+    private hasUsableCustomerDetails;
     /**
      * 更新当前预约的 appointment_status。
      *
@@ -251,7 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态