@pisell/pisellos 0.0.569 → 0.10.2

package/dist/solution/Checkout/utils/index.js

@@ -284,29 +284,33 @@ export function isProduction() {
  */
 export var logger = {
   info: function info(message) {
+    var _console;
     for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
       args[_key3 - 1] = arguments[_key3];
     }
+    (_console = console).log.apply(_console, ["[Checkout] ".concat(message)].concat(args));
   },
   warn: function warn(message) {
-    var _console;
+    var _console2;
     for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
       args[_key4 - 1] = arguments[_key4];
     }
-    (_console = console).warn.apply(_console, ["[Checkout] ".concat(message)].concat(args));
+    (_console2 = console).warn.apply(_console2, ["[Checkout] ".concat(message)].concat(args));
   },
   error: function error(message) {
-    var _console2;
+    var _console3;
     for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
       args[_key5 - 1] = arguments[_key5];
     }
-    (_console2 = console).error.apply(_console2, ["[Checkout] ".concat(message)].concat(args));
+    (_console3 = console).error.apply(_console3, ["[Checkout] ".concat(message)].concat(args));
   },
   debug: function debug(message) {
     if (!isProduction()) {
+      var _console4;
       for (var _len6 = arguments.length, args = new Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
         args[_key6 - 1] = arguments[_key6];
       }
+      (_console4 = console).debug.apply(_console4, ["[Checkout] ".concat(message)].concat(args));
     }
   }
 };
@@ -420,6 +424,14 @@ export function extractAmountFromCartSummary(cartSummary) {
         break;
     }
   });
+  console.log('[Checkout] 从购物车小计提取金额信息:', {
+    totalAmount: result.totalAmount,
+    subTotal: result.subTotal,
+    taxAmount: result.taxAmount,
+    discountAmount: result.discountAmount,
+    shopDiscountAmount: result.shopDiscountAmount,
+    roundingAmount: result.roundingAmount
+  });
   return result;
 }
 

package/dist/solution/RegisterAndLogin/index.js

@@ -331,9 +331,10 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
             case 13:
               // 预先调用获取区号的方法，初始内存缓存
               this.getCountries();
-              _context4.next = 16;
+              console.log('[RegisterAndLogin] 初始化完成');
+              _context4.next = 17;
               return this.core.effects.emit(RegisterAndLoginHooks.onInited, {});
-            case 16:
+            case 17:
             case "end":
               return _context4.stop();
           }
@@ -2249,46 +2250,63 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
-              _context35.next = 2;
+              console.log('[RegisterAndLogin] Facebook 登录开始', {
+                tokenLength: (token === null || token === void 0 ? void 0 : token.length) || 0,
+                timestamp: Date.now()
+              });
+              _context35.next = 3;
               return this.initFacebookSDK(token);
-            case 2:
+            case 3:
+              console.log('[RegisterAndLogin] Facebook SDK 初始化完成，准备调用 FB.login');
               return _context35.abrupt("return", new Promise(function (resolve, reject) {
+                console.log('[RegisterAndLogin] 调用 FB.login', {
+                  scope: 'email,public_profile'
+                });
                 window.FB.login( /*#__PURE__*/function () {
                   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(response) {
                     var result;
                     return _regeneratorRuntime().wrap(function _callee34$(_context34) {
                       while (1) switch (_context34.prev = _context34.next) {
                         case 0:
+                          console.log('[RegisterAndLogin] FB.login 回调触发', {
+                            hasAuthResponse: Boolean(response === null || response === void 0 ? void 0 : response.authResponse),
+                            status: response === null || response === void 0 ? void 0 : response.status
+                          });
                           if (!response.authResponse) {
-                            _context34.next = 14;
+                            _context34.next = 17;
                             break;
                           }
-                          _context34.prev = 1;
-                          _context34.next = 4;
+                          _context34.prev = 2;
+                          // 直接调用 /auth/facebook/login 接口
+                          console.log('[RegisterAndLogin] 调用后端 facebookLogin 接口');
+                          _context34.next = 6;
                           return _this2.apiCaller.call('facebookLogin', {
                             token: response.authResponse.accessToken
                           });
-                        case 4:
+                        case 6:
                           result = _context34.sent;
+                          console.log('[RegisterAndLogin] facebookLogin 接口返回成功', {
+                            hasResult: Boolean(result)
+                          });
                           resolve(result);
-                          _context34.next = 12;
+                          _context34.next = 15;
                           break;
-                        case 8:
-                          _context34.prev = 8;
-                          _context34.t0 = _context34["catch"](1);
+                        case 11:
+                          _context34.prev = 11;
+                          _context34.t0 = _context34["catch"](2);
                           console.error('[RegisterAndLogin] facebookLogin 接口调用失败', _context34.t0);
                           reject(_context34.t0);
-                        case 12:
-                          _context34.next = 16;
+                        case 15:
+                          _context34.next = 19;
                           break;
-                        case 14:
+                        case 17:
                           console.warn('[RegisterAndLogin] FB.login 用户取消授权或无 authResponse', response);
                           reject(new Error('facebook_login_cancel'));
-                        case 16:
+                        case 19:
                         case "end":
                           return _context34.stop();
                       }
-                    }, _callee34, null, [[1, 8]]);
+                    }, _callee34, null, [[2, 11]]);
                   }));
                   return function (_x31) {
                     return _ref.apply(this, arguments);
@@ -2297,7 +2315,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   scope: 'email,public_profile'
                 });
               }));
