@pisell/pisellos 2.2.226 → 2.2.228

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 } from "./examples";

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

@@ -175,6 +175,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private buildProductStructuralFingerprintItem;
     private buildOrderProductsStructuralFingerprint;
     private getOriginalSalesSnapshot;
+    private isSnapshotPayableAmountUnchanged;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;

package/dist/modules/Order/index.js

@@ -1688,6 +1688,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (typeof snapshot.productFingerprint !== 'string') return null;
       return snapshot;
     }
+  }, {
+    key: "isSnapshotPayableAmountUnchanged",
+    value: function isSnapshotPayableAmountUnchanged(tempOrder, snapshot, snapshotSummary) {
+      var currentPaidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+      var currentAmountGap = this.calculateSummaryAmountGap({
+        tempOrder: tempOrder,
+        summary: snapshotSummary,
+        orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount
+      });
+      var snapshotPaidPaymentSummary = this.calculatePaidPaymentSummary(Array.isArray(snapshot.payments) ? snapshot.payments : []);
+      var snapshotAmountGap = this.calculateSummaryAmountGap({
+        tempOrder: tempOrder,
+        summary: snapshotSummary,
+        orderPaidAmount: snapshotPaidPaymentSummary.gapPaidAmount
+      });
+      return currentAmountGap === snapshotAmountGap;
+    }
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
     value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
@@ -1700,6 +1717,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (currentStructuralFingerprint !== snapshotStructuralFingerprint) return null;
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
+      if (!this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary)) return null;
       if (Array.isArray(snapshot.products)) {
         tempOrder.products = cloneDeep(snapshot.products);
       }
@@ -3097,7 +3115,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              tempOrder = this.ensureTempOrder();
+              tempOrder = this.ensureTempOrder(); // TODO note 改对象
               if (!booking) {
                 _context18.next = 18;
                 break;
@@ -3722,6 +3740,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var enhancedPayload = params !== null && params !== void 0 && params.enhancePayload ? params.enhancePayload(nextPayload, ctx) : nextPayload;
                 return enhancedPayload;
               } : undefined;
+              debugger;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
@@ -3735,10 +3754,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context26.next = 20;
+              _context26.next = 21;
               return this.saveDraft();
-            case 20:
-              _context26.prev = 20;
+            case 21:
+              _context26.prev = 21;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -3747,26 +3766,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context26.next = 24;
+              _context26.next = 25;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 24:
+            case 25:
               result = _context26.sent;
-              _context26.next = 37;
+              _context26.next = 38;
               break;
-            case 27:
-              _context26.prev = 27;
-              _context26.t2 = _context26["catch"](20);
+            case 28:
+              _context26.prev = 28;
+              _context26.t2 = _context26["catch"](21);
               backendErrorResponse = this.extractSubmitErrorResponse(_context26.t2);
               if (!backendErrorResponse) {
-                _context26.next = 34;
+                _context26.next = 35;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context26.abrupt("return", backendErrorResponse);
-            case 34:
+            case 35:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context26.t2 instanceof Error ? _context26.t2.message : String(_context26.t2),
@@ -3776,40 +3795,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context26.t2;
-            case 37:
+            case 38:
               if (!this.isSubmitResponseRejected(result)) {
-                _context26.next = 41;
+                _context26.next = 42;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context26.abrupt("return", result);
-            case 41:
+            case 42:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context26.next = 49;
+                _context26.next = 50;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context26.next = 47;
+              _context26.next = 48;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 47:
-              _context26.next = 50;
+            case 48:
+              _context26.next = 51;
               break;
-            case 49:
+            case 50:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 50:
-              return _context26.abrupt("return", result);
             case 51:
+              return _context26.abrupt("return", result);
+            case 52:
             case "end":
               return _context26.stop();
           }
-        }, _callee24, this, [[20, 27]]);
+        }, _callee24, this, [[21, 28]]);
       }));
       function submitTempOrder(_x26) {
         return _submitTempOrder.apply(this, arguments);
@@ -4404,11 +4423,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               res = _context35.sent;
+              debugger;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
               return _context35.abrupt("return", res);
-            case 9:
+            case 10:
             case "end":
               return _context35.stop();
           }

