@pisell/pisellos 2.2.220 → 2.2.222

package/dist/server/modules/schedule/index.js

@@ -32,9 +32,9 @@ dayjs.extend(isSameOrBefore);
 dayjs.extend(isSameOrAfter);
 
 /**
- * IndexDB 存储名称
+ * SQLite 存储名称
  */
-var INDEXDB_STORE_NAME = 'schedule';
+var SCHEDULE_STORE_NAME = 'schedule';
 
 /**
  * Schedule 模块（扩展版本）
@@ -54,7 +54,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", {});
     _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
-    // IndexDBManager 实例
+    // SQLiteAdapter 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     return _this;
   }
@@ -149,16 +149,16 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 this.store.map = new Map();
               }
 
-              // 获取并存储 dbManager 和 logger
+              // 获取并存储 SQLite 和 logger
               appPlugin = core.getPlugin('app');
               if (appPlugin) {
                 app = appPlugin.getApp();
-                this.dbManager = app.dbManager;
+                this.dbManager = app.sqlite;
                 this.logger = app.logger;
                 if (this.dbManager) {
-                  console.log('[Schedule] IndexDB Manager 已初始化');
+                  console.log('[Schedule] SQLite 已初始化');
                 } else {
-                  console.warn('[Schedule] IndexDB Manager 未找到');
+                  console.warn('[Schedule] SQLite 未找到');
                 }
               }
               this.logInfo('模块初始化完成', {
@@ -206,9 +206,9 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 duration: "".concat(duration, "ms")
               });
 
-              // 保存到 IndexDB
+              // 保存到 SQLite
               _context2.next = 11;
-              return this.saveScheduleToIndexDB(list);
+              return this.saveScheduleToSQLite(list);
             case 11:
               this.setScheduleList(list);
               return _context2.abrupt("return", list);
@@ -334,25 +334,25 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.scheduleList = [];
               this.store.map.clear();
-              // 同时清空 IndexDB 中的数据
+              // 同时清空 SQLite 中的数据
               if (!this.dbManager) {
                 _context3.next = 16;
                 break;
               }
               _context3.prev = 4;
               _context3.next = 7;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              return this.dbManager.clear(SCHEDULE_STORE_NAME);
             case 7:
-              console.log('[Schedule] IndexDB 缓存已清空');
-              this.logInfo('IndexDB 缓存已清空');
+              console.log('[Schedule] SQLite 缓存已清空');
+              this.logInfo('SQLite 缓存已清空');
               _context3.next = 16;
               break;
             case 11:
               _context3.prev = 11;
               _context3.t0 = _context3["catch"](4);
               errorMessage = _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0);
-              console.error('[Schedule] 清空 IndexDB 缓存失败:', _context3.t0);
-              this.logError('清空 IndexDB 缓存失败', {
+              console.error('[Schedule] 清空 SQLite 缓存失败:', _context3.t0);
+              this.logError('清空 SQLite 缓存失败', {
                 error: errorMessage
               });
             case 16:
@@ -397,13 +397,13 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 从 IndexDB 加载日程数据
+     * 从 SQLite 加载日程数据
      * @private
      */
   }, {
-    key: "loadScheduleFromIndexDB",
+    key: "loadScheduleFromSQLite",
     value: (function () {
-      var _loadScheduleFromIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _loadScheduleFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var _scheduleList$length, scheduleList, errorMessage;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -412,15 +412,15 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 _context4.next = 3;
                 break;
               }
-              this.logWarning('loadScheduleFromIndexDB: dbManager 不可用');
+              this.logWarning('loadScheduleFromSQLite: SQLite 不可用');
               return _context4.abrupt("return", []);
             case 3:
               _context4.prev = 3;
               _context4.next = 6;
-              return this.dbManager.getAll(INDEXDB_STORE_NAME);
+              return this.dbManager.getAll(SCHEDULE_STORE_NAME);
             case 6:
               scheduleList = _context4.sent;
-              this.logInfo('从 IndexDB 加载日程数据', {
+              this.logInfo('从 SQLite 加载日程数据', {
                 scheduleCount: (_scheduleList$length = scheduleList === null || scheduleList === void 0 ? void 0 : scheduleList.length) !== null && _scheduleList$length !== void 0 ? _scheduleList$length : 0
               });
               return _context4.abrupt("return", scheduleList || []);
@@ -428,8 +428,8 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               _context4.prev = 11;
               _context4.t0 = _context4["catch"](3);
               errorMessage = _context4.t0 instanceof Error ? _context4.t0.message : String(_context4.t0);
-              console.error('[Schedule] 从 IndexDB 读取数据失败:', _context4.t0);
-              this.logError('从 IndexDB 读取数据失败', {
+              console.error('[Schedule] 从 SQLite 读取数据失败:', _context4.t0);
+              this.logError('从 SQLite 读取数据失败', {
                 error: errorMessage
               });
               return _context4.abrupt("return", []);
@@ -439,22 +439,22 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this, [[3, 11]]);
       }));
-      function loadScheduleFromIndexDB() {
-        return _loadScheduleFromIndexDB.apply(this, arguments);
+      function loadScheduleFromSQLite() {
+        return _loadScheduleFromSQLite.apply(this, arguments);
       }
-      return loadScheduleFromIndexDB;
+      return loadScheduleFromSQLite;
     }()
     /**
-     * 保存日程数据到 IndexDB
+     * 保存日程数据到 SQLite
      * @private
      */
     )
   }, {
-    key: "saveScheduleToIndexDB",
+    key: "saveScheduleToSQLite",
     value: (function () {
-      var _saveScheduleToIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(scheduleList) {
+      var _saveScheduleToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(scheduleList) {
         var _this4 = this;
-        var savePromises, errorMessage;
+        var errorMessage;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -462,48 +462,70 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 _context5.next = 3;
                 break;
               }
-              this.logWarning('saveScheduleToIndexDB: dbManager 不可用');
+              this.logWarning('saveScheduleToSQLite: SQLite 不可用');
               return _context5.abrupt("return");
             case 3:
-              this.logInfo('开始保存日程数据到 IndexDB', {
+              this.logInfo('开始保存日程数据到 SQLite', {
                 scheduleCount: scheduleList.length
               });
               _context5.prev = 4;
               _context5.next = 7;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              return this.dbManager.clear(SCHEDULE_STORE_NAME);
             case 7:
-              // 逐个保存日程（每个日程是独立的记录）
-              savePromises = scheduleList.map(function (schedule) {
-                return _this4.dbManager.add(INDEXDB_STORE_NAME, schedule);
-              });
-              _context5.next = 10;
-              return Promise.all(savePromises);
-            case 10:
-              console.log("[Schedule] \u5DF2\u5C06 ".concat(scheduleList.length, " \u6761\u65E5\u7A0B\u6570\u636E\u4FDD\u5B58\u5230 IndexDB"));
-              this.logInfo('日程数据已保存到 IndexDB', {
+              if (!(scheduleList.length > 0)) {
+                _context5.next = 20;
+                break;
+              }
+              if (!(typeof this.dbManager.bulkAdd === 'function')) {
+                _context5.next = 13;
+                break;
+              }
+              _context5.next = 11;
+              return this.dbManager.bulkAdd(SCHEDULE_STORE_NAME, scheduleList);
+            case 11:
+              _context5.next = 20;
+              break;
+            case 13:
+              if (!(typeof this.dbManager.bulkUpdate === 'function')) {
+                _context5.next = 18;
+                break;
+              }
+              _context5.next = 16;
+              return this.dbManager.bulkUpdate(SCHEDULE_STORE_NAME, scheduleList);
+            case 16:
+              _context5.next = 20;
+              break;
+            case 18:
+              _context5.next = 20;
+              return Promise.all(scheduleList.map(function (schedule) {
+                return _this4.dbManager.add(SCHEDULE_STORE_NAME, schedule);
+              }));
+            case 20:
+              console.log("[Schedule] \u5DF2\u5C06 ".concat(scheduleList.length, " \u6761\u65E5\u7A0B\u6570\u636E\u4FDD\u5B58\u5230 SQLite"));
+              this.logInfo('日程数据已保存到 SQLite', {
                 scheduleCount: scheduleList.length
               });
-              _context5.next = 19;
+              _context5.next = 29;
               break;
-            case 14:
-              _context5.prev = 14;
+            case 24:
+              _context5.prev = 24;
               _context5.t0 = _context5["catch"](4);
               errorMessage = _context5.t0 instanceof Error ? _context5.t0.message : String(_context5.t0);
-              console.error('[Schedule] 保存数据到 IndexDB 失败:', _context5.t0);
-              this.logError('保存数据到 IndexDB 失败', {
+              console.error('[Schedule] 保存数据到 SQLite 失败:', _context5.t0);
+              this.logError('保存数据到 SQLite 失败', {
                 scheduleCount: scheduleList.length,
                 error: errorMessage
               });
-            case 19:
+            case 29:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[4, 14]]);
+        }, _callee5, this, [[4, 24]]);
       }));
-      function saveScheduleToIndexDB(_x3) {
-        return _saveScheduleToIndexDB.apply(this, arguments);
+      function saveScheduleToSQLite(_x3) {
+        return _saveScheduleToSQLite.apply(this, arguments);
       }
-      return saveScheduleToIndexDB;
+      return saveScheduleToSQLite;
     }()
     /**
      * 预加载模块数据（统一接口）
@@ -523,36 +545,36 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('开始预加载数据');
               _context6.prev = 3;
               _context6.next = 6;
-              return this.loadScheduleFromIndexDB();
+              return this.loadScheduleFromSQLite();
             case 6:
               cachedData = _context6.sent;
               if (!(cachedData && cachedData.length > 0)) {
                 _context6.next = 14;
                 break;
               }
-              console.log("[Schedule] \u4ECE IndexDB \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
+              console.log("[Schedule] \u4ECE SQLite \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
               // 将缓存数据放入 store
               this.store.scheduleList = cloneDeep(cachedData);
               // 同步更新 Map 缓存
               this.syncScheduleMap();
               duration = Date.now() - startTime;
-              this.logInfo('预加载完成（从 IndexDB）', {
+              this.logInfo('预加载完成（从 SQLite）', {
                 scheduleCount: cachedData.length,
                 duration: "".concat(duration, "ms"),
-                source: 'IndexDB'
+                source: 'SQLite'
               });
               return _context6.abrupt("return");
             case 14:
-              console.log('[Schedule] IndexDB 中没有缓存数据，从服务器加载...');
-              this.logInfo('IndexDB 中没有缓存数据，准备从服务器加载');
+              console.log('[Schedule] SQLite 中没有缓存数据，从服务器加载...');
+              this.logInfo('SQLite 中没有缓存数据，准备从服务器加载');
               _context6.next = 23;
               break;
             case 18:
               _context6.prev = 18;
               _context6.t0 = _context6["catch"](3);
               errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
-              console.warn('[Schedule] 从 IndexDB 加载数据失败:', _context6.t0);
-              this.logWarning('从 IndexDB 加载数据失败，准备从服务器加载', {
+              console.warn('[Schedule] 从 SQLite 加载数据失败:', _context6.t0);
+              this.logWarning('从 SQLite 加载数据失败，准备从服务器加载', {
                 error: errorMessage
               });
             case 23:
@@ -560,30 +582,24 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               return this.loadAllSchedule();
             case 25:
               scheduleList = _context6.sent;
-              if (!(scheduleList && scheduleList.length > 0)) {
-                _context6.next = 35;
-                break;
+              // 3. 将服务器数据放入 store
+              if (scheduleList && scheduleList.length > 0) {
+                this.store.scheduleList = cloneDeep(scheduleList);
+                // 同步更新 Map 缓存
+                this.syncScheduleMap();
+                _duration2 = Date.now() - startTime;
+                this.logInfo('预加载完成（从服务器）', {
+                  scheduleCount: scheduleList.length,
+                  duration: "".concat(_duration2, "ms"),
+                  source: 'Server'
+                });
+              } else {
+                _duration3 = Date.now() - startTime;
+                this.logWarning('预加载完成但未获取到数据', {
+                  duration: "".concat(_duration3, "ms")
+                });
               }
-              _context6.next = 29;
-              return this.saveScheduleToIndexDB(scheduleList);
-            case 29:
-              this.store.scheduleList = cloneDeep(scheduleList);
-              // 同步更新 Map 缓存
-              this.syncScheduleMap();
-              _duration2 = Date.now() - startTime;
-              this.logInfo('预加载完成（从服务器）', {
-                scheduleCount: scheduleList.length,
-                duration: "".concat(_duration2, "ms"),
-                source: 'Server'
-              });
-              _context6.next = 37;
-              break;
-            case 35:
-              _duration3 = Date.now() - startTime;
-              this.logWarning('预加载完成但未获取到数据', {
-                duration: "".concat(_duration3, "ms")
-              });
-            case 37:
+            case 27:
             case "end":
               return _context6.stop();
           }

package/dist/server/utils/small-ticket.d.ts

@@ -37,7 +37,9 @@ export interface SmallTicketProduct {
     extension_list: any[];
     options?: Array<{
         name: string;
-        value: string;
+        num?: number;
+        price?: string;
+        value?: string;
     }>;
     variant?: string;
     combinations?: any[];

package/dist/server/utils/small-ticket.js

@@ -145,7 +145,7 @@ function buildBaseData(params) {
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale;
-  var orderNumber = stringify(order.order_number || order.shop_full_order_number || order.shop_order_number || order.external_sale_number);
+  var orderNumber = stringify(order.buzzer || order.shop_full_order_number);
   return {
     shop_name: stringify(shopInfo.name || order.shop_name),
     note: stringify(order.note),
@@ -173,24 +173,33 @@ function buildProducts(order, locale, productMap) {
       productMap: productMap,
       locale: locale
     });
+    var currencySymbol = getCurrencySymbol(order, null);
+    var options = normalizeProductOptions({
+      product: product,
+      locale: locale,
+      currencySymbol: currencySymbol
+    });
+    var combinations = normalizeProductCombinations({
+      product: product,
+      productMap: productMap,
+      locale: locale,
+      currencySymbol: currencySymbol
+    });
     return _objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
-      selling_price: formatMoney(sellingPrice, getCurrencySymbol(order, null)),
-      original_price: formatMoney(originalPrice, getCurrencySymbol(order, null)),
-      total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), getCurrencySymbol(order, null)),
+      selling_price: formatMoney(sellingPrice, currencySymbol),
+      original_price: formatMoney(originalPrice, currencySymbol),
+      total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: Array.isArray(product.extension_list) ? product.extension_list : []
-    }, Array.isArray(product.options) ? {
-      options: product.options.map(function (option) {
-        return {
-          name: getLocalizedValue(option.name || option.title, locale),
-          value: getLocalizedValue(option.value || option.option || option.item, locale)
-        };
-      })
+    }, options.length ? {
+      options: options
     } : {}), product.variant ? {
       variant: getLocalizedValue(product.variant, locale)
     } : {}), Array.isArray(product.combinations) ? {
       combinations: product.combinations
+    } : combinations.length ? {
+      combinations: combinations
     } : {});
   });
 }
@@ -206,6 +215,85 @@ function resolveProductTitle(params) {
   if (!fallbackProduct) return '';
   return getLocalizedValue(fallbackProduct.product_title || fallbackProduct.title || fallbackProduct.name || fallbackProduct.format_title || ((_fallbackProduct$prod = fallbackProduct.product) === null || _fallbackProduct$prod === void 0 ? void 0 : _fallbackProduct$prod.title), locale);
 }
+function normalizeProductOptions(params) {
+  var _product$product_sku;
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  var rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) ? product.product_sku.option : [];
+  return rawOptions.map(function (option) {
+    var _ref8, _option$original_pric, _ref9, _option$value, _option$num;
+    var price = (_ref8 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref8 !== void 0 ? _ref8 : option.price;
+    var value = (_ref9 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref9 !== void 0 ? _ref9 : option.item;
+    return _objectSpread(_objectSpread(_objectSpread({
+      name: getLocalizedValue(option.name || option.title, locale)
+    }, option.num !== undefined || option.quantity !== undefined ? {
+      num: toNumber((_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity, 1)
+    } : {}), price !== undefined && price !== null && price !== '' ? {
+      price: formatMoney(price, currencySymbol)
+    } : {}), value !== undefined && value !== null && value !== '' ? {
+      value: getLocalizedValue(value, locale)
+    } : {});
+  });
+}
+function normalizeProductCombinations(params) {
+  var product = params.product,
+    productMap = params.productMap,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
+  return bundles.map(function (bundle) {
+    var _ref10, _bundle$num;
+    var combinationsOptions = normalizeProductOptions({
+      product: {},
+      locale: locale,
+      currencySymbol: currencySymbol,
+      options: Array.isArray(bundle.option) ? bundle.option : []
+    });
+    var baseTitle = resolveBundleProductTitle({
+      bundle: bundle,
+      productMap: productMap,
+      locale: locale
+    });
+    var optionTitle = buildOptionTitleSuffix(combinationsOptions);
+    return {
+      product_title: "".concat(baseTitle).concat(optionTitle),
+      product_quantity: toNumber((_ref10 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref10 !== void 0 ? _ref10 : 1, 1),
+      price: formatBundlePrice(bundle, currencySymbol),
+      combinations_options: combinationsOptions
+    };
+  });
+}
+function resolveBundleProductTitle(params) {
+  var _bundle$product, _ref11, _ref12, _bundle$bundle_produc, _fallbackProduct$prod2;
+  var bundle = params.bundle,
+    productMap = params.productMap,
+    locale = params.locale;
+  var ownTitle = getLocalizedValue(bundle.product_title || bundle.title || bundle.name || ((_bundle$product = bundle.product) === null || _bundle$product === void 0 ? void 0 : _bundle$product.title), locale);
+  if (ownTitle) return ownTitle;
+  var productId = (_ref11 = (_ref12 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref12 !== void 0 ? _ref12 : bundle.product_id) !== null && _ref11 !== void 0 ? _ref11 : bundle.id;
+  var fallbackProduct = productId !== undefined && productId !== null ? productMap[productId] || productMap[String(productId)] : null;
+  if (!fallbackProduct) return '';
+  return getLocalizedValue(fallbackProduct.product_title || fallbackProduct.title || fallbackProduct.name || fallbackProduct.format_title || ((_fallbackProduct$prod2 = fallbackProduct.product) === null || _fallbackProduct$prod2 === void 0 ? void 0 : _fallbackProduct$prod2.title), locale);
+}
+function buildOptionTitleSuffix(options) {
+  var text = options.map(function (option) {
+    var _option$num2;
+    var name = stringify(option.name).trim();
+    if (!name) return '';
+    var quantity = (_option$num2 = option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1;
+    return "".concat(name, " x ").concat(quantity);
+  }).filter(Boolean).join(', ');
+  return text ? "(".concat(text, ")") : '';
+}
+function formatBundlePrice(bundle, currencySymbol) {
+  var _ref13, _ref14, _bundle$bundle_sellin;
+  var value = (_ref13 = (_ref14 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref14 !== void 0 ? _ref14 : bundle.price) !== null && _ref13 !== void 0 ? _ref13 : 0;
+  var amount = new Decimal(toMoneyNumber(value));
+  var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
+  if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
+  return formatMoney(amount, currencySymbol);
+}
 function buildFees(params) {
   var order = params.order,
     shopInfo = params.shopInfo,
@@ -215,9 +303,9 @@ function buildFees(params) {
     currencySymbol = params.currencySymbol;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref8, _surcharge$amount;
+    var _ref15, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref8 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref8 !== void 0 ? _ref8 : surcharge.total_amount;
+    var value = (_ref15 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref15 !== void 0 ? _ref15 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -352,8 +440,8 @@ function buildPaymentData(params) {
         currencySymbol: params.currencySymbol
       })));
     } else {
-      var _ref9, _payment$remaining_am, _payment$metadata;
-      var remainingAmount = (_ref9 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref9 !== void 0 ? _ref9 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+      var _ref16, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref16 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref16 !== void 0 ? _ref16 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
       if (remainingAmount !== undefined && remainingAmount !== null) {
         items.push({
           item: label(params.locale, 'remainingAmount'),
@@ -461,13 +549,13 @@ function label(locale, key) {
   return ((_LABELS$locale = LABELS[locale]) === null || _LABELS$locale === void 0 ? void 0 : _LABELS$locale[key]) || LABELS.en[key] || key;
 }
 function getLocalizedValue(value, locale) {
-  var _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _value$locale;
+  var _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _value$locale;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
-  return stringify((_ref10 = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_ref15 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref15 !== void 0 ? _ref15 : value.default) !== null && _ref14 !== void 0 ? _ref14 : value.en) !== null && _ref13 !== void 0 ? _ref13 : value.zh_CN) !== null && _ref12 !== void 0 ? _ref12 : value['zh-CN']) !== null && _ref11 !== void 0 ? _ref11 : Object.values(value).find(function (item) {
+  return stringify((_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref22 !== void 0 ? _ref22 : value.default) !== null && _ref21 !== void 0 ? _ref21 : value.en) !== null && _ref20 !== void 0 ? _ref20 : value.zh_CN) !== null && _ref19 !== void 0 ? _ref19 : value['zh-CN']) !== null && _ref18 !== void 0 ? _ref18 : Object.values(value).find(function (item) {
     return typeof item === 'string' || typeof item === 'number';
-  })) !== null && _ref10 !== void 0 ? _ref10 : '');
+  })) !== null && _ref17 !== void 0 ? _ref17 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();

package/dist/solution/BaseSales/index.js

@@ -98,7 +98,7 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
 }
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
   if (!currentTempOrder) return loadedRecord;
-  return mergeWith(cloneDeep(currentTempOrder), cloneDeep(loadedRecord || {}), function (currentValue, loadedValue, key) {
+  var mergedRecord = mergeWith(cloneDeep(currentTempOrder), cloneDeep(loadedRecord || {}), function (currentValue, loadedValue, key) {
     if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
       var metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
       if (metadataKey) {
@@ -112,6 +112,8 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
     }
     return undefined;
   });
+  delete mergedRecord.request_unique_idempotency_token;
+  return mergedRecord;
 }
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
@@ -2114,6 +2116,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
       var _this$otherParams16,
+        _paymentRecord$paymen,
         _this7 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
       var paymentRecord = payment;
@@ -2132,8 +2135,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (!metadata.unique_payment_number) {
         metadata.unique_payment_number = createUuidV4();
       }
+      var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : dayjs().format('YYYY-MM-DD HH:mm:ss');
       var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread({}, paymentRecord), {}, {
-        metadata: metadata
+        metadata: metadata,
+        payment_time: paymentTime
       }));
       var amountSnapshot = this.store.order.getOrderAmountSnapshot();
       var syncState = this.store.order.getOrderSyncState();

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -109,7 +109,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      *
      * @returns loadSalesDetail 的返回值
      */
-    refreshSalesDetail(): Promise<ISalesDetail>;
+    refreshSalesDetail(params?: {
+        forceRemote?: boolean;
+    }): Promise<ISalesDetail>;
     /**
      * 获取商品列表
      * @param params 包含 schedule_date 的参数
@@ -310,7 +312,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -786,30 +786,34 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: (function () {
       var _refreshSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var _this$store$order3, _this$store$order3$ge;
-        var tempOrder, orderId;
+        var params,
+          tempOrder,
+          orderId,
+          _args11 = arguments;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
+              params = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
               tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getTempOrder) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3);
               if (tempOrder) {
-                _context11.next = 3;
+                _context11.next = 4;
                 break;
               }
               throw new Error('refreshSalesDetail: tempOrder 未加载');
-            case 3:
+            case 4:
               orderId = tempOrder.order_id;
               if (!(orderId === undefined || orderId === null)) {
-                _context11.next = 6;
+                _context11.next = 7;
                 break;
               }
               return _context11.abrupt("return", {});
-            case 6:
+            case 7:
               return _context11.abrupt("return", this.loadSalesDetail({
                 orderId: Number(orderId),
-                merge: true
-                // forceRemote: true,
+                // merge: true
+                forceRemote: params.forceRemote
               }));
-            case 7:
+            case 8:
             case "end":
               return _context11.stop();
           }