@pisell/pisellos 3.0.38 → 3.0.39

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

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

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

@@ -61,6 +61,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       options: options,
       num: num
     });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
       bundle: bundle,
@@ -161,7 +162,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
     options = params.options;
-  var num = params.num || 1;
+  // const num = params.num || 1;
   var price = Number(product.price);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
     price = bundle.reduce(function (accumulator, currentValue) {
@@ -175,7 +176,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 
 /**

package/dist/modules/Summary/utils.js

@@ -28,7 +28,7 @@ export var calculateSubtotal = function calculateSubtotal(items) {
     return '0.00';
   }
   var subtotal = items.reduce(function (sum, item) {
-    var cartItemTotalPrice = new Decimal(item.total || 0);
+    var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new Decimal(0));
   return subtotal.toFixed(2);
@@ -50,7 +50,7 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
     is_price_include_tax = _ref.is_price_include_tax,
     tax_rate = _ref.tax_rate;
   var totalTaxFee = items.reduce(function (sum, item) {
-    var cartItemTotalPrice = new Decimal(item.total || 0);
+    var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
     var productTaxRate = cartItemTotalPrice.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

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

@@ -42,10 +42,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
-    loadProducts({ category_ids, product_ids, collection, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
+        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;

package/dist/solution/BookingByStep/index.js

@@ -209,11 +209,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, userPlugin, customer_id, _userPlugin$get, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -247,9 +247,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 category_ids: category_ids,
                 ids: product_ids,
                 collection: collection,
-                front_end_cache_id: this.cacheId
+                front_end_cache_id: this.cacheId,
                 // client_schedule_ids: schedule_ids,
-                // schedule_date,
+                schedule_date: schedule_date
               }, {
                 useCache: true
               });
@@ -318,8 +318,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.loadProducts({
                 // schedule_ids: scheduleIds,
                 product_ids: allProductIds,
-                category_ids: category_ids
-                // schedule_date: date,
+                category_ids: category_ids,
+                schedule_date: date
               });
             case 9:
               return _context3.abrupt("return", _context3.sent);

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

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

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

@@ -74,6 +74,7 @@ var formatProductToCartItem = (params) => {
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
     cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
       bundle,
@@ -163,7 +164,6 @@ var formatProductToCartItemOrigin = (params) => {
 };
 var getProductTotalPrice = (params) => {
   const { product, bundle, options } = params;
-  const num = params.num || 1;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -175,7 +175,7 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options } = params;

package/lib/modules/Summary/utils.js

@@ -55,7 +55,7 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
@@ -66,7 +66,7 @@ var calculateTaxFee = (shopInfo, items) => {
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   const totalTaxFee = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
     const productTaxRate = cartItemTotalPrice.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

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

@@ -42,10 +42,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
-    loadProducts({ category_ids, product_ids, collection, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
+        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;

package/lib/solution/BookingByStep/index.js

@@ -163,9 +163,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async loadProducts({
     category_ids = [],
     product_ids = [],
-    collection = []
+    collection = [],
     // schedule_ids = [],
-    // schedule_date,
+    schedule_date
   }) {
     var _a;
     let userPlugin = this.core.getPlugin("user");
@@ -196,9 +196,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         category_ids,
         ids: product_ids,
         collection,
-        front_end_cache_id: this.cacheId
+        front_end_cache_id: this.cacheId,
         // client_schedule_ids: schedule_ids,
-        // schedule_date,
+        schedule_date
       },
       { useCache: true }
     );
@@ -227,8 +227,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return await this.loadProducts({
       // schedule_ids: scheduleIds,
       product_ids: allProductIds,
-      category_ids
-      // schedule_date: date,
+      category_ids,
+      schedule_date: date
     });
   }
   async updateQuotationPriceAndCart(date) {

package/package.json

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