@pisell/pisellos 2.2.20 → 2.2.21

package/dist/modules/Summary/utils.d.ts

@@ -16,7 +16,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/dist/solution/ShopDiscount/index.js

@@ -270,14 +270,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              if (!(this.isWalkIn() && this.isWalkIn(customer === null || customer === void 0 ? void 0 : customer.id))) {
+                _context4.next = 2;
+                break;
+              }
+              return _context4.abrupt("return");
+            case 2:
               if (!(((_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 ? void 0 : _this$store$customer.id) !== customer.id)) {
-                _context4.next = 4;
+                _context4.next = 6;
                 break;
               }
               this.store.customer = customer;
-              _context4.next = 4;
+              _context4.next = 6;
               return this.core.effects.emit("".concat(this.name, ":onCustomerChange"), customer);
-            case 4:
+            case 6:
             case "end":
               return _context4.stop();
           }
@@ -522,9 +528,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     // 是否是walkIn
   }, {
     key: "isWalkIn",
-    value: function isWalkIn() {
+    value: function isWalkIn(id) {
       var _this$getCustomer;
-      return (((_this$getCustomer = this.getCustomer()) === null || _this$getCustomer === void 0 ? void 0 : _this$getCustomer.id) || 1) === 1;
+      return (id !== null && id !== void 0 ? id : ((_this$getCustomer = this.getCustomer()) === null || _this$getCustomer === void 0 ? void 0 : _this$getCustomer.id) || 1) === 1;
     }
 
     // 触发优惠列表变更事件

package/lib/modules/Summary/utils.d.ts

@@ -16,7 +16,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/lib/solution/ShopDiscount/index.js

@@ -185,6 +185,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 设置客户
   async setCustomer(customer) {
     var _a;
+    if (this.isWalkIn() && this.isWalkIn(customer == null ? void 0 : customer.id)) {
+      return;
+    }
     if (((_a = this.store.customer) == null ? void 0 : _a.id) !== customer.id) {
       this.store.customer = customer;
       await this.core.effects.emit(
@@ -348,9 +351,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     return this.store.customer;
   }
   // 是否是walkIn
-  isWalkIn() {
+  isWalkIn(id) {
     var _a;
-    return (((_a = this.getCustomer()) == null ? void 0 : _a.id) || 1) === 1;
+    return (id ?? (((_a = this.getCustomer()) == null ? void 0 : _a.id) || 1)) === 1;
   }
   // 触发优惠列表变更事件
   async emitDiscountListChange(discountList) {

package/package.json

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