@pisell/pisellos 1.0.42 → 1.0.46

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

@@ -28,6 +28,7 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      * 更新购物车信息
      */
     updateItem(params: IUpdateItemParams): Promise<void>;
+    updateItemInitInfo(params: IUpdateItemParams): Promise<void>;
     /**
      * 格式化数据到购物车
      */

package/dist/modules/Cart/index.js

@@ -211,11 +211,39 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return _updateItem.apply(this, arguments);
       }
       return updateItem;
+    }() // 更新购物车中商品的初始信息
+    // 为什么会有这个操作，主要服务于报价单和商品券
+    // 商品券那边会使用 init 的 price 做计算，而报价单那边就需要修改 init 的 price 来辅助商品计算
+    )
+  }, {
+    key: "updateItemInitInfo",
+    value: function () {
+      var _updateItemInitInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var _id, product, cartItem;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _id = params._id, product = params.product;
+              cartItem = this.store.list.find(function (i) {
+                return i._id === _id;
+              });
+              if (cartItem) {
+                cartItem._productInit = cloneDeep(product);
+              }
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function updateItemInitInfo(_x5) {
+        return _updateItemInitInfo.apply(this, arguments);
+      }
+      return updateItemInitInfo;
     }()
     /**
      * 格式化数据到购物车
      */
-    )
   }, {
     key: "formatCartItem",
     value: function formatCartItem(params) {
@@ -305,18 +333,18 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchSetItems",
     value: (function () {
-      var _batchSetItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(items) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _batchSetItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(items) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               this.store.list = _toConsumableArray(items || []);
             case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function batchSetItems(_x5) {
+      function batchSetItems(_x6) {
         return _batchSetItems.apply(this, arguments);
       }
       return batchSetItems;
@@ -359,24 +387,24 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeItem",
     value: (function () {
-      var _removeItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
+      var _removeItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
         var items;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               items = this.store.list.filter(function (i) {
                 return i._id !== id;
               });
               this.store.list = items;
-              _context5.next = 4;
+              _context6.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onRemoveItem"), items);
             case 4:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function removeItem(_x6) {
+      function removeItem(_x7) {
         return _removeItem.apply(this, arguments);
       }
       return removeItem;

package/dist/modules/Cart/utils/changePrice.d.ts

@@ -1,3 +1,3 @@
 import { Product } from "../../Product";
 import { CartItem, IUpdateItemParams } from "../types";
-export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void): Promise<void>;
+export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void, updateItemInitInfo: (item: IUpdateItemParams) => void): Promise<void>;

package/dist/modules/Cart/utils/changePrice.js

@@ -11,11 +11,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import Decimal from "decimal.js";
-export function updateAllCartItemPrice(_x, _x2, _x3, _x4) {
+export function updateAllCartItemPrice(_x, _x2, _x3, _x4, _x5) {
   return _updateAllCartItemPrice.apply(this, arguments);
 }
 function _updateAllCartItemPrice() {
-  _updateAllCartItemPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cartItems, priceData, getProduct, updateCart) {
+  _updateAllCartItemPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
     var _iterator, _step, _loop;
     return _regeneratorRuntime().wrap(function _callee$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -37,6 +37,9 @@ function _updateAllCartItemPrice() {
                 case 4:
                   cartProduct = _context.sent;
                   productInfo = cartProduct === null || cartProduct === void 0 ? void 0 : cartProduct.getData();
+                  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;
@@ -79,13 +82,18 @@ function _updateAllCartItemPrice() {
                       return n;
                     });
                   }
+                  // 先把商品原始信息更新了
+                  updateItemInitInfo({
+                    _id: item._id,
+                    product: productInfo
+                  });
                   updateCart({
                     _id: item._id,
                     product: productInfo,
                     bundle: bundle,
                     options: item._optionsOrigin
                   });
-                case 13:
+                case 15:
                 case "end":
                   return _context.stop();
               }

package/dist/modules/Order/index.js

@@ -22,7 +22,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { generateDuration } from "./utils";
+import { generateDuration, mergeRelationForms } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
@@ -62,9 +62,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrder",
     value: function createOrder(params) {
       var order = {
-        type: params.type || 'appointment_booking',
+        type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
-        platform: params.platform === 'pc' ? 'PC' : 'H5',
+        platform: (params === null || params === void 0 ? void 0 : params.platform) === 'pc' ? 'PC' : 'H5',
         sales_channel: 'my_pisel',
         order_sales_channel: 'online_store',
         bookings: [],
@@ -92,6 +92,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             (_order$relation_forms = order.relation_forms).push.apply(_order$relation_forms, _toConsumableArray(relationForms));
             delete item._origin.relation_forms;
           } else {
+            // 合并关联表单
+            var _relationForms = mergeRelationForms(item._origin.relation_forms || []);
+            item._origin.relation_forms = _relationForms;
             order.bookings.push(item._origin);
           }
           if (item !== null && item !== void 0 && item.deposit) {

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

@@ -8,3 +8,15 @@ export declare const generateDuration: (cartItem: CartItem) => {
     duration: number;
     durationType: string;
 };
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+export declare const mergeRelationForms: (relationForms: {
+    form_id: number;
+    form_record_ids: number[];
+}[]) => {
+    form_id: number;
+    form_record_ids: number[];
+}[];

package/dist/modules/Order/utils.js

@@ -1,3 +1,9 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -12,4 +18,37 @@ export var generateDuration = function generateDuration(cartItem) {
     duration: duration,
     durationType: 'minutes'
   };
+};
+
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+export var mergeRelationForms = function mergeRelationForms(relationForms) {
+  return Object.values(relationForms.reduce(function (acc, cur) {
+    var _acc$form_id$form_rec;
+    var form_id = cur.form_id,
+      form_record_ids = cur.form_record_ids;
+    // 如果 acc 中没有 form_id，则初始化一个空数组
+    if (!acc[form_id]) {
+      acc[form_id] = {
+        form_id: form_id,
+        form_record_ids: []
+      };
+    }
+
+    // 兼容 form_record_id 可能是数组或单个数字
+    var ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
+    // 过滤掉空值（null、undefined等）
+    var validIds = ids.filter(function (id) {
+      return id != null;
+    });
+    (_acc$form_id$form_rec = acc[form_id].form_record_ids).push.apply(_acc$form_id$form_rec, _toConsumableArray(validIds));
+    // 去重
+    acc[form_id].form_record_ids = _toConsumableArray(new Set(acc[form_id].form_record_ids));
+    return acc;
+  }, {})).filter(function (item) {
+    return item.form_record_ids.length > 0;
+  }); // 过滤掉没有有效记录的表单
 };

package/dist/modules/Rules/index.js

@@ -165,8 +165,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList;
-      // debugger
-
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {

package/dist/solution/BookingByStep/index.js

@@ -378,6 +378,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return _this3.store.products.getProduct(id);
               }, function (params) {
                 return _this3.store.cart.updateItem(params);
+              }, function (params) {
+                return _this3.store.cart.updateItemInitInfo(params);
               });
             case 10:
               this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateQuotationPrice"), {});

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

@@ -28,6 +28,7 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      * 更新购物车信息
      */
     updateItem(params: IUpdateItemParams): Promise<void>;
+    updateItemInitInfo(params: IUpdateItemParams): Promise<void>;
     /**
      * 格式化数据到购物车
      */

package/lib/modules/Cart/index.js

@@ -119,6 +119,16 @@ var CartModule = class extends import_BaseModule.BaseModule {
       console.error("[CartModule] 更新购物车商品失败", error);
     }
   }
+  // 更新购物车中商品的初始信息
+  // 为什么会有这个操作，主要服务于报价单和商品券
+  // 商品券那边会使用 init 的 price 做计算，而报价单那边就需要修改 init 的 price 来辅助商品计算
+  async updateItemInitInfo(params) {
+    const { _id, product } = params;
+    const cartItem = this.store.list.find((i) => i._id === _id);
+    if (cartItem) {
+      cartItem._productInit = (0, import_lodash_es.cloneDeep)(product);
+    }
+  }
   /**
    * 格式化数据到购物车
    */

package/lib/modules/Cart/utils/changePrice.d.ts

@@ -1,3 +1,3 @@
 import { Product } from "../../Product";
 import { CartItem, IUpdateItemParams } from "../types";
-export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void): Promise<void>;
+export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void, updateItemInitInfo: (item: IUpdateItemParams) => void): Promise<void>;

package/lib/modules/Cart/utils/changePrice.js

@@ -33,14 +33,17 @@ __export(changePrice_exports, {
 });
 module.exports = __toCommonJS(changePrice_exports);
 var import_decimal = __toESM(require("decimal.js"));
-async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart) {
+async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
   var _a, _b;
   for (const item of cartItems) {
     const targetProduct = priceData.find((n) => n.id === item.id);
     const cartProduct = await getProduct(
       item.id
     );
-    const productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+    let productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+    if (!productInfo) {
+      productInfo = item._productOrigin;
+    }
     let bundle = item._bundleOrigin;
     productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
     productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
@@ -81,6 +84,10 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         return n;
       });
     }
+    updateItemInitInfo({
+      _id: item._id,
+      product: productInfo
+    });
     updateCart({
       _id: item._id,
       product: productInfo,

package/lib/modules/Order/index.js

@@ -39,9 +39,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   createOrder(params) {
     var _a;
     const order = {
-      type: params.type || "appointment_booking",
+      type: (params == null ? void 0 : params.type) || "appointment_booking",
       // 要从外面拿，virtual
-      platform: params.platform === "pc" ? "PC" : "H5",
+      platform: (params == null ? void 0 : params.platform) === "pc" ? "PC" : "H5",
       sales_channel: "my_pisel",
       order_sales_channel: "online_store",
       bookings: [],
@@ -65,6 +65,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           order.relation_forms.push(...relationForms);
           delete item._origin.relation_forms;
         } else {
+          const relationForms = (0, import_utils.mergeRelationForms)(item._origin.relation_forms || []);
+          item._origin.relation_forms = relationForms;
           order.bookings.push(item._origin);
         }
         if (item == null ? void 0 : item.deposit) {

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

@@ -8,3 +8,15 @@ export declare const generateDuration: (cartItem: CartItem) => {
     duration: number;
     durationType: string;
 };
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+export declare const mergeRelationForms: (relationForms: {
+    form_id: number;
+    form_record_ids: number[];
+}[]) => {
+    form_id: number;
+    form_record_ids: number[];
+}[];

package/lib/modules/Order/utils.js

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Order/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  generateDuration: () => generateDuration
+  generateDuration: () => generateDuration,
+  mergeRelationForms: () => mergeRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -39,7 +40,23 @@ var generateDuration = (cartItem) => {
   const duration = endDate.diff(startDate, "minutes");
   return { duration, durationType: "minutes" };
 };
+var mergeRelationForms = (relationForms) => {
+  return Object.values(
+    relationForms.reduce((acc, cur) => {
+      const { form_id, form_record_ids } = cur;
+      if (!acc[form_id]) {
+        acc[form_id] = { form_id, form_record_ids: [] };
+      }
+      const ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
+      const validIds = ids.filter((id) => id != null);
+      acc[form_id].form_record_ids.push(...validIds);
+      acc[form_id].form_record_ids = [...new Set(acc[form_id].form_record_ids)];
+      return acc;
+    }, {})
+  ).filter((item) => item.form_record_ids.length > 0);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  generateDuration
+  generateDuration,
+  mergeRelationForms
 });

package/lib/solution/BookingByStep/index.js

@@ -259,7 +259,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         cartItems,
         res,
         (id) => this.store.products.getProduct(id),
-        (params) => this.store.cart.updateItem(params)
+        (params) => this.store.cart.updateItem(params),
+        (params) => this.store.cart.updateItemInitInfo(params)
       );
       this.core.effects.emit(
         `${this.store.cart.name}:onUpdateQuotationPrice`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "1.0.42",
+  "version": "1.0.46",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -66,5 +66,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "volta": {
+    "node": "18.20.8"
   }
 }