@pisell/pisellos 2.0.55 → 2.0.57

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: '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/types.d.ts

@@ -15,6 +15,7 @@ export interface CommitOrderParams {
     query: {
         cartItems: CartItem[];
         type: 'virtual' | 'appointment_booking';
+        platform?: 'pc' | 'h5';
     };
 }
 /**

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

@@ -429,7 +429,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _originProduct$_produ, _product$discount_lis11;
+          var _product$discount_lis11, _originProduct$_produ;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -440,14 +440,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
           var productOriginTotal = product.origin_total || product.total || 0;
+          // 如果当前 product 有 discount_list，则先从 origin_total 拿
+          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
+            productOriginTotal = product.origin_total;
+          }
           // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
           if (Number((originProduct === null || originProduct === void 0 || (_originProduct$_produ = originProduct._productInit) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          // 如果当前 product 有 discount_list，则必须从 origin_total 拿
-          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
-            productOriginTotal = product.origin_total;
-          }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();

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

@@ -21,6 +21,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private otherParams;
     private cacheId;
     private otherData;
+    private platform;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {

package/dist/solution/BookingByStep/index.js

@@ -61,15 +61,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherData", {});
+    // 提供给 UI 层的临时数据存储，会进缓存
+    _defineProperty(_assertThisInitialized(_this), "platform", void 0);
     return _this;
   }
   _createClass(BookingByStepImpl, [{
     key: "initialize",
-    value: // 提供给 UI 层的临时数据存储，会进缓存
+    value: // 平台类型，用于判断是 PC / H5
     function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
         var _this$otherParams,
           _this$otherParams2,
+          _this$otherParams3,
           _this2 = this;
         var targetCacheData, sessionData, _data$this$otherParam, data, moduleArr;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -99,7 +102,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
               targetCacheData = {};
               this.cacheId = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.cacheId;
-              if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.cacheId) {
+              this.platform = (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform;
+              if ((_this$otherParams3 = this.otherParams) !== null && _this$otherParams3 !== void 0 && _this$otherParams3.cacheId) {
                 sessionData = this.window.sessionStorage.getItem(this.name);
                 if (sessionData) {
                   data = JSON.parse(sessionData); // 匹配 cacheid，如果匹配不到，直接把 sessionData 清掉即可
@@ -128,7 +132,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.schedule.loadAllSchedule();
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-            case 18:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -989,7 +993,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return _context19.abrupt("return", this.store.order.submitOrder({
                 query: {
                   cartItems: newCartItems,
-                  type: type
+                  type: type,
+                  platform: this.platform
                 }
               }));
             case 6:

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: "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) {
@@ -72,7 +74,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         }
       });
       if (order.type === "appointment_booking") {
-        const firstAppointmentCartItem = (_a = params.cartItems.filter((n) => !(0, import_utils2.isNormalProduct)(n._productOrigin))) == null ? void 0 : _a[0];
+        const firstAppointmentCartItem = (_a = params.cartItems.filter(
+          (n) => !(0, import_utils2.isNormalProduct)(n._productOrigin)
+        )) == null ? void 0 : _a[0];
         if (firstAppointmentCartItem) {
           order.schedule_date = firstAppointmentCartItem.start_date + " " + firstAppointmentCartItem.start_time + ":00";
         }

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

@@ -15,6 +15,7 @@ export interface CommitOrderParams {
     query: {
         cartItems: CartItem[];
         type: 'virtual' | 'appointment_booking';
+        platform?: 'pc' | 'h5';
     };
 }
 /**

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/modules/Rules/index.js

@@ -302,12 +302,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         let productOriginTotal = product.origin_total || product.total || 0;
-        if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
-          productOriginTotal = product.total;
-        }
-        if (((_h = product.discount_list) == null ? void 0 : _h.length) && product.origin_total) {
+        if (((_g = product.discount_list) == null ? void 0 : _g.length) && product.origin_total) {
           productOriginTotal = product.origin_total;
         }
+        if (Number(((_h = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _h.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          productOriginTotal = product.total;
+        }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),

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

@@ -21,6 +21,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private otherParams;
     private cacheId;
     private otherData;
+    private platform;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {

package/lib/solution/BookingByStep/index.js

@@ -58,9 +58,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
     this.otherData = {};
   }
-  // 提供给 UI 层的临时数据存储，会进缓存
+  // 平台类型，用于判断是 PC / H5
   async initialize(core, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
@@ -76,12 +76,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     let targetCacheData = {};
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
-    if ((_b = this.otherParams) == null ? void 0 : _b.cacheId) {
+    this.platform = (_b = this.otherParams) == null ? void 0 : _b.platform;
+    if ((_c = this.otherParams) == null ? void 0 : _c.cacheId) {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (sessionData) {
         const data = JSON.parse(sessionData);
         targetCacheData = data[this.otherParams.cacheId];
-        this.otherData = ((_d = (_c = data[this.otherParams.cacheId]) == null ? void 0 : _c[this.name]) == null ? void 0 : _d["otherData"]) || {};
+        this.otherData = ((_e = (_d = data[this.otherParams.cacheId]) == null ? void 0 : _d[this.name]) == null ? void 0 : _e["otherData"]) || {};
       }
     }
     const moduleArr = [
@@ -529,7 +530,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       type = "virtual";
     }
     return this.store.order.submitOrder({
-      query: { cartItems: newCartItems, type }
+      query: {
+        cartItems: newCartItems,
+        type,
+        platform: this.platform
+      }
     });
   }
   // 拉起支付模块
@@ -834,7 +839,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!resources.length) {
       const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
       if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
-        const dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+        const dateResources = this.store.date.getResourcesListByDate(
+          firstDateCartItem.start_date
+        );
         resources.push(...dateResources || []);
       } else {
         const dateList = this.store.date.getDateList();
@@ -1058,7 +1065,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!AllResources.length) {
       const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
       if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
-        const dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+        const dateResources = this.store.date.getResourcesListByDate(
+          firstDateCartItem.start_date
+        );
         AllResources.push(...dateResources || []);
       } else {
         const dateList = this.store.date.getDateList();

package/package.json

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