@pisell/pisellos 2.1.127 → 2.1.129

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.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

@@ -1792,7 +1792,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: (function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator9, _step9, d, selectedResourceIds, _iterator10, _step10, _product$discount_lis, product, before, totalPerUnitDiscount, newSellingPrice, afterApplyTarget, finalSummary, finalProduct, finalTarget;
+        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator9, _step9, d, selectedResourceIds, _iterator10, _step10, _product$_origin, product, totalPerUnitDiscount, newSellingPrice, afterApplyTarget, finalSummary, finalProduct, finalTarget;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -1872,70 +1872,71 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.isSelected;
               }).map(function (d) {
                 return d.id;
-              }));
+              })); // 无条件归一化：不论 Rules 是否清空 discount_list、长度是否变化，
+              // 都以 original_price - Σ (当前选中 discount_list.amount) 重算 selling_price。
+              // 目的：避免 unselect 后 selling_price 残留、reselect 时把残留价带进下一轮 Rules 造成双折扣。
+              // 手动改价商品（_origin.isManualDiscount=true）不参与券流程归一化，保留手工价。
               _iterator10 = _createForOfIteratorHelper(tempOrder.products);
               _context21.prev = 19;
               _iterator10.s();
             case 21:
               if ((_step10 = _iterator10.n()).done) {
-                _context21.next = 30;
+                _context21.next = 32;
                 break;
               }
               product = _step10.value;
-              if ((_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length) {
+              if (!((_product$_origin = product._origin) !== null && _product$_origin !== void 0 && _product$_origin.isManualDiscount)) {
                 _context21.next = 25;
                 break;
               }
-              return _context21.abrupt("continue", 28);
+              return _context21.abrupt("continue", 30);
             case 25:
-              before = product.discount_list.length;
-              product.discount_list = product.discount_list.filter(function (pd) {
+              // 1. 把 product.discount_list 和当前选中的 discount 对齐（剔除已取消的券）
+              product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
                 var rid = (_pd$discount$resource = (_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) !== null && _pd$discount$resource !== void 0 ? _pd$discount$resource : pd.id;
                 return rid != null && selectedResourceIds.has(rid);
               });
-              if (product.discount_list.length < before) {
-                // 基于剩余的 discount_list 重算 selling_price。
-                // 约定：pd.amount 为 per-unit 折扣额，remaining 加总即单品券后总折扣。
-                totalPerUnitDiscount = product.discount_list.reduce(function (sum, pd) {
-                  return sum + (pd.amount || 0);
-                }, 0);
-                newSellingPrice = new Decimal(product.original_price || product.selling_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
-                product.selling_price = newSellingPrice;
-                if (product.metadata) {
-                  product.metadata.main_product_selling_price = newSellingPrice;
-                }
+
+              // 2. 以 original_price 为基准重算 selling_price
+              totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
+                return sum + (pd.amount || 0);
+              }, 0);
+              newSellingPrice = new Decimal(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+              product.selling_price = newSellingPrice;
+              if (product.metadata) {
+                product.metadata.main_product_selling_price = newSellingPrice;
               }
-            case 28:
-              _context21.next = 21;
-              break;
             case 30:
-              _context21.next = 35;
+              _context21.next = 21;
               break;
             case 32:
-              _context21.prev = 32;
+              _context21.next = 37;
+              break;
+            case 34:
+              _context21.prev = 34;
               _context21.t0 = _context21["catch"](19);
               _iterator10.e(_context21.t0);
-            case 35:
-              _context21.prev = 35;
+            case 37:
+              _context21.prev = 37;
               _iterator10.f();
-              return _context21.finish(35);
-            case 38:
+              return _context21.finish(37);
+            case 40:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context21.next = 41;
+              _context21.next = 43;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 41:
+            case 43:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
               afterApplyTarget = this.store.order.getDiscountList().find(function (d) {
                 return d.id === params.discountId;
               }) || null;
-              _context21.next = 45;
+              _context21.next = 47;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 45:
+            case 47:
               this.store.order.persistTempOrder();
               finalSummary = ((_this$store$order$get = this.store.order.getTempOrder()) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.summary) || null;
               finalProduct = ((_this$store$order$get2 = this.store.order.getTempOrder()) === null || _this$store$order$get2 === void 0 || (_this$store$order$get2 = _this$store$order$get2.products) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2[0]) || null;
@@ -1944,16 +1945,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.id === params.discountId;
               }) || null;
               return _context21.abrupt("return", this.store.order.getDiscountList());
-            case 53:
-              _context21.prev = 53;
+            case 55:
+              _context21.prev = 55;
               _context21.t1 = _context21["catch"](1);
               this.logMethodError('setDiscountSelected', _context21.t1);
               throw _context21.t1;
-            case 57:
+            case 59:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[1, 53], [19, 32, 35, 38]]);
+        }, _callee21, this, [[1, 55], [19, 34, 37, 40]]);
       }));
       function setDiscountSelected(_x14) {
         return _setDiscountSelected.apply(this, arguments);
@@ -2747,25 +2748,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/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

@@ -1152,24 +1152,21 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
       );
       for (const product of tempOrder.products) {
-        if (!((_c = product.discount_list) == null ? void 0 : _c.length))
+        if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
-        const before = product.discount_list.length;
-        product.discount_list = product.discount_list.filter((pd) => {
+        product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
           return rid != null && selectedResourceIds.has(rid);
         });
-        if (product.discount_list.length < before) {
-          const totalPerUnitDiscount = product.discount_list.reduce(
-            (sum, pd) => sum + (pd.amount || 0),
-            0
-          );
-          const newSellingPrice = new import_decimal.default(product.original_price || product.selling_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
-          product.selling_price = newSellingPrice;
-          if (product.metadata) {
-            product.metadata.main_product_selling_price = newSellingPrice;
-          }
+        const totalPerUnitDiscount = (product.discount_list || []).reduce(
+          (sum, pd) => sum + (pd.amount || 0),
+          0
+        );
+        const newSellingPrice = new import_decimal.default(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        product.selling_price = newSellingPrice;
+        if (product.metadata) {
+          product.metadata.main_product_selling_price = newSellingPrice;
         }
       }
       import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
@@ -1541,6 +1538,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.129",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",