@pisell/pisellos 3.0.6 → 3.0.7

package/dist/modules/Rules/index.js

@@ -305,59 +305,59 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }), {}, {
               discount_list: []
             })));
-            return;
-          }
-          if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
-            return;
           }
+          return;
+        }
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
+          return;
+        }
 
-          // 标记优惠券为已使用
-          usedDiscounts.set(selectedDiscount.id, true);
-
-          // 记录实际应用了优惠券的商品信息
-          var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-          var discountDetail = {
-            amount: product.price,
-            type: selectedDiscount.tag,
-            discount: {
-              resource_id: selectedDiscount.id,
-              title: selectedDiscount.format_title,
-              original_amount: product.origin_total,
-              product_id: selectedDiscount.product_id
-            }
-          };
-          appliedProducts.push(discountDetail);
-          appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-
-          // 记录应用了优惠券的商品
-          // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
-          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
-            }));
+        // 标记优惠券为已使用
+        usedDiscounts.set(selectedDiscount.id, true);
+
+        // 记录实际应用了优惠券的商品信息
+        var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+        var discountDetail = {
+          amount: product.price,
+          type: selectedDiscount.tag,
+          discount: {
+            resource_id: selectedDiscount.id,
+            title: selectedDiscount.format_title,
+            original_amount: product.origin_total,
+            product_id: selectedDiscount.product_id
           }
+        };
+        appliedProducts.push(discountDetail);
+        appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
+
+        // 记录应用了优惠券的商品
+        // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
+        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
+          }));
         }
       });
 

package/dist/solution/ShopDiscount/index.js

@@ -483,21 +483,26 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 3:
               result = _context7.sent;
-              if (result !== null && result !== void 0 && result.data) {
-                _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
-                this.setCustomer(customer);
+              if (!(result !== null && result !== void 0 && result.data)) {
+                _context7.next = 9;
+                break;
               }
-              _context7.next = 10;
+              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              this.setCustomer(customer);
+              _context7.next = 9;
+              return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
+            case 9:
+              _context7.next = 14;
               break;
-            case 7:
-              _context7.prev = 7;
+            case 11:
+              _context7.prev = 11;
               _context7.t0 = _context7["catch"](0);
               console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
-            case 10:
+            case 14:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 7]]);
+        }, _callee7, this, [[0, 11]]);
       }));
       function getCustomerWallet(_x6) {
         return _getCustomerWallet.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -5,6 +5,7 @@ export declare enum ShopDiscountHooks {
     onDestroy = "shopDiscount:onDestroy",
     onLoadDiscountList = "shopDiscount:onLoadDiscountList",
     onCustomerChange = "shopDiscount:onCustomerChange",
+    onScanCustomerChange = "shopDiscount:onScanCustomerChange",
     onDiscountListChange = "shopDiscount:onDiscountListChange",
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"

package/dist/solution/ShopDiscount/types.js

@@ -3,6 +3,7 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onDestroy"] = "shopDiscount:onDestroy";
   ShopDiscountHooks["onLoadDiscountList"] = "shopDiscount:onLoadDiscountList";
   ShopDiscountHooks["onCustomerChange"] = "shopDiscount:onCustomerChange";
+  ShopDiscountHooks["onScanCustomerChange"] = "shopDiscount:onScanCustomerChange";
   ShopDiscountHooks["onDiscountListChange"] = "shopDiscount:onDiscountListChange";
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";

package/lib/modules/Rules/index.js

@@ -210,58 +210,58 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               discount_list: []
             })
           );
-          return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
-          return;
+        return;
+      }
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
+        return;
+      }
+      usedDiscounts.set(selectedDiscount.id, true);
+      const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+      const discountDetail = {
+        amount: product.price,
+        type: selectedDiscount.tag,
+        discount: {
+          resource_id: selectedDiscount.id,
+          title: selectedDiscount.format_title,
+          original_amount: product.origin_total,
+          product_id: selectedDiscount.product_id
         }
-        usedDiscounts.set(selectedDiscount.id, true);
-        const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-        const discountDetail = {
-          amount: product.price,
-          type: selectedDiscount.tag,
-          discount: {
-            resource_id: selectedDiscount.id,
-            title: selectedDiscount.format_title,
-            original_amount: product.origin_total,
-            product_id: selectedDiscount.product_id
-          }
-        };
-        appliedProducts.push(discountDetail);
-        appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-        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
+      };
+      appliedProducts.push(discountDetail);
+      appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
+      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) => {

package/lib/solution/ShopDiscount/index.js

@@ -313,6 +313,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (result == null ? void 0 : result.data) {
         const { wallet_pass_list, ...customer } = result.data;
         this.setCustomer(customer);
+        await this.core.effects.emit(
+          import_types.ShopDiscountHooks.onScanCustomerChange,
+          customer
+        );
       }
     } catch (error) {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);

package/lib/solution/ShopDiscount/types.d.ts

@@ -5,6 +5,7 @@ export declare enum ShopDiscountHooks {
     onDestroy = "shopDiscount:onDestroy",
     onLoadDiscountList = "shopDiscount:onLoadDiscountList",
     onCustomerChange = "shopDiscount:onCustomerChange",
+    onScanCustomerChange = "shopDiscount:onScanCustomerChange",
     onDiscountListChange = "shopDiscount:onDiscountListChange",
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"

package/lib/solution/ShopDiscount/types.js

@@ -27,6 +27,7 @@ var ShopDiscountHooks = /* @__PURE__ */ ((ShopDiscountHooks2) => {
   ShopDiscountHooks2["onDestroy"] = "shopDiscount:onDestroy";
   ShopDiscountHooks2["onLoadDiscountList"] = "shopDiscount:onLoadDiscountList";
   ShopDiscountHooks2["onCustomerChange"] = "shopDiscount:onCustomerChange";
+  ShopDiscountHooks2["onScanCustomerChange"] = "shopDiscount:onScanCustomerChange";
   ShopDiscountHooks2["onDiscountListChange"] = "shopDiscount:onDiscountListChange";
   ShopDiscountHooks2["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks2["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";

package/package.json

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