-            case 3:
+            case 5:
             case "end":
               return _context35.stop();
           }
@@ -2320,14 +2338,20 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              _context37.next = 2;
+              // 先加载 Apple SDK
+              console.log('[RegisterAndLogin] Apple 登录开始', {
+                tokenLength: (token === null || token === void 0 ? void 0 : token.length) || 0,
+                timestamp: Date.now()
+              });
+              _context37.next = 3;
               return this.initAppleSDK();
-            case 2:
+            case 3:
+              console.log('[RegisterAndLogin] Apple SDK 初始化完成');
               return _context37.abrupt("return", new Promise(function (resolve, reject) {
                 try {
                   var _AppleID, _AppleID2;
                   // 动态创建 Apple 登录按钮元素
-
+                  console.log('[RegisterAndLogin] 创建临时 Apple SignIn 按钮节点');
                   var appleSignInDiv = document.createElement('div');
                   appleSignInDiv.id = 'appleid-signin-temp';
                   appleSignInDiv.setAttribute('data-color', 'black');
@@ -2344,8 +2368,11 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
 
                   // 将元素添加到 body 中
                   document.body.appendChild(appleSignInDiv);
+                  console.log('[RegisterAndLogin] Apple SignIn 按钮已添加到文档');
+
                   // 初始化 Apple ID 按钮
                   if ((_AppleID = window.AppleID) !== null && _AppleID !== void 0 && (_AppleID = _AppleID.auth) !== null && _AppleID !== void 0 && _AppleID.init) {
+                    console.log('[RegisterAndLogin] 调用 AppleID.auth.init');
                     window.AppleID.auth.init({
                       clientId: token,
                       // 使用传入的 token 作为 clientId
@@ -2360,6 +2387,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
 
                   // 直接调用 Apple ID 登录，并处理 Promise
                   if ((_AppleID2 = window.AppleID) !== null && _AppleID2 !== void 0 && (_AppleID2 = _AppleID2.auth) !== null && _AppleID2 !== void 0 && _AppleID2.signIn) {
+                    console.log('[RegisterAndLogin] 调用 AppleID.auth.signIn');
                     window.AppleID.auth.signIn().then( /*#__PURE__*/function () {
                       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(authResult) {
                         var _authResult$authoriza, _authResult$authoriza2, authorizationCode, identityToken, result;
@@ -2371,29 +2399,44 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                               if (document.body.contains(appleSignInDiv)) {
                                 document.body.removeChild(appleSignInDiv);
                               }
+                              console.log('[RegisterAndLogin] Apple SignIn 成功，临时节点已移除', {
+                                hasAuthorization: Boolean(authResult === null || authResult === void 0 ? void 0 : authResult.authorization),
+                                hasUser: Boolean(authResult === null || authResult === void 0 ? void 0 : authResult.user)
+                              });
+
                               // 获取授权码或令牌
                               authorizationCode = (_authResult$authoriza = authResult.authorization) === null || _authResult$authoriza === void 0 ? void 0 : _authResult$authoriza.code;
-                              identityToken = (_authResult$authoriza2 = authResult.authorization) === null || _authResult$authoriza2 === void 0 ? void 0 : _authResult$authoriza2.id_token; // 使用授权码或身份令牌调用后端接口
-                              _context36.next = 6;
+                              identityToken = (_authResult$authoriza2 = authResult.authorization) === null || _authResult$authoriza2 === void 0 ? void 0 : _authResult$authoriza2.id_token;
+                              console.log('[RegisterAndLogin] Apple 授权结果解析', {
+                                hasAuthorizationCode: Boolean(authorizationCode),
+                                hasIdentityToken: Boolean(identityToken)
+                              });
+
+                              // 使用授权码或身份令牌调用后端接口
+                              console.log('[RegisterAndLogin] 调用后端 appleLogin 接口');
+                              _context36.next = 9;
                               return _this3.apiCaller.call('appleLogin', {
                                 code: identityToken || authorizationCode,
                                 login_channel: _this3.channel
                               });
-                            case 6:
+                            case 9:
                               result = _context36.sent;
+                              console.log('[RegisterAndLogin] appleLogin 接口返回成功', {
+                                hasResult: Boolean(result)
+                              });
                               resolve(result);
-                              _context36.next = 14;
+                              _context36.next = 18;
                               break;
-                            case 10:
-                              _context36.prev = 10;
+                            case 14:
+                              _context36.prev = 14;
                               _context36.t0 = _context36["catch"](0);
                               console.error('[RegisterAndLogin] 处理 Apple 登录结果失败', _context36.t0);
                               reject(_context36.t0);
-                            case 14:
+                            case 18:
                             case "end":
                               return _context36.stop();
                           }
-                        }, _callee36, null, [[0, 10]]);
+                        }, _callee36, null, [[0, 14]]);
                       }));
                       return function (_x33) {
                         return _ref2.apply(this, arguments);
@@ -2415,7 +2458,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   reject(error);
                 }
               }));
