@pisell/pisellos 2.3.19 → 2.3.20

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

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

package/dist/modules/Order/index.js

@@ -4093,7 +4093,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paramsList) {
         var _this24 = this;
-        var tempOrder;
+        var tempOrder, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee20$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -4104,11 +4104,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context22.abrupt("return", tempOrder.products);
             case 3:
-              paramsList.forEach(function (params) {
-                _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
-              });
+              reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
+                var updatedProductUid = _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
+                if (params.allow_booking_discount_reapply && updatedProductUid) {
+                  acc.push(String(updatedProductUid));
+                }
+                return acc;
+              }, []);
               _context22.next = 6;
-              return this.finalizeAfterProductsMutation(tempOrder);
+              return this.finalizeAfterProductsMutation(tempOrder, {
+                reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
+              });
             case 6:
               this.logInfo('updateOrderProduct success', {
                 paramsList: paramsList
@@ -4237,7 +4244,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "finalizeAfterProductsMutation",
     value: (function () {
-      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder) {
+      var _finalizeAfterProductsMutation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(tempOrder, options) {
         return _regeneratorRuntime().wrap(function _callee22$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -4245,7 +4252,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context24.next = 3;
               return this.applyPromotion();
             case 3:
-              this.applyDiscount();
+              this.applyDiscount({
+                reapplyBookingDiscountProductUids: options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids
+              });
               this.sanitizeTempOrderProducts(tempOrder);
               _context24.next = 7;
               return this.recalculateSummary({
@@ -4259,7 +4268,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee22, this);
       }));
-      function finalizeAfterProductsMutation(_x26) {
+      function finalizeAfterProductsMutation(_x26, _x27) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4392,7 +4401,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee23, this, [[11, 22, 25, 28]]);
       }));
-      function removeProductsFromOrder(_x27) {
+      function removeProductsFromOrder(_x28) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4411,7 +4420,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this);
       }));
-      function removeProductFromOrder(_x28) {
+      function removeProductFromOrder(_x29) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4523,7 +4532,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this);
       }));
-      function applyLocalPrintOrderNumbers(_x29) {
+      function applyLocalPrintOrderNumbers(_x30) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4548,7 +4557,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee27, this);
       }));
-      function submitTempOrder(_x30) {
+      function submitTempOrder(_x31) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -4569,7 +4578,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee28, this);
       }));
-      function submitTempOrderAsync(_x31) {
+      function submitTempOrderAsync(_x32) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -4739,7 +4748,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee29, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x32) {
+      function runSubmitTempOrder(_x33) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -4766,7 +4775,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function markLocalOrderSynced(_x33, _x34) {
+      function markLocalOrderSynced(_x34, _x35) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -4898,7 +4907,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee31, this);
       }));
-      function syncPaymentsToOrder(_x35) {
+      function syncPaymentsToOrder(_x36) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5018,7 +5027,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee32, this);
       }));
-      function submitOrder(_x36) {
+      function submitOrder(_x37) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5057,7 +5066,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function cancelOrder(_x37) {
+      function cancelOrder(_x38) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5101,7 +5110,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this);
       }));
-      function changeBookingStatus(_x38) {
+      function changeBookingStatus(_x39) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5248,7 +5257,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x39) {
+      function createOrderByCheckout(_x40) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5273,7 +5282,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function submitSalesOrder(_x40) {
+      function submitSalesOrder(_x41) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5317,7 +5326,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this);
       }));
-      function sendCustomerPayLink(_x41) {
+      function sendCustomerPayLink(_x42) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5361,7 +5370,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function getSalesOrderByLookup(_x42) {
+      function getSalesOrderByLookup(_x43) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5433,7 +5442,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function hydrateTempOrderFromRecord(_x43, _x44) {
+      function hydrateTempOrderFromRecord(_x44, _x45) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -5730,7 +5739,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this);
       }));
-      function getOrderInfo(_x45) {
+      function getOrderInfo(_x46) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;

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

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

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

package/lib/modules/Order/index.js

@@ -3159,10 +3159,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!paramsList.length) {
       return tempOrder.products;
     }
-    paramsList.forEach((params) => {
-      this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const reapplyBookingDiscountProductUids = paramsList.reduce((acc, params) => {
+      const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+      if (params.allow_booking_discount_reapply && updatedProductUid) {
+        acc.push(String(updatedProductUid));
+      }
+      return acc;
+    }, []);
+    await this.finalizeAfterProductsMutation(tempOrder, {
+      reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : void 0
     });
-    await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo("updateOrderProduct success", {
       paramsList
     });
@@ -3271,10 +3277,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.finalizeAfterProductsMutation(tempOrder);
    */
-  async finalizeAfterProductsMutation(tempOrder) {
+  async finalizeAfterProductsMutation(tempOrder, options) {
     this.syncTempOrderHolderFromBookings(tempOrder);
     await this.applyPromotion();
-    this.applyDiscount();
+    this.applyDiscount({
+      reapplyBookingDiscountProductUids: options == null ? void 0 : options.reapplyBookingDiscountProductUids
+    });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();

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

package/package.json

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