@pisell/pisellos 1.0.145 → 1.0.147

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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/Cart/utils/changePrice.js

@@ -23,8 +23,8 @@ function _updateAllCartItemPrice() {
           _iterator = _createForOfIteratorHelper(cartItems);
           _context2.prev = 1;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var _item$_productOrigin, _bundle;
-            var item, targetProduct, cartProduct, productInfo, bundle, _productInfo$variant;
+            var _item$_productOrigin$, _item$_productOrigin, _item$_origin, _targetProduct$varian, _ref, _targetVariant$price, _ref2, _targetVariant$base_p, _item$_productOrigin2, _bundle;
+            var item, targetProduct, cartProduct, productInfo, variantId, targetVariant, bundle, _productInfo$variant;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -40,10 +40,17 @@ function _updateAllCartItemPrice() {
                   if (!productInfo) {
                     productInfo = item._productOrigin;
                   }
-                  bundle = item._bundleOrigin;
-                  productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
-                  productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
-                  productInfo.product_variant_id = (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id;
+
+                  // 查找选择的规格id
+                  variantId = (_item$_productOrigin$ = item === null || item === void 0 || (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.product_variant_id;
+                  targetVariant = targetProduct === null || targetProduct === void 0 || (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (variant) {
+                    return Number(variant.id) === Number(variantId);
+                  });
+                  bundle = item._bundleOrigin; // productInfo.price = targetProduct?.price;
+                  // productInfo.base_price = targetProduct?.base_price;
+                  productInfo.price = (_ref = (_targetVariant$price = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.price) !== null && _targetVariant$price !== void 0 ? _targetVariant$price : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price) !== null && _ref !== void 0 ? _ref : productInfo.price;
+                  productInfo.base_price = (_ref2 = (_targetVariant$base_p = targetVariant === null || targetVariant === void 0 ? void 0 : targetVariant.base_price) !== null && _targetVariant$base_p !== void 0 ? _targetVariant$base_p : targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price) !== null && _ref2 !== void 0 ? _ref2 : productInfo.base_price;
+                  productInfo.product_variant_id = (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.product_variant_id;
                   bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
                     var _targetProduct$bundle;
                     // 更新 bundle 的价格
@@ -75,8 +82,8 @@ function _updateAllCartItemPrice() {
                   // 如果有返回variant，则把对应variant的数据也补充进去
                   if (targetProduct !== null && targetProduct !== void 0 && targetProduct.variant) {
                     productInfo.variant = (_productInfo$variant = productInfo.variant) === null || _productInfo$variant === void 0 ? void 0 : _productInfo$variant.map(function (n) {
-                      var _targetProduct$varian;
-                      var targetVariant = (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (m) {
+                      var _targetProduct$varian2;
+                      var targetVariant = (_targetProduct$varian2 = targetProduct.variant) === null || _targetProduct$varian2 === void 0 ? void 0 : _targetProduct$varian2.find(function (m) {
                         return m.id === n.id;
                       });
                       if (targetVariant) {
@@ -99,7 +106,7 @@ function _updateAllCartItemPrice() {
                     bundle: bundle,
                     options: item._optionsOrigin
                   });
-                case 15:
+                case 17:
                 case "end":
                   return _context.stop();
               }

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

@@ -17,12 +17,13 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;

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

@@ -26,6 +26,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setOrderId(id?: number): void;
     setBookingSubject(bookingSubject: {
         type?: 'form' | 'customer';
         [key: string]: any;
@@ -58,7 +59,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'update';
+        action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;

package/dist/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       currentBookingTime: "",
       filteredDiscountList: [],
       orderTotalAmount: 0,
-      bookingSubject: undefined
+      bookingSubject: undefined,
+      orderId: undefined
     };
     return _this;
   }
@@ -302,6 +303,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setHolders(holders) {
       this.store.holders = holders;
     }
+  }, {
+    key: "setOrderId",
+    value: function setOrderId(id) {
+      this.store.orderId = id;
+    }
   }, {
     key: "setBookingSubject",
     value: function setBookingSubject(bookingSubject) {
@@ -790,24 +796,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _context10.prev = 0;
+              orderId = this.store.orderId;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context10.next = 4;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig({
+              _context10.next = 5;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
-                action: 'create',
+                action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 4:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            case 5:
               goodPassList = _context10.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
@@ -820,35 +829,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 12;
+              _context10.next = 13;
               return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 12:
+            case 13:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 19;
+                _context10.next = 20;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 19;
+              _context10.next = 20;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 19:
-              _context10.next = 21;
+            case 20:
+              _context10.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 21:
-              _context10.next = 26;
+            case 22:
+              _context10.next = 27;
               break;
-            case 23:
-              _context10.prev = 23;
+            case 24:
+              _context10.prev = 24;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 26:
+            case 27:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 23]]);
+        }, _callee10, this, [[0, 24]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -35,6 +35,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

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/Cart/utils/changePrice.js

@@ -34,7 +34,7 @@ __export(changePrice_exports, {
 module.exports = __toCommonJS(changePrice_exports);
 var import_decimal = __toESM(require("decimal.js"));
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   for (const item of cartItems) {
     const targetProduct = priceData.find((n) => n.id === item.id);
     const cartProduct = await getProduct(
@@ -44,10 +44,14 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
     if (!productInfo) {
       productInfo = item._productOrigin;
     }
+    const variantId = ((_a = item == null ? void 0 : item._productOrigin) == null ? void 0 : _a.product_variant_id) ?? ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.product_variant_id);
+    const targetVariant = (_d = targetProduct == null ? void 0 : targetProduct.variant) == null ? void 0 : _d.find(
+      (variant) => Number(variant.id) === Number(variantId)
+    );
     let bundle = item._bundleOrigin;
-    productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
-    productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
-    productInfo.product_variant_id = (_a = item._productOrigin) == null ? void 0 : _a.product_variant_id;
+    productInfo.price = (targetVariant == null ? void 0 : targetVariant.price) ?? (targetProduct == null ? void 0 : targetProduct.price) ?? productInfo.price;
+    productInfo.base_price = (targetVariant == null ? void 0 : targetVariant.base_price) ?? (targetProduct == null ? void 0 : targetProduct.base_price) ?? productInfo.base_price;
+    productInfo.product_variant_id = (_e = item._productOrigin) == null ? void 0 : _e.product_variant_id;
     bundle = bundle == null ? void 0 : bundle.map((n) => {
       var _a2;
       const targetBundle = (_a2 = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a2.find(
@@ -76,14 +80,14 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
       return n;
     });
     if (targetProduct == null ? void 0 : targetProduct.variant) {
-      productInfo.variant = (_b = productInfo.variant) == null ? void 0 : _b.map((n) => {
+      productInfo.variant = (_f = productInfo.variant) == null ? void 0 : _f.map((n) => {
         var _a2;
-        const targetVariant = (_a2 = targetProduct.variant) == null ? void 0 : _a2.find((m) => m.id === n.id);
-        if (targetVariant) {
+        const targetVariant2 = (_a2 = targetProduct.variant) == null ? void 0 : _a2.find((m) => m.id === n.id);
+        if (targetVariant2) {
           return {
             ...n,
-            price: targetVariant.price,
-            base_price: targetVariant.base_price
+            price: targetVariant2.price,
+            base_price: targetVariant2.base_price
           };
         }
         return n;

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

@@ -17,12 +17,13 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;

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

@@ -26,6 +26,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setOrderId(id?: number): void;
     setBookingSubject(bookingSubject: {
         type?: 'form' | 'customer';
         [key: string]: any;
@@ -58,7 +59,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'update';
+        action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;

package/lib/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       currentBookingTime: "",
       filteredDiscountList: [],
       orderTotalAmount: 0,
-      bookingSubject: void 0
+      bookingSubject: void 0,
+      orderId: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -202,6 +203,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setHolders(holders) {
     this.store.holders = holders;
   }
+  setOrderId(id) {
+    this.store.orderId = id;
+  }
   setBookingSubject(bookingSubject) {
     this.store.bookingSubject = bookingSubject;
   }
@@ -519,14 +523,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
     try {
+      const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
-        action: "create",
+        action: orderId ? "edit" : "create",
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
-        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        ...orderId ? { order_id: orderId } : {}
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/lib/solution/ShopDiscount/types.d.ts

@@ -35,6 +35,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/package.json

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