@pisell/pisellos 2.2.166 → 2.2.167

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

@@ -190,7 +190,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -829,6 +829,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 +1412,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 +2119,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/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";
@@ -1500,7 +1501,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 +1512,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 +1591,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/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -190,7 +190,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -570,6 +570,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.tempOrder = freshTempOrder;
     this.store.summary = (0, import_utils.createEmptySummary)();
     this.store.lastOrderInfo = void 0;
+    this.store.syncState = void 0;
     void ((_a = this.store.discount) == null ? void 0 : _a.setOriginalDiscountList([]));
     void ((_b = this.store.discount) == null ? void 0 : _b.setDiscountList([]));
     this.persistTempOrder();
@@ -988,6 +989,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   /** 追加单个支付项，并立即持久化当前 tempOrder。 */
   addOrderPayment(payment) {
+    this.logInfo("addOrderPayment", {
+      payment
+    });
     const tempOrder = this.ensureTempOrder();
     const mapped = (0, import_utils.mapPaymentItemsToOrderPayments)([payment]);
     tempOrder.payments = [...tempOrder.payments || [], ...mapped];
@@ -1556,20 +1560,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
       params.payments || []
     );
-    tempOrder.payments = mappedPayments;
-    if (params.paymentStatus)
-      tempOrder.payment_status = params.paymentStatus;
-    this.persistTempOrder();
-    await this.saveDraft();
     const paymentTotal = this.calculatePaymentTotal(mappedPayments);
     const targetAmount = this.getPaymentTargetAmount();
     const isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
-    if (!isFullyPaid || !params.submitWhenPaid) {
+    const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
+    tempOrder.payments = mappedPayments;
+    tempOrder.payment_status = paymentStatus;
+    this.persistTempOrder();
+    await this.saveDraft();
+    if (!params.submitWhenPaid) {
+      return { isFullyPaid };
+    }
+    if (this.store.syncState === "submitting") {
       return { isFullyPaid };
     }
+    this.store.syncState = "submitting";
     const submitResult = await this.submitTempOrder({
       payments: mappedPayments,
-      paymentStatus: params.paymentStatus || "paid",
+      paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
       channel: params.channel
     });

package/lib/solution/BaseSales/index.js

@@ -34,9 +34,10 @@ __export(BaseSales_exports, {
 });
 module.exports = __toCommonJS(BaseSales_exports);
 var import_BaseModule = require("../../modules/BaseModule");
+var import_types = require("./types");
 var import_Order = require("../../modules/Order");
 var import_decimal = __toESM(require("decimal.js"));
-var import_types = require("../BookingByStep/types");
+var import_types2 = require("../BookingByStep/types");
 var import_utils = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 __reExport(BaseSales_exports, require("./types"), module.exports);
@@ -147,7 +148,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (moduleName === "quotation") {
       return new import_Quotation.QuotationModule(`${this.name}_quotation`);
     }
-    return (0, import_types.createModule)(moduleName, this.name);
+    return (0, import_types2.createModule)(moduleName, this.name);
   }
   getSubModuleHooks(moduleName) {
     var _a, _b;
@@ -844,10 +845,43 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
-    return this.store.order.syncPaymentsToOrder({
+    const syncParams = {
       ...params,
       ...channel !== void 0 ? { channel } : {}
+    };
+    const syncState = this.store.order.getOrderSyncState();
+    if (params.submitWhenPaid && syncState === "submitting") {
+      return this.store.order.syncPaymentsToOrder(syncParams);
+    }
+    const payments = params.payments || [];
+    await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncStart, {
+      payments,
+      params: syncParams,
+      amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+      orderSnapshot: this.store.order.getOrderSnapshot()
     });
+    try {
+      const syncResult = await this.store.order.syncPaymentsToOrder(syncParams);
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
+        ok: true,
+        syncResult,
+        payments: this.store.order.getOrderPayments(),
+        params: syncParams,
+        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+        orderSnapshot: this.store.order.getOrderSnapshot()
+      });
+      return syncResult;
+    } catch (error) {
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
+        ok: false,
+        error,
+        payments: this.store.order.getOrderPayments(),
+        params: syncParams,
+        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+        orderSnapshot: this.store.order.getOrderSnapshot()
+      });
+      throw error;
+    }
   }
   /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
   getOrderPayments() {
@@ -865,7 +899,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   addOrderPayment(payment) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.addOrderPayment(payment);
+    const payments = this.store.order.addOrderPayment(payment);
+    const amountSnapshot = this.store.order.getOrderAmountSnapshot();
+    const syncState = this.store.order.getOrderSyncState();
+    if (amountSnapshot && syncState !== "submitting") {
+      const paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? "paid" : "partially_paid";
+      void this.syncPaymentsToOrder({
+        payments,
+        paymentStatus,
+        submitWhenPaid: true,
+        smallTicketDataFlag: 1
+      }).catch((error) => {
+        this.logError("auto sync payments failed", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+    }
+    return payments;
   }
   /** 更新当前订单中的指定支付项。 */
   updateOrderPayment(paymentIdentity, updates) {

package/lib/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/lib/solution/BaseSales/types.js

@@ -28,7 +28,9 @@ var BaseSalesHookNames = {
   onDestroy: "onDestroy",
   onRetryInit: "onRetryInit",
   onRefresh: "onRefresh",
-  onCartValidationChanged: "onCartValidationChanged"
+  onCartValidationChanged: "onCartValidationChanged",
+  onPaymentSyncStart: "onPaymentSyncStart",
+  onPaymentSyncEnd: "onPaymentSyncEnd"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

package/lib/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/package.json

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