@pisell/pisellos 2.3.73 → 2.3.75

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

@@ -82,9 +82,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               if (appPlugin) {
                 app = appPlugin.getApp();
                 this.dbManager = app.dbManager;
-                if (this.dbManager) {
-                  console.log('[Quotation] IndexDB Manager 已初始化');
-                } else {
+                if (this.dbManager) {} else {
                   console.warn('[Quotation] IndexDB Manager 未找到');
                 }
               }
@@ -319,27 +317,24 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
 
               // 同时清空 IndexDB 中的数据
               if (!this.dbManager) {
-                _context5.next = 11;
+                _context5.next = 10;
                 break;
               }
               _context5.prev = 2;
               _context5.next = 5;
               return this.dbManager.clear(INDEXDB_STORE_NAME);
             case 5:
-              console.log('[Quotation] IndexDB 缓存已清空');
-              _context5.next = 11;
+              _context5.next = 10;
               break;
-            case 8:
-              _context5.prev = 8;
+            case 7:
+              _context5.prev = 7;
               _context5.t0 = _context5["catch"](2);
               console.error('[Quotation] 清空 IndexDB 缓存失败:', _context5.t0);
-            case 11:
-              console.log('[Quotation] 缓存已清空');
-            case 12:
+            case 10:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 8]]);
+        }, _callee5, this, [[2, 7]]);
       }));
       function clear() {
         return _clear.apply(this, arguments);
@@ -495,18 +490,17 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               _context7.next = 8;
               return Promise.all(savePromises);
             case 8:
-              console.log("[Quotation] \u5DF2\u5C06 ".concat(quotationList.length, " \u6761\u62A5\u4EF7\u5355\u6570\u636E\u4FDD\u5B58\u5230 IndexDB"));
-              _context7.next = 14;
+              _context7.next = 13;
               break;
-            case 11:
-              _context7.prev = 11;
+            case 10:
+              _context7.prev = 10;
               _context7.t0 = _context7["catch"](2);
               console.error('[Quotation] 保存数据到 IndexDB 失败:', _context7.t0);
-            case 14:
+            case 13:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[2, 11]]);
+        }, _callee7, this, [[2, 10]]);
       }));
       function saveQuotationToIndexDB(_x5) {
         return _saveQuotationToIndexDB.apply(this, arguments);
@@ -526,48 +520,45 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              console.log('[Quotation] 开始预加载数据...');
-              _context8.prev = 1;
-              _context8.next = 4;
+              _context8.prev = 0;
+              _context8.next = 3;
               return this.loadQuotationFromIndexDB();
-            case 4:
+            case 3:
               cachedData = _context8.sent;
               if (!(cachedData && cachedData.length > 0)) {
-                _context8.next = 10;
+                _context8.next = 8;
                 break;
               }
-              console.log("[Quotation] \u4ECE IndexDB \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u62A5\u4EF7\u5355\u6570\u636E"));
               // 将缓存数据放入 store
               this.store.quotationList = cloneDeep(cachedData);
               this.core.effects.emit(QuotationHooks.onQuotationChanged, this.store.quotationList);
               return _context8.abrupt("return");
-            case 10:
-              console.log('[Quotation] IndexDB 中没有缓存数据，从服务器加载...');
-              _context8.next = 16;
+            case 8:
+              _context8.next = 13;
               break;
-            case 13:
-              _context8.prev = 13;
-              _context8.t0 = _context8["catch"](1);
+            case 10:
+              _context8.prev = 10;
+              _context8.t0 = _context8["catch"](0);
               console.warn('[Quotation] 从 IndexDB 加载数据失败:', _context8.t0);
-            case 16:
-              _context8.next = 18;
+            case 13:
+              _context8.next = 15;
               return this.loadQuotationList();
-            case 18:
+            case 15:
               quotationList = _context8.sent;
               if (!(quotationList && quotationList.length > 0)) {
-                _context8.next = 24;
+                _context8.next = 21;
                 break;
               }
-              _context8.next = 22;
+              _context8.next = 19;
               return this.saveQuotationToIndexDB(quotationList);
-            case 22:
+            case 19:
               this.store.quotationList = cloneDeep(quotationList);
               this.core.effects.emit(QuotationHooks.onQuotationChanged, this.store.quotationList);
-            case 24:
+            case 21:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[1, 13]]);
+        }, _callee8, this, [[0, 10]]);
       }));
       function preload() {
         return _preload.apply(this, arguments);

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

@@ -149,41 +149,49 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.setupResourceSync();
-            case 2:
-              _context2.next = 4;
               return this.loadResourcesFromSQLite();
-            case 4:
+            case 2:
               cachedResources = _context2.sent;
               if (!(cachedResources.length > 0)) {
-                _context2.next = 12;
+                _context2.next = 10;
                 break;
               }
               this.store.list = cloneDeep(cachedResources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 10;
+              _context2.next = 8;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
+            case 8:
+              // 二次启动优先使用 SQLite。pubsub 注册及远端校准继续在后台执行，
+              // setupResourceSync 完成后会合并最新数据并回写 SQLite。
+              void this.setupResourceSync().catch(function (error) {
+                _this3.logError('后台初始化资源同步失败', error);
+              });
+              return _context2.abrupt("return");
             case 10:
-              _context2.next = 20;
-              break;
+              _context2.next = 12;
+              return this.setupResourceSync();
             case 12:
-              _context2.next = 14;
+              if (!(this.store.list.length === 0)) {
+                _context2.next = 21;
+                break;
+              }
+              _context2.next = 15;
               return this.loadResourcesByServer();
-            case 14:
+            case 15:
               resources = _context2.sent;
               if (!(resources.length > 0)) {
-                _context2.next = 20;
+                _context2.next = 21;
                 break;
               }
               this.store.list = cloneDeep(resources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 20;
+              _context2.next = 21;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
-            case 20:
+            case 21:
             case "end":
               return _context2.stop();
           }
@@ -790,17 +798,16 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 4:
               result = _context8.sent;
-              console.log('result', result);
               this.logInfo('setupResourceSync: 资源列表查询结果', {
                 result: result
               });
               if (!(result !== null && result !== void 0 && (_result$data = result.data) !== null && _result$data !== void 0 && (_result$data = _result$data.list) !== null && _result$data !== void 0 && _result$data.length)) {
-                _context8.next = 10;
+                _context8.next = 9;
                 break;
               }
-              _context8.next = 10;
+              _context8.next = 9;
               return this.mergeResourcesToStore(result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.list);
-            case 10:
+            case 9:
             case "end":
               return _context8.stop();
           }

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

@@ -157,9 +157,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 app = appPlugin.getApp();
                 this.dbManager = app.sqlite;
                 this.logger = app.logger;
-                if (this.dbManager) {
-                  console.log('[Schedule] SQLite 已初始化');
-                } else {
+                if (this.dbManager) {} else {
                   console.warn('[Schedule] SQLite 未找到');
                 }
               }
@@ -323,7 +321,6 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator2.f();
       }
-      console.log("[Schedule] Map \u7F13\u5B58\u5DF2\u540C\u6B65\uFF0C\u5171 ".concat(this.store.map.size, " \u4E2A\u65E5\u7A0B"));
     }
 
     /**
@@ -344,32 +341,31 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               this.store.map.clear();
               // 同时清空 SQLite 中的数据
               if (!this.dbManager) {
-                _context3.next = 16;
+                _context3.next = 15;
                 break;
               }
               _context3.prev = 4;
               _context3.next = 7;
               return this.dbManager.clear(SCHEDULE_STORE_NAME);
             case 7:
-              console.log('[Schedule] SQLite 缓存已清空');
               this.logInfo('SQLite 缓存已清空');
-              _context3.next = 16;
+              _context3.next = 15;
               break;
-            case 11:
-              _context3.prev = 11;
+            case 10:
+              _context3.prev = 10;
               _context3.t0 = _context3["catch"](4);
               errorMessage = _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0);
               console.error('[Schedule] 清空 SQLite 缓存失败:', _context3.t0);
               this.logError('清空 SQLite 缓存失败', {
                 error: errorMessage
               });
-            case 16:
+            case 15:
               this.logInfo('缓存清空完成');
-            case 17:
+            case 16:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[4, 11]]);
+        }, _callee3, this, [[4, 10]]);
       }));
       function clear() {
         return _clear.apply(this, arguments);
@@ -509,14 +505,13 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 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 = 29;
+              _context5.next = 28;
               break;
-            case 24:
-              _context5.prev = 24;
+            case 23:
+              _context5.prev = 23;
               _context5.t0 = _context5["catch"](4);
               errorMessage = _context5.t0 instanceof Error ? _context5.t0.message : String(_context5.t0);
               console.error('[Schedule] 保存数据到 SQLite 失败:', _context5.t0);
@@ -524,11 +519,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 scheduleCount: scheduleList.length,
                 error: errorMessage
               });
-            case 29:
+            case 28:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[4, 24]]);
+        }, _callee5, this, [[4, 23]]);
       }));
       function saveScheduleToSQLite(_x3) {
         return _saveScheduleToSQLite.apply(this, arguments);
@@ -548,19 +543,17 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              console.log('[Schedule] 开始预加载数据...');
               startTime = Date.now();
               this.logInfo('开始预加载数据');
-              _context6.prev = 3;
-              _context6.next = 6;
+              _context6.prev = 2;
+              _context6.next = 5;
               return this.loadScheduleFromSQLite();
-            case 6:
+            case 5:
               cachedData = _context6.sent;
               if (!(cachedData && cachedData.length > 0)) {
-                _context6.next = 14;
+                _context6.next = 12;
                 break;
               }
-              console.log("[Schedule] \u4ECE SQLite \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
               // 将缓存数据放入 store
               this.store.scheduleList = cloneDeep(cachedData);
               // 同步更新 Map 缓存
@@ -572,23 +565,22 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 source: 'SQLite'
               });
               return _context6.abrupt("return");
-            case 14:
-              console.log('[Schedule] SQLite 中没有缓存数据，从服务器加载...');
+            case 12:
               this.logInfo('SQLite 中没有缓存数据，准备从服务器加载');
-              _context6.next = 23;
+              _context6.next = 20;
               break;
-            case 18:
-              _context6.prev = 18;
-              _context6.t0 = _context6["catch"](3);
+            case 15:
+              _context6.prev = 15;
+              _context6.t0 = _context6["catch"](2);
               errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
               console.warn('[Schedule] 从 SQLite 加载数据失败:', _context6.t0);
               this.logWarning('从 SQLite 加载数据失败，准备从服务器加载', {
                 error: errorMessage
               });
-            case 23:
-              _context6.next = 25;
+            case 20:
+              _context6.next = 22;
               return this.loadAllSchedule();
-            case 25:
+            case 22:
               scheduleList = _context6.sent;
               // 3. 将服务器数据放入 store
               if (scheduleList && scheduleList.length > 0) {
@@ -607,11 +599,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                   duration: "".concat(_duration3, "ms")
                 });
               }
-            case 27:
+            case 24:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[3, 18]]);
+        }, _callee6, this, [[2, 15]]);
       }));
       function preload() {
         return _preload.apply(this, arguments);

package/dist/server/utils/product.js

@@ -82,7 +82,6 @@ function buildPriceIndexMap(priceData) {
 export function applyPriceDataToProducts(products, priceData) {
   var t0 = performance.now();
   if (!priceData || priceData.length === 0) {
-    console.log('[applyPriceDataToProducts] 没有价格数据，返回原商品');
     return products;
   }
   var t1 = performance.now();

package/dist/solution/BaseSales/index.js

@@ -2272,11 +2272,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 40:
               if (!rulesModule) {
-                _context21.next = 77;
+                _context21.next = 76;
                 break;
               }
               orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
-              console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
@@ -2293,22 +2292,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator2 = _createForOfIteratorHelper(tempOrder.products || []);
-              _context21.prev = 46;
+              _context21.prev = 45;
               _iterator2.s();
-            case 48:
+            case 47:
               if ((_step2 = _iterator2.n()).done) {
-                _context21.next = 63;
+                _context21.next = 62;
                 break;
               }
               product = _step2.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context21.next = 54;
+                _context21.next = 53;
                 break;
               }
-              return _context21.abrupt("continue", 61);
-            case 54:
+              return _context21.abrupt("continue", 60);
+            case 53:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -2324,59 +2323,59 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 61:
-              _context21.next = 48;
+            case 60:
+              _context21.next = 47;
               break;
-            case 63:
-              _context21.next = 68;
+            case 62:
+              _context21.next = 67;
               break;
-            case 65:
-              _context21.prev = 65;
-              _context21.t0 = _context21["catch"](46);
+            case 64:
+              _context21.prev = 64;
+              _context21.t0 = _context21["catch"](45);
               _iterator2.e(_context21.t0);
-            case 68:
-              _context21.prev = 68;
+            case 67:
+              _context21.prev = 67;
               _iterator2.f();
-              return _context21.finish(68);
-            case 71:
+              return _context21.finish(67);
+            case 70:
               if (!result.discountList) {
-                _context21.next = 77;
+                _context21.next = 76;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context21.next = 76;
+              _context21.next = 75;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 76:
+            case 75:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 77:
-              _context21.next = 79;
+            case 76:
+              _context21.next = 78;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 79:
+            case 78:
               summary = _context21.sent;
               this.store.order.persistTempOrder();
-              _context21.next = 83;
+              _context21.next = 82;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 83:
+            case 82:
               return _context21.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 availableWalletIds: this.getAvailableWalletIds()
               });
-            case 84:
+            case 83:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[46, 65, 68, 71]]);
+        }, _callee21, this, [[45, 64, 67, 70]]);
       }));
       function loadDiscountConfig(_x16) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -2420,11 +2419,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 12:
               if (!rulesModule) {
-                _context22.next = 24;
+                _context22.next = 23;
                 break;
               }
               orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
-              console.log('[BaseSales.bestDiscount.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
@@ -2438,14 +2436,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context22.next = 24;
+                _context22.next = 23;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context22.next = 22;
+              _context22.next = 21;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 22:
+            case 21:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -2453,24 +2451,24 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 24:
-              _context22.next = 26;
+            case 23:
+              _context22.next = 25;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 26:
+            case 25:
               this.store.order.persistTempOrder();
-              _context22.next = 29;
+              _context22.next = 28;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 29:
+            case 28:
               cb === null || cb === void 0 || cb(result);
               return _context22.abrupt("return", result);
-            case 31:
+            case 30:
             case "end":
               return _context22.stop();
           }
@@ -2639,7 +2637,6 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 13:
               if (rulesModule) {
                 orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
-                console.log('[BaseSales.setDiscountSelected.calcDiscount]');
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
                   discountList: updated,

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

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