@pisell/pisellos 2.2.215 → 2.2.217

package/dist/solution/BaseSales/index.js

@@ -63,10 +63,47 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function getBaseSalesUniqueArrayMetadataKey(key) {
+  if (key === 'products' || key === 'bookings') return 'unique_identification_number';
+  if (key === 'payments' || key === 'payment') return 'unique_payment_number';
+  return null;
+}
+function getBaseSalesMetadataUid(item, metadataKey) {
+  var _item$metadata$metada, _item$metadata;
+  var uid = (_item$metadata$metada = item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata[metadataKey]) !== null && _item$metadata$metada !== void 0 ? _item$metadata$metada : item === null || item === void 0 ? void 0 : item[metadataKey];
+  if (uid === undefined || uid === null || uid === '') return null;
+  return String(uid);
+}
+function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
+  var result = [];
+  var indexByUid = new Map();
+  var appendOrReplaceByUid = function appendOrReplaceByUid(item) {
+    var clonedItem = cloneDeep(item);
+    var uid = getBaseSalesMetadataUid(clonedItem, metadataKey);
+    if (!uid) {
+      result.push(clonedItem);
+      return;
+    }
+    var existingIndex = indexByUid.get(uid);
+    if (existingIndex !== undefined) {
+      result[existingIndex] = clonedItem;
+      return;
+    }
+    indexByUid.set(uid, result.length);
+    result.push(clonedItem);
+  };
+  currentValue.forEach(appendOrReplaceByUid);
+  loadedValue.forEach(appendOrReplaceByUid);
+  return result;
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
   if (!currentTempOrder) return loadedRecord;
-  return mergeWith(cloneDeep(currentTempOrder), cloneDeep(loadedRecord || {}), function (currentValue, loadedValue) {
+  return mergeWith(cloneDeep(currentTempOrder), cloneDeep(loadedRecord || {}), function (currentValue, loadedValue, key) {
     if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
+      var metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
+      if (metadataKey) {
+        return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
+      }
       return [].concat(_toConsumableArray(cloneDeep(currentValue)), _toConsumableArray(cloneDeep(loadedValue)));
     }
     if (Array.isArray(loadedValue)) return cloneDeep(loadedValue);
@@ -1868,7 +1905,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('BaseSales 解决方案需要 order 模块支持');
             case 2:
-              this.store.order.persistTempOrder();
+              // this.store.order.persistTempOrder();
               inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
@@ -1886,7 +1923,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 enhancePayload: params.enhancePayload
               } : {});
               return _context18.abrupt("return", this.store.order.submitTempOrder(submitParams));
-            case 6:
+            case 5:
             case "end":
               return _context18.stop();
           }

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 | 1 | 2 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.js

@@ -391,26 +391,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 country_calling_code: sales === null || sales === void 0 ? void 0 : sales.country_calling_code
               } : null;
               selectedCustomer = (_ref = detailCustomer !== null && detailCustomer !== void 0 ? detailCustomer : orderCustomerSnapshot) !== null && _ref !== void 0 ? _ref : protocolCustomer;
-              if (!(customerModule && selectedCustomer)) {
-                _context5.next = 17;
-                break;
+              if (customerModule && selectedCustomer) {
+                _ref2 = selectedCustomer !== null && selectedCustomer !== void 0 ? selectedCustomer : {}, detailCustomerId = _ref2.id, detailCustomerRest = _objectWithoutProperties(_ref2, _excluded);
+                rawId = detailCustomerId !== null && detailCustomerId !== void 0 ? detailCustomerId : '';
+                customer = _objectSpread(_objectSpread({}, detailCustomerRest), {}, {
+                  id: rawId == null ? '' : rawId,
+                  name: (_selectedCustomer$nam = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.name) !== null && _selectedCustomer$nam !== void 0 ? _selectedCustomer$nam : '',
+                  phone: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.phone,
+                  email: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.email,
+                  country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
+                });
+                customerModule.setSelectedCustomer(customer);
+                this.setOrderCustomer(customer);
+                // await this.store.order.saveDraft();
               }
-              _ref2 = selectedCustomer !== null && selectedCustomer !== void 0 ? selectedCustomer : {}, detailCustomerId = _ref2.id, detailCustomerRest = _objectWithoutProperties(_ref2, _excluded);
-              rawId = detailCustomerId !== null && detailCustomerId !== void 0 ? detailCustomerId : '';
-              customer = _objectSpread(_objectSpread({}, detailCustomerRest), {}, {
-                id: rawId == null ? '' : rawId,
-                name: (_selectedCustomer$nam = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.name) !== null && _selectedCustomer$nam !== void 0 ? _selectedCustomer$nam : '',
-                phone: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.phone,
-                email: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.email,
-                country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
-              });
-              customerModule.setSelectedCustomer(customer);
-              this.setOrderCustomer(customer);
-              _context5.next = 17;
-              return this.store.order.saveDraft();
-            case 17:
               return _context5.abrupt("return", sales);
-            case 18:
+            case 11:
             case "end":
               return _context5.stop();
           }
