@pisell/pisellos 2.0.2 → 2.0.4

package/dist/modules/Rules/index.js

@@ -26,6 +26,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
+import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -277,12 +278,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
         if (applicableDiscounts.length === 0 || isManualDiscount) {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-            total: product.origin_total || product.total,
-            price: product.price
-          }), {}, {
-            discount_list: []
-          })));
+          if (product.isClient) {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: product.price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              price: product.price
+            }), {}, {
+              discount_list: []
+            })));
+          } else {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              total: product.origin_total || product.total,
+              price: product.price
+            }), {}, {
+              discount_list: []
+            })));
+          }
           return;
         }
         if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
@@ -309,23 +332,68 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 记录应用了优惠券的商品
         // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
-        processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
-          discount_list: [discountDetail],
-          price: 0,
-          total: (product.origin_total || product.total) - product.price,
-          origin_total: product.origin_total || product.total
-        }));
+        if (product.isClient) {
+          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
+            discount_list: [discountDetail],
+            price: 0,
+            origin_total: getProductOriginTotalPrice({
+              product: {
+                original_price: product.original_price
+              },
+              bundle: product.bundle,
+              options: product.options
+            }),
+            total: getProductTotalPrice({
+              product: {
+                price: '0'
+              },
+              bundle: product.bundle,
+              options: product.options
+            })
+          }));
+        } else {
+          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
+            discount_list: [discountDetail],
+            price: 0,
+            total: (product.origin_total || product.total) - product.price,
+            origin_total: product.origin_total || product.total
+          }));
+        }
       });
 
       // 按原始顺序构建处理后的商品列表
       var processedProductList = productList.map(function (originProduct) {
         var product = _this3.hooks.getProduct(originProduct);
-        return processedProductsMap.get(product._id) || _this3.hooks.setProduct(originProduct, {
-          discount_list: [],
-          total: product.total,
-          origin_total: product.origin_total,
-          price: product.price
-        });
+        var getDefaultProduct = function getDefaultProduct() {
+          if (product.isClient) {
+            _this3.hooks.setProduct(originProduct, {
+              discount_list: [],
+              price: product.price,
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: product.price
+                },
+                bundle: product.bundle,
+                options: product.options
+              })
+            });
+          } else {
+            _this3.hooks.setProduct(originProduct, {
+              discount_list: [],
+              total: product.total,
+              origin_total: product.origin_total,
+              price: product.price
+            });
+          }
+        };
+        return processedProductsMap.get(product._id) || getDefaultProduct();
       });
 
       // 按原始顺序更新优惠券列表，标记已使用和可用的优惠券

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

@@ -25,6 +25,7 @@ export interface RulesModuleAPI {
     }) => DiscountResult;
 }
 type ProductDetail = {
+    isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;
     id: number;
@@ -33,6 +34,9 @@ type ProductDetail = {
     discount_list: Discount[];
     origin_total: number;
     _id: string;
+    options?: any[];
+    bundle?: any[];
+    original_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/dist/solution/BookingByStep/index.js

@@ -681,6 +681,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateCart",
     value: function updateCart(params) {
       var _this5 = this;
+      if (params.resources) {
+        params.resources = params.resources.map(function (n) {
+          n.capacity = 1;
+          return n;
+        });
+      }
       this.store.cart.updateItem(params);
       var targetCartItem = this.store.cart.getItem(params._id);
       if (!targetCartItem) {

package/lib/modules/Rules/index.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
+var import_utils2 = require("../Cart/utils");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -174,16 +175,42 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
-            ...isManualDiscount ? {} : {
-              total: product.origin_total || product.total,
-              price: product.price
-            },
-            discount_list: []
-          })
-        );
+        if (product.isClient) {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              ...isManualDiscount ? {} : {
+                origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+                  product: {
+                    original_price: product.original_price
+                  },
+                  bundle: product.bundle,
+                  options: product.options
+                }),
+                total: (0, import_utils2.getProductTotalPrice)({
+                  product: {
+                    price: product.price
+                  },
+                  bundle: product.bundle,
+                  options: product.options
+                }),
+                price: product.price
+              },
+              discount_list: []
+            })
+          );
+        } else {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              ...isManualDiscount ? {} : {
+                total: product.origin_total || product.total,
+                price: product.price
+              },
+              discount_list: []
+            })
+          );
+        }
         return;
       }
       if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
@@ -203,24 +230,72 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       };
       appliedProducts.push(discountDetail);
       appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-      processedProductsMap.set(
-        product._id,
-        this.hooks.setProduct(originProduct, {
-          discount_list: [discountDetail],
-          price: 0,
-          total: (product.origin_total || product.total) - product.price,
-          origin_total: product.origin_total || product.total
-        })
-      );
+      if (product.isClient) {
+        processedProductsMap.set(
+          product._id,
+          this.hooks.setProduct(originProduct, {
+            discount_list: [discountDetail],
+            price: 0,
+            origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+              product: {
+                original_price: product.original_price
+              },
+              bundle: product.bundle,
+              options: product.options
+            }),
+            total: (0, import_utils2.getProductTotalPrice)({
+              product: {
+                price: "0"
+              },
+              bundle: product.bundle,
+              options: product.options
+            })
+          })
+        );
+      } else {
+        processedProductsMap.set(
+          product._id,
+          this.hooks.setProduct(originProduct, {
+            discount_list: [discountDetail],
+            price: 0,
+            total: (product.origin_total || product.total) - product.price,
+            origin_total: product.origin_total || product.total
+          })
+        );
+      }
     });
     const processedProductList = productList.map((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
-      return processedProductsMap.get(product._id) || this.hooks.setProduct(originProduct, {
-        discount_list: [],
-        total: product.total,
-        origin_total: product.origin_total,
-        price: product.price
-      });
+      const getDefaultProduct = () => {
+        if (product.isClient) {
+          this.hooks.setProduct(originProduct, {
+            discount_list: [],
+            price: product.price,
+            origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+              product: {
+                original_price: product.original_price
+              },
+              bundle: product.bundle,
+              options: product.options
+            }),
+            total: (0, import_utils2.getProductTotalPrice)({
+              product: {
+                price: product.price
+              },
+              bundle: product.bundle,
+              options: product.options
+            })
+          });
+        } else {
+          this.hooks.setProduct(originProduct, {
+            discount_list: [],
+            total: product.total,
+            origin_total: product.origin_total,
+            price: product.price
+          });
+        }
+      };
+      return processedProductsMap.get(product._id) || getDefaultProduct();
     });
     const updatedDiscountList = addModeDiscount.map((discount) => {
       const applicableProducts = discountApplicability.get(discount.id) || [];

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

@@ -25,6 +25,7 @@ export interface RulesModuleAPI {
     }) => DiscountResult;
 }
 type ProductDetail = {
+    isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;
     id: number;
@@ -33,6 +34,9 @@ type ProductDetail = {
     discount_list: Discount[];
     origin_total: number;
     _id: string;
+    options?: any[];
+    bundle?: any[];
+    original_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/solution/BookingByStep/index.js

@@ -295,6 +295,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 更新购物车
   updateCart(params) {
+    if (params.resources) {
+      params.resources = params.resources.map((n) => {
+        n.capacity = 1;
+        return n;
+      });
+    }
     this.store.cart.updateItem(params);
     const targetCartItem = this.store.cart.getItem(params._id);
     if (!targetCartItem) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",
     "prepublishOnly": "npm run build",
-    "deploy": "yarn run build && yarn run changeset && yarn run version && yarn run release"
+    "deploy": "yarn run build && yarn run changeset && yarn run version && npm run release"
   },
   "repository": {
     "type": "git",