@pisell/pisellos 2.1.127 → 2.1.128

package/dist/modules/Order/index.js

@@ -325,9 +325,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount() {
-      var _tempOrder$products, _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4;
+      var _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4;
       var tempOrder = this.store.tempOrder;
-      if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return;
+      // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
+      // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
+      // appliedProductDetails / savedAmount 以及 tempOrder.discount_list 复位。
+      if (!tempOrder) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
       var discountList = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];

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

@@ -71,7 +71,7 @@ export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     option: any[];
     product_id: number | null;
     product_variant_id: number;
-    quantity: number;
+    num: number;
     rowKey: number | null;
     session: null;
     unique: string;

package/dist/modules/Order/utils.js

@@ -382,7 +382,7 @@ export function formatV1Product(products) {
       option: product.product_option_item,
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
-      quantity: product.num,
+      num: product.num,
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()

package/dist/solution/ScanOrder/index.js

@@ -1248,7 +1248,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               sellingPrice = toPriceString((_sourceItem$price = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _sourceItem$price !== void 0 ? _sourceItem$price : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price, '0.00');
-              tempOrder.products.push(normalizeOrderProduct({
+              tempOrder.products.push(normalizeOrderProduct(_objectSpread(_objectSpread({}, sourceItem), {}, {
                 product_id: productId,
                 product_variant_id: productVariantId,
                 num: targetQuantity,
@@ -1262,7 +1262,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   item_rule_prefill: true,
                   item_rule_id: prefillItem.ruleId
                 })
-              }));
+              })));
               hasChanges = true;
               return _context20.abrupt("continue", 45);
             case 38:
@@ -1300,25 +1300,27 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               return _context20.finish(52);
             case 55:
               if (!hasChanges) {
-                _context20.next = 59;
+                _context20.next = 60;
                 break;
               }
-              _context20.next = 58;
+              // Prefill 属于 products CRUD 的一种形式：新增后让 Rules 重算，以支持自动应用可用优惠券。
+              this.store.order.applyDiscount();
+              _context20.next = 59;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 58:
-              this.store.order.persistTempOrder();
             case 59:
-              _context20.next = 61;
+              this.store.order.persistTempOrder();
+            case 60:
+              _context20.next = 62;
               return this.refreshItemRuleQuantityLimits();
-            case 61:
+            case 62:
               this.itemRulePrefillApplied = true;
               this.logMethodSuccess('applyPrefillByItemRule', {
                 prefillCount: prefillItems.length,
                 hasChanges: hasChanges
               });
-            case 63:
+            case 64:
             case "end":
               return _context20.stop();
           }

package/dist/solution/VenueBooking/index.js

@@ -2747,25 +2747,27 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               return _context36.finish(50);
             case 53:
               if (!hasChanges) {
-                _context36.next = 57;
+                _context36.next = 58;
                 break;
               }
-              _context36.next = 56;
+              // Prefill 属于 products CRUD 的一种形式：新增后让 Rules 重算，以支持自动应用可用优惠券。
+              this.store.order.applyDiscount();
+              _context36.next = 57;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 56:
-              this.store.order.persistTempOrder();
             case 57:
-              _context36.next = 59;
+              this.store.order.persistTempOrder();
+            case 58:
+              _context36.next = 60;
               return this.refreshItemRuleQuantityLimits();
-            case 59:
+            case 60:
               this.itemRulePrefillApplied = true;
               this.logMethodSuccess('applyPrefillByItemRule', {
                 prefillCount: prefillItems.length,
                 hasChanges: hasChanges
               });
-            case 61:
+            case 62:
             case "end":
               return _context36.stop();
           }

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

@@ -1,49 +0,0 @@
-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.js

@@ -231,27 +231,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
   }
   applyDiscount() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const tempOrder = this.store.tempOrder;
-    if (!((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length))
+    if (!tempOrder)
       return;
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
-    const discountList = ((_b = this.store.discount) == null ? void 0 : _b.getDiscountList()) || [];
-    const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+    const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
+    const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
     const result = rulesModule.calcDiscount({
       productList: tempOrder.products,
       discountList,
       holders,
-      isFormSubject: !!((_d = tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form"
+      isFormSubject: !!((_c = tempOrder.holder) == null ? void 0 : _c.type) && tempOrder.holder.type === "form"
     });
     if (result == null ? void 0 : result.productList) {
       tempOrder.products = result.productList;
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
-      (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(result.discountList);
+      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(result.discountList);
       tempOrder.discount_list = result.discountList.filter((d) => d.isSelected);
     }
   }

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

@@ -71,7 +71,7 @@ export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     option: any[];
     product_id: number | null;
     product_variant_id: number;
-    quantity: number;
+    num: number;
     rowKey: number | null;
     session: null;
     unique: string;

package/lib/modules/Order/utils.js

@@ -364,7 +364,7 @@ function formatV1Product(products) {
       option: product.product_option_item,
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
-      quantity: product.num,
+      num: product.num,
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()

package/lib/solution/ScanOrder/index.js

@@ -707,6 +707,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
         );
         tempOrder.products.push(
           (0, import_utils.normalizeOrderProduct)({
+            ...sourceItem,
             product_id: productId,
             product_variant_id: productVariantId,
             num: targetQuantity,
@@ -752,6 +753,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     }
     if (hasChanges) {
+      this.store.order.applyDiscount();
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
     }

package/lib/solution/VenueBooking/index.js

@@ -1541,6 +1541,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
     }
     if (hasChanges) {
+      this.store.order.applyDiscount();
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
     }

package/package.json

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