package/dist/solution/BaseSales/index.js

@@ -2719,6 +2719,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               params = {
                 product_id: identity.product_id,
                 product_variant_id: identity.product_variant_id,
+                // TODO: 改成对象
                 updates: {
                   note: String(note || '')
                 }

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 | 3 | 6 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -312,7 +312,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -801,19 +801,20 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
               throw new Error('refreshSalesDetail: tempOrder 未加载');
             case 4:
-              orderId = tempOrder.order_id;
+              debugger;
+              orderId = tempOrder.order_id || tempOrder.external_sale_number;
               if (!(orderId === undefined || orderId === null)) {
-                _context11.next = 7;
+                _context11.next = 8;
                 break;
               }
               return _context11.abrupt("return", {});
-            case 7:
+            case 8:
               return _context11.abrupt("return", this.loadSalesDetail({
-                orderId: Number(orderId),
+                orderId: orderId,
                 // merge: true
                 forceRemote: params.forceRemote
               }));
-            case 8:
+            case 9:
             case "end":
               return _context11.stop();
           }

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

@@ -175,6 +175,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private buildProductStructuralFingerprintItem;
     private buildOrderProductsStructuralFingerprint;
     private getOriginalSalesSnapshot;
+    private isSnapshotPayableAmountUnchanged;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;

package/lib/modules/Order/index.js

@@ -1185,6 +1185,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return null;
     return snapshot;
   }
+  isSnapshotPayableAmountUnchanged(tempOrder, snapshot, snapshotSummary) {
+    const currentPaidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+    const currentAmountGap = this.calculateSummaryAmountGap({
+      tempOrder,
+      summary: snapshotSummary,
+      orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount
+    });
+    const snapshotPaidPaymentSummary = this.calculatePaidPaymentSummary(
+      Array.isArray(snapshot.payments) ? snapshot.payments : []
+    );
+    const snapshotAmountGap = this.calculateSummaryAmountGap({
+      tempOrder,
+      summary: snapshotSummary,
+      orderPaidAmount: snapshotPaidPaymentSummary.gapPaidAmount
+    });
+    return currentAmountGap === snapshotAmountGap;
+  }
   restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
     const snapshot = this.getOriginalSalesSnapshot(tempOrder);
     if (!snapshot)
@@ -1202,6 +1219,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...(0, import_utils.createEmptySummary)(),
       ...(0, import_lodash_es.cloneDeep)(snapshot.summary || {})
     };
+    if (!this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary))
+      return null;
     if (Array.isArray(snapshot.products)) {
       tempOrder.products = (0, import_lodash_es.cloneDeep)(snapshot.products);
     }
@@ -2742,6 +2761,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
       return enhancedPayload;
     } : void 0;
+    debugger;
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
       cacheId: effectiveCacheId,
@@ -3185,6 +3205,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"],
       ...params.forceRemote ? { forceRemote: true } : {}
     }, { osServer: true });
+    debugger;
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
     }

package/lib/solution/BaseSales/index.js

@@ -1721,6 +1721,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const params = {
         product_id: identity.product_id,
         product_variant_id: identity.product_variant_id,
+        // TODO: 改成对象
         updates: { note: String(note || "") }
       };
       if (identity.unique_identification_number !== void 0) {

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 | 3 | 6 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -312,7 +312,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -471,12 +471,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     if (!tempOrder) {
       throw new Error("refreshSalesDetail: tempOrder 未加载");
     }
-    const orderId = tempOrder.order_id;
+    debugger;
+    const orderId = tempOrder.order_id || tempOrder.external_sale_number;
     if (orderId === void 0 || orderId === null) {
       return {};
     }
     return this.loadSalesDetail({
-      orderId: Number(orderId),
+      orderId,
       // merge: true
       forceRemote: params.forceRemote
     });

package/package.json

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