@pisell/pisellos 3.0.49 → 3.0.51

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

@@ -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: [],

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/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.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();
           }
@@ -374,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"), {});
@@ -989,7 +995,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/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: "H5",
+      platform: (params == null ? void 0 : params.platform) === "pc" ? "PC" : "H5",
       sales_channel: "my_pisel",
       order_sales_channel: "online_store",
       bookings: [],
@@ -74,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/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 = [
@@ -258,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`,
@@ -529,7 +531,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
+      }
     });
   }
   // 拉起支付模块
@@ -827,7 +833,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();
@@ -1051,7 +1059,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": "3.0.49",
+  "version": "3.0.51",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",