-            case 3:
+            case 5:
             case "end":
               return _context37.stop();
           }
@@ -2577,6 +2620,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   } catch (error) {
                     console.warn('[RegisterAndLogin] localStorage 更新失败:', error);
                   }
+                  console.log('[RegisterAndLogin] 国家数据已更新');
                 }
               }
               _context39.next = 10;
@@ -2606,6 +2650,8 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
               _context40.next = 2;
               return this.core.effects.emit(RegisterAndLoginHooks.onDestroy, {});
             case 2:
+              console.log('[RegisterAndLogin] 已销毁');
+            case 3:
             case "end":
               return _context40.stop();
           }

package/dist/solution/ScanOrder/index.js

@@ -162,7 +162,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   payload: payload,
                   extra: extra
                 });
-              } else {}
+              } else {
+                console.log('[ScanOrder][log-fallback]', params.title, {
+                  payload: payload,
+                  extra: extra
+                });
+              }
               return _context.abrupt("return");
             case 6:
               _context.next = 8;
@@ -492,48 +497,50 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 this.store.scanOrderLogger.setContext(this.getScanOrderLoggerContext());
               }
               this.registerCustomerLoginListeners();
-              _context6.prev = 18;
-              _context6.next = 21;
+              console.log('[ScanOrder] 初始化开始');
+              _context6.prev = 19;
+              _context6.next = 22;
               return (_this$store$order = this.store.order) === null || _this$store$order === void 0 ? void 0 : _this$store$order.recalculateSummary({
                 createIfMissing: false
               });
-            case 21:
+            case 22:
               (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || _this$store$order2.persistTempOrder();
-              _context6.next = 24;
+              _context6.next = 25;
               return this.loadRuntimeConfigs();
-            case 24:
+            case 25:
               if (!this.store.schedule) {
-                _context6.next = 33;
+                _context6.next = 34;
                 break;
               }
-              _context6.prev = 25;
-              _context6.next = 28;
+              _context6.prev = 26;
+              _context6.next = 29;
               return this.store.schedule.loadAllSchedule();
-            case 28:
-              _context6.next = 33;
+            case 29:
+              _context6.next = 34;
               break;
-            case 30:
-              _context6.prev = 30;
-              _context6.t0 = _context6["catch"](25);
+            case 31:
+              _context6.prev = 31;
+              _context6.t0 = _context6["catch"](26);
               console.warn('[ScanOrder] loadAllSchedule 失败，operating_hours 判定将跳过', _context6.t0);
-            case 33:
-              _context6.next = 35;
+            case 34:
+              _context6.next = 36;
               return this.refreshItemRuleQuantityLimits();
-            case 35:
+            case 36:
               this.store.status = 'ready';
-              _context6.next = 38;
+              console.log('[ScanOrder] 初始化完成');
+              _context6.next = 40;
               return this.core.effects.emit(ScanOrderHooks.onInited, {
                 status: this.store.status
               });
-            case 38:
+            case 40:
               this.logMethodSuccess('initialize', {
                 status: this.store.status
               });
-              _context6.next = 48;
+              _context6.next = 50;
               break;
-            case 41:
-              _context6.prev = 41;
-              _context6.t1 = _context6["catch"](18);
+            case 43:
+              _context6.prev = 43;
+              _context6.t1 = _context6["catch"](19);
               this.store.status = 'error';
               this.store.error = _context6.t1 instanceof Error ? _context6.t1.message : '初始化失败';
               console.error('[ScanOrder] 初始化失败', _context6.t1);
@@ -541,11 +548,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 status: this.store.status
               });
               throw _context6.t1;
-            case 48:
+            case 50:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[18, 41], [25, 30]]);
+        }, _callee6, this, [[19, 43], [26, 31]]);
       }));
       function initialize(_x5) {
         return _initialize.apply(this, arguments);
@@ -565,8 +572,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return this.core.effects.emit(ScanOrderHooks.onDestroy, {});
             case 4:
               _get(_getPrototypeOf(ScanOrderImpl.prototype), "destroy", this).call(this);
+              console.log('[ScanOrder] 已销毁');
               this.logMethodSuccess('destroy');
-            case 6:
+            case 7:
             case "end":
               return _context7.stop();
           }
@@ -586,26 +594,27 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 0:
               this.logMethodStart('retryInit');
               // TODO: 细化重试策略（指数退避、最大重试次数）后替换当前实现
-              _context8.next = 3;
+              console.log('[ScanOrder] retryInit 调用');
+              _context8.next = 4;
               return this.core.effects.emit(ScanOrderHooks.onRetryInit, {});
-            case 3:
-              _context8.prev = 3;
-              _context8.next = 6;
+            case 4:
+              _context8.prev = 4;
+              _context8.next = 7;
               return this.initialize(this.core, this.initializeOptions);
-            case 6:
+            case 7:
               this.logMethodSuccess('retryInit');
-              _context8.next = 13;
+              _context8.next = 14;
               break;
-            case 9:
-              _context8.prev = 9;
-              _context8.t0 = _context8["catch"](3);
+            case 10:
+              _context8.prev = 10;
+              _context8.t0 = _context8["catch"](4);
               this.logMethodError('retryInit', _context8.t0);
               throw _context8.t0;
-            case 13:
+            case 14:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[3, 9]]);
+        }, _callee8, this, [[4, 10]]);
       }));
       function retryInit() {
         return _retryInit.apply(this, arguments);
@@ -621,35 +630,36 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 0:
               this.logMethodStart('refresh');
               // TODO: 接入真实刷新逻辑（资源重拉取、流程重建）后替换当前实现
-              _context9.prev = 1;
+              console.log('[ScanOrder] refresh 调用');
+              _context9.prev = 2;
               this.store.status = 'initializing';
-              _context9.next = 5;
+              _context9.next = 6;
               return this.loadRuntimeConfigs();
-            case 5:
-              _context9.next = 7;
+            case 6:
+              _context9.next = 8;
               return this.refreshItemRuleQuantityLimits();
-            case 7:
+            case 8:
               this.store.status = 'ready';
-              _context9.next = 10;
+              _context9.next = 11;
               return this.core.effects.emit(ScanOrderHooks.onRefresh, {
                 status: this.store.status
               });
-            case 10:
+            case 11:
               this.logMethodSuccess('refresh', {
                 status: this.store.status
               });
-              _context9.next = 17;
+              _context9.next = 18;
               break;
-            case 13:
-              _context9.prev = 13;
-              _context9.t0 = _context9["catch"](1);
+            case 14:
+              _context9.prev = 14;
+              _context9.t0 = _context9["catch"](2);
               this.logMethodError('refresh', _context9.t0);
               throw _context9.t0;
-            case 17:
+            case 18:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[1, 13]]);
+        }, _callee9, this, [[2, 14]]);
       }));
       function refresh() {
         return _refresh.apply(this, arguments);

package/dist/solution/ShopDiscount/index.js

@@ -52,12 +52,12 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList: [],
       discount: null,
       rules: null,
+      holders: [],
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      orderTotalAmount: 0,
-      holders: [],
       bookingSubject: undefined,
+      orderTotalAmount: 0,
       orderId: undefined
     };
     return _this;
@@ -76,6 +76,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.options = options;
               this.store = _objectSpread(_objectSpread({}, this.store), options.store || {});
               this.hooks = (_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 || (_options$otherParams = _options$otherParams.rules) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.hooks;
+              console.log('[ShopDiscount] 初始化完成');
+
               // 获取依赖的插件
               this.initializePlugins();
 
@@ -84,7 +86,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 注册事件监听
               this.registerEventListeners();
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -111,6 +113,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _context2.next = 7;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 7:
+              console.log('[ShopDiscount] 已销毁');
+            case 8:
             case "end":
               return _context2.stop();
           }
@@ -133,7 +137,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.customer = null;
               (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.clear();
               (_this$store$rules2 = this.store.rules) === null || _this$store$rules2 === void 0 || _this$store$rules2.clear();
-            case 4:
+              console.log('[ShopDiscount] clear');
+            case 5:
             case "end":
               return _context3.stop();
           }
@@ -628,27 +633,21 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
-                var _editModeDiscountList, _discount$metadata, _discount$metadata2;
+                var _discount$metadata;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
-                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
-                    num: ((editModeDiscountList === null || editModeDiscountList === void 0 || (_editModeDiscountList = editModeDiscountList[index]) === null || _editModeDiscountList === void 0 || (_editModeDiscountList = _editModeDiscountList.metadata) === null || _editModeDiscountList === void 0 ? void 0 : _editModeDiscountList.num) || 1) + (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || 1)
-                  }),
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$metadata3, _discount$metadata4, _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
-                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
-                    num: ((_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.num) || 1
-                  }),
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.product_discount_difference) || 0).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -824,7 +823,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               scanDiscountIds = scanDiscount.map(function (n) {
                 return n.id;
               });
-              newGoodPassList = goodPassList.filter(function (n) {
+              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
                 return !scanDiscountIds.includes(n.id);
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表

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

@@ -23,15 +23,15 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
-    originalDiscountList: Discount[];
-    currentBookingTime: string | null;
-    filteredDiscountList: Discount[];
-    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;
         main_field?: string;
     }[];
+    originalDiscountList: Discount[];
+    currentBookingTime: string | null;
+    filteredDiscountList: Discount[];
+    orderTotalAmount?: number;
     bookingSubject?: {
         type?: 'form' | 'customer';
         [key: string]: any;
@@ -49,5 +49,4 @@ export interface SetDiscountSelectedParams {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
-    orderId?: number;
 }

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

@@ -2,15 +2,6 @@ import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
 export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
 export declare const isAllNormalProduct: (items: any[]) => boolean;
-/**
- * 获取折扣金额 基于折扣卡类型计算
- * 商品券：直接返回商品价格
- * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
- * @param discount
- * @param total
- * @param price
- * @returns
- */
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格

package/dist/solution/ShopDiscount/utils.js

@@ -30,15 +30,6 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
   });
 };
 
-/**
- * 获取折扣金额 基于折扣卡类型计算 
- * 商品券：直接返回商品价格
- * 折扣卡：根据折扣卡类型计算 固定金额：直接返回折扣卡金额 百分比：根据折扣卡金额计算
- * @param discount 
- * @param total 
- * @param price 
- * @returns 
- */
 /**
  * 获取折扣金额 基于折扣卡类型计算 
  * 商品券：直接返回商品价格