@@ -809,7 +805,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               throw new Error('refreshSalesDetail: tempOrder.order_id 缺失');
             case 6:
               return _context11.abrupt("return", this.loadSalesDetail({
-                orderId: Number(orderId)
+                orderId: Number(orderId),
+                merge: true
                 // forceRemote: true,
               }));
             case 7:

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Order/index.d.ts

@@ -334,7 +334,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -3031,6 +3031,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!lookup) {
       throw new Error("加载销售详情需要 lookup");
     }
+    if (lookup.startsWith("LOCAL_")) {
+      params.forceRemote = false;
+    }
     const res = await this.request.get(`/order/sales/${encodeURIComponent(lookup)}`, {
       with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"],
       ...params.forceRemote ? { forceRemote: true } : {}

package/lib/server/index.js

@@ -467,7 +467,13 @@ var Server = class {
      * @example 批量：GET /update/localOrder?order_ids=96971,96972,96973
      */
     this.handleUpdateLocalOrder = async ({ url, data }) => {
-      var _a;
+      var _a, _b;
+      if (typeof (data == null ? void 0 : data.order_id) === "string" && ((_a = data == null ? void 0 : data.order_id) == null ? void 0 : _a.startsWith("LOCAL_"))) {
+        return {
+          code: 200,
+          status: true
+        };
+      }
       const batchIds = this.parseOrderIdsParam(url, data);
       if (batchIds.length > 0) {
         return this.handleUpdateLocalOrdersBatch(batchIds);
@@ -483,7 +489,7 @@ var Server = class {
         this.logError("handleUpdateLocalOrder: Order 模块未注册");
         return { code: 500, status: false, message: "Order 模块未注册", data: null };
       }
-      if (!((_a = this.app) == null ? void 0 : _a.request)) {
+      if (!((_b = this.app) == null ? void 0 : _b.request)) {
         this.logError("handleUpdateLocalOrder: app.request 不可用");
         return { code: 500, status: false, message: "app.request 不可用", data: null };
       }
@@ -2545,6 +2551,7 @@ var Server = class {
     return pendingResult;
   }
   async handlePendingSyncCheckoutOrder(params) {
+    var _a, _b, _c, _d;
     const { backendPath, data, title, reason } = params;
     const pendingOrder = await this.buildPendingSyncCheckoutOrder(data);
     if (!pendingOrder) {
@@ -2573,18 +2580,31 @@ var Server = class {
     }
     try {
       await this.order.upsertPendingSyncOrders([pendingOrder]);
-      this.logWarning(`${title}: 订单已写入本地待同步`, {
+      this.logInfo(`${title}: 订单已写入本地待同步`, {
         backendPath,
         reason,
         order_id: pendingOrder.order_id,
         external_sale_number: pendingOrder.external_sale_number,
         order_number: pendingOrder.order_number
       });
+      const changeGivenAmount = (_a = pendingOrder == null ? void 0 : pendingOrder.payments) == null ? void 0 : _a.reduce((sum, payment) => {
+        var _a2;
+        return sum + this.toAmountNumber((_a2 = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a2.change_given_amount);
+      }, 0);
       return {
         code: 200,
         status: true,
         message: "",
-        data: pendingOrder
+        data: {
+          order_id: (pendingOrder == null ? void 0 : pendingOrder.order_id) ?? (pendingOrder == null ? void 0 : pendingOrder.external_sale_number),
+          amount_gap: (_b = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _b.amount_gap,
+          expect_amount: (_c = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _c.expect_amount,
+          total_amount: (_d = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _d.total_amount,
+          payment_status: pendingOrder == null ? void 0 : pendingOrder.payment_status,
+          payment_info: {
+            current_change_given_amount: changeGivenAmount
+          }
+        }
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);

package/lib/server/modules/order/index.d.ts

@@ -43,6 +43,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * @param metadata 日志元数据
      */
     private logError;
+    private logWarning;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -119,6 +120,9 @@ export declare class OrderModule extends BaseModule implements Module {
     getRoutes(): RouteDefinition[];
     destroy(): void;
     private syncOrdersMap;
+    private getOrderMapKey;
+    private isBlankIdentityValue;
+    private getOrderIdentityEntries;
     private getOrderIdentityKeys;
     private extractResourceIds;
     private getOrderDateKey;
@@ -182,6 +186,15 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getOrderIdentityMatchKeys;
+    private doOrdersShareIdentity;
+    private findOrderIndexByIdentity;
+    private getOrderCompletenessScore;
+    private pickPreferredOrder;
+    private mergeOrderRecords;
+    private summarizeDuplicateOrders;
+    private logDuplicateOrders;
+    private compactOrderListByIdentity;
     /**
      * 当前订单拉取窗口：
      * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）