@pisell/pisellos 2.2.192 → 2.2.193

package/lib/modules/Order/index.js

@@ -45,7 +45,6 @@ var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
-var LOCAL_ORDER_STORE_NAME = "orders";
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -141,7 +140,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const app = appPlugin.getApp();
     this.logger = app.logger;
-    this.dbManager = app.sqlite;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
     this.cacheId = otherParams.cacheId;
@@ -577,108 +575,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const paidCount = paidPaymentsCount > 0 ? paidPaymentsCount : payments.length;
     return `${baseToken}_payment_${paidCount}`;
   }
-  hasLocalDatabase() {
-    return !!this.dbManager;
-  }
-  buildLocalOrderRecord(tempOrder) {
-    const externalSaleNumber = this.ensureExternalSaleNumber(tempOrder);
-    return {
-      ...tempOrder,
-      id: tempOrder.order_id ?? externalSaleNumber,
-      external_sale_number: externalSaleNumber,
-      summary: this.store.summary || (0, import_utils.createEmptySummary)(),
-      lastOrderInfo: this.store.lastOrderInfo
-    };
-  }
-  async getLocalOrderByOrderId(orderId) {
-    var _a, _b, _c, _d;
-    if (!this.dbManager || orderId === void 0 || orderId === null)
-      return null;
-    try {
-      const direct = await ((_b = (_a = this.dbManager).get) == null ? void 0 : _b.call(
-        _a,
-        LOCAL_ORDER_STORE_NAME,
-        orderId
-      ));
-      if (direct)
-        return direct;
-      const orders = await ((_d = (_c = this.dbManager).getAll) == null ? void 0 : _d.call(_c, LOCAL_ORDER_STORE_NAME));
-      return (orders || []).find(
-        (order) => String(order == null ? void 0 : order.order_id) === String(orderId)
-      ) || null;
-    } catch (error) {
-      this.logWarning("getLocalOrderByOrderId failed", {
-        orderId,
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return null;
-    }
-  }
-  async getLocalOrderByOrderNumber(orderNumber) {
-    var _a, _b, _c, _d;
-    if (!this.dbManager || !orderNumber)
-      return null;
-    try {
-      const direct = await ((_b = (_a = this.dbManager).get) == null ? void 0 : _b.call(
-        _a,
-        LOCAL_ORDER_STORE_NAME,
-        orderNumber
-      ));
-      if (direct)
-        return direct;
-      const orders = await ((_d = (_c = this.dbManager).getAll) == null ? void 0 : _d.call(_c, LOCAL_ORDER_STORE_NAME));
-      return (orders || []).find(
-        (order) => String(order == null ? void 0 : order.order_number) === String(orderNumber)
-      ) || null;
-    } catch (error) {
-      this.logWarning("getLocalOrderByOrderNumber failed", {
-        orderNumber,
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return null;
-    }
-  }
-  async getLocalOrderByExternalSaleNumber(externalSaleNumber) {
-    var _a, _b, _c, _d;
-    if (!this.dbManager || !externalSaleNumber)
-      return null;
-    try {
-      const direct = await ((_b = (_a = this.dbManager).get) == null ? void 0 : _b.call(
-        _a,
-        LOCAL_ORDER_STORE_NAME,
-        externalSaleNumber
-      ));
-      if (direct)
-        return direct;
-      const orders = await ((_d = (_c = this.dbManager).getAll) == null ? void 0 : _d.call(_c, LOCAL_ORDER_STORE_NAME));
-      return (orders || []).find(
-        (order) => String(order == null ? void 0 : order.external_sale_number) === String(externalSaleNumber)
-      ) || null;
-    } catch (error) {
-      this.logWarning("getLocalOrderByExternalSaleNumber failed", {
-        externalSaleNumber,
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return null;
-    }
-  }
   async saveDraft() {
-    var _a, _b;
-    if (!this.draftPersistEnabled || !this.dbManager) {
-      return;
-    }
-    const tempOrder = this.ensureTempOrder();
-    const record = this.buildLocalOrderRecord(tempOrder);
-    try {
-      await ((_b = (_a = this.dbManager).update) == null ? void 0 : _b.call(_a, LOCAL_ORDER_STORE_NAME, record));
-    } catch (error) {
-      this.logWarning("saveDraft failed", {
-        externalSaleNumber: tempOrder.external_sale_number,
-        orderNumber: tempOrder.order_number,
-        orderId: tempOrder.order_id,
-        error: error instanceof Error ? error.message : String(error)
-      });
-    }
   }
   saveDraftInBackground() {
     void this.saveDraft();
@@ -728,11 +625,52 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return;
     }
     if (paymentTotal.lte(0)) {
-      tempOrder.payment_status = tempOrder.payment_status || "payment_processing";
+      tempOrder.payment_status = "payment_processing";
       return;
     }
     tempOrder.payment_status = paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
   }
+  resolveWalletPassUseValue(payment, amount) {
+    const usageUnit = payment.wallet_pass_usage_unit && typeof payment.wallet_pass_usage_unit === "object" ? payment.wallet_pass_usage_unit : null;
+    if (!usageUnit)
+      return payment.wallet_pass_use_value;
+    const price = new import_decimal.default(usageUnit.price || 0);
+    const points = new import_decimal.default(usageUnit.points || 0);
+    if (price.lte(0) || points.lte(0))
+      return payment.wallet_pass_use_value;
+    return amount.div(price).times(points).toDecimalPlaces(2).toFixed(2);
+  }
+  capVoucherPaymentsByRemainingAmount(params) {
+    const targetAmount = this.getPaymentTargetAmount();
+    const nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+    if (targetAmount.lte(0))
+      return [];
+    let remainingAmount = import_decimal.default.max(
+      targetAmount.minus(nonVoucherTotal),
+      0
+    );
+    const cappedVouchers = [];
+    for (const voucher of params.vouchers) {
+      if (remainingAmount.lte(0))
+        break;
+      const voucherAmount = import_decimal.default.max(new import_decimal.default(voucher.amount || 0), 0);
+      if (voucherAmount.lte(0))
+        continue;
+      const cappedAmount = import_decimal.default.min(voucherAmount, remainingAmount);
+      const amountText = cappedAmount.toDecimalPlaces(2).toFixed(2);
+      cappedVouchers.push({
+        ...voucher,
+        amount: amountText,
+        origin_amount: amountText,
+        wallet_pass_use_value: this.resolveWalletPassUseValue(
+          voucher,
+          cappedAmount
+        )
+      });
+      remainingAmount = remainingAmount.minus(cappedAmount);
+    }
+    return cappedVouchers;
+  }
   calculatePaidPaymentSummary(payments) {
     return (payments || []).reduce(
       (summary, payment) => {
@@ -742,7 +680,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentEffectiveAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentGapAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord))
         };
       },
@@ -763,6 +701,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const fixedAmount = new import_decimal.default(serviceCharge.amount || 0);
     return new import_decimal.default(payment.amount || 0).times(percentage).plus(fixedAmount);
   }
+  calculatePaymentGapAmount(payment) {
+    if (payment.origin_amount === void 0 || payment.origin_amount === null || payment.origin_amount === "") {
+      return new import_decimal.default(0);
+    }
+    const rounding = new import_decimal.default(payment.rounding_amount || 0);
+    return new import_decimal.default(payment.origin_amount || 0).minus(rounding);
+  }
   formatSummaryMetadataMoney(value) {
     if (value === void 0 || value === null || value === "")
       return void 0;
@@ -978,6 +923,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     product.metadata = metadata;
     return String(uid);
   }
+  sanitizeOrderProductForTempOrder(product) {
+    if (product.metadata && typeof product.metadata === "object") {
+      delete product.metadata.origin;
+    }
+    return product;
+  }
+  sanitizeTempOrderProducts(tempOrder) {
+    tempOrder.products = (tempOrder.products || []).map(
+      (product) => this.sanitizeOrderProductForTempOrder(product)
+    );
+  }
   ensureExtend(tempOrder) {
     if (!tempOrder._extend || typeof tempOrder._extend !== "object") {
       tempOrder._extend = { productsByUid: {} };
@@ -1069,6 +1025,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder)
       return null;
+    this.sanitizeTempOrderProducts(tempOrder);
     const salesSummary = this.getSalesSummary();
     const existedSummary = this.store.summary || (0, import_utils.createEmptySummary)();
     const paidPaymentSummary = this.calculatePaidPaymentSummary(
@@ -1087,8 +1044,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         }),
         pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
       };
-      this.store.summary = emptySummary;
       tempOrder.surcharge_fee = emptySummary.surcharge_fee;
+      this.updateTempOrderPaymentStatus(tempOrder);
+      this.store.summary = emptySummary;
       return this.store.summary;
     }
     const salesSummaryResult = await salesSummary.getSummary({
@@ -1120,6 +1078,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.surcharges = summary.surcharges || [];
     tempOrder.deposit_amount = summary.deposit_amount || "0.00";
     tempOrder.is_deposit = summary.deposit_amount !== "0.00" ? 1 : 0;
+    this.updateTempOrderPaymentStatus(tempOrder);
     return this.store.summary;
   }
   async getOrderSummary() {
@@ -1416,7 +1375,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const nonVoucherPayments = (tempOrder.payments || []).filter((payment) => {
       return payment.voucher_id === void 0 || Number(payment.voucher_id) === 0;
     });
-    tempOrder.payments = [...nonVoucherPayments, ...mappedVouchers];
+    const cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
+      vouchers: mappedVouchers,
+      nonVoucherPayments
+    });
+    tempOrder.payments = [...nonVoucherPayments, ...cappedVouchers];
     this.updateTempOrderPaymentStatus(tempOrder);
     this.persistTempOrder();
     void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
@@ -1550,6 +1513,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     await this.applyPromotion();
     this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
     return tempOrder.products;
@@ -1710,6 +1674,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     await this.applyPromotion();
     this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
     return tempOrder.products;
@@ -1773,6 +1738,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.products[productIndex] = normalizedProduct;
     await this.applyPromotion();
     this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
     return tempOrder.products;
@@ -1818,6 +1784,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     await this.applyPromotion();
     this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
     return tempOrder.products;
@@ -1838,6 +1805,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     await this.applyPromotion();
     this.applyDiscount();
+    this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
     return tempOrder;
@@ -1847,7 +1815,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 提交当前 Sales tempOrder。
    *
    * smallTicketDataFlag 用于 B 端 checkout 小票数据返回。PaymentModal 在支付提交时
-   * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
+   * 应传 1，确保 /shop/order/sales/checkout 返回打印所需数据。
    */
   async submitTempOrder(params) {
     var _a, _b, _c, _d, _e;
@@ -2141,7 +2109,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * Checkout 专用：创建订单到后端
    *
    * 专门为 Checkout 模块设计的订单创建方法，
-   * 直接调用 /order/checkout 接口创建订单
+   * 通过 OS Server 调用 checkout 接口创建订单
    * 接收已经处理好的订单数据，无需再处理购物车
    *
    * @param params Checkout 订单参数（已处理的订单数据）
@@ -2210,7 +2178,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
       }
       console.log("[Order] 调用后端接口创建订单:", {
-        url: "/order/checkout",
+        url: "/shop/order/checkout",
         orderType: orderData.type,
         platform: orderData.platform,
         isDeposit: orderData.is_deposit,
@@ -2221,7 +2189,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         paymentsMethods: ((_m = orderData.payments) == null ? void 0 : _m.map((p) => p.code)) || []
       });
       this.logInfo("Calling backend checkout API", {
-        url: "/order/checkout",
+        url: "/shop/order/checkout",
         orderType: orderData.type,
         platform: orderData.platform,
         isDeposit: orderData.is_deposit,
@@ -2243,7 +2211,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         hasOrderId: !!orderData.order_id,
         smallTicketDataFlag: orderData.small_ticket_data_flag
       });
-      const response = await this.request.post("/order/checkout", orderData);
+      const response = await this.request.post("/shop/order/checkout", orderData, {
+        osServer: true,
+        customToast: () => {
+        }
+      });
       this.logInfo("Order API called successfully", {
         response
       });
@@ -2263,7 +2235,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async submitSalesOrder(params) {
     const { url, query } = params;
     const fetchUrl = url || "/order/sales/checkout";
-    return this.request.post(fetchUrl, query, { customToast: () => {
+    return this.request.post(fetchUrl, query, { osServer: true, customToast: () => {
     } });
   }
   /**
@@ -2287,10 +2259,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       emails: params.emails
     });
   }
-  // TODO 获取详情的接口
-  async getOrderInfoByRemote(order_id) {
-    const res = await this.request.get(`/order/sales/${order_id}`, {
-      with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"]
+  async getSalesOrderByLookup(params) {
+    const lookup = params.lookup === void 0 || params.lookup === null ? "" : String(params.lookup).trim();
+    if (!lookup) {
+      throw new Error("加载销售详情需要 lookup");
+    }
+    const res = await this.request.get(`/order/sales/${encodeURIComponent(lookup)}`, {
+      with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"],
+      ...params.forceRemote ? { forceRemote: true } : {}
     }, { osServer: true });
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
@@ -2473,7 +2449,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     if (result.metadata)
       delete result.metadata.price_schema_version;
-    return result;
+    return this.sanitizeOrderProductForTempOrder(result);
   }
   getLastOrderInfo() {
     var _a;

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

@@ -477,6 +477,10 @@ export interface LoadSalesDetailParams {
     external_sale_number?: string;
     forceRemote?: boolean;
 }
+export interface SalesOrderLookupParams {
+    lookup: number | string;
+    forceRemote?: boolean;
+}
 export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
@@ -635,15 +639,11 @@ export interface OrderModuleAPI {
     updateVoucherOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
     saveDraft: () => Promise<void>;
-    hasLocalDatabase: () => boolean;
-    getLocalOrderByOrderId: (orderId: number | string) => Promise<Record<string, any> | null>;
-    getLocalOrderByExternalSaleNumber: (externalSaleNumber: string) => Promise<Record<string, any> | null>;
-    getLocalOrderByOrderNumber: (orderNumber: string) => Promise<Record<string, any> | null>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
-    getOrderInfoByRemote: (order_id: number) => Promise<any>;
+    getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;
     getLastOrderInfo: () => Record<string, any> | undefined;
     getOrderInfo: (order_id: number) => Promise<any>;
     /**

package/lib/modules/Order/utils.js

@@ -211,17 +211,17 @@ function resolveEffectivePerUnitDiscount(product) {
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};
+  const promo = metadata._promotion;
+  if ((promo == null ? void 0 : promo.inPromotion) !== true)
+    return fromList;
   const optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
-  if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
+  if (!discountList.length && metadata.source_product_price != null && metadata.main_product_selling_price != null) {
     const source = Number(metadata.source_product_price);
     const selling = Number(metadata.main_product_selling_price) - optionSum;
     if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
       return fromList + (source - selling);
     }
   }
-  const promo = metadata._promotion;
-  if ((promo == null ? void 0 : promo.inPromotion) !== true)
-    return fromList;
   const originalPrice = Number(promo.originalPrice);
   const finalPrice = Number(promo.finalPrice);
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice))

package/lib/modules/Payment/utils.js

@@ -31,7 +31,7 @@ var getAvailableMaxAmount = (data) => {
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var formatWalletPassList2PreparePayments = (list) => {
-  return (list || []).map((item) => {
+  const formatted = (list || []).map((item) => {
     return {
       voucher_id: item.id || 0,
       amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
@@ -40,6 +40,7 @@ var formatWalletPassList2PreparePayments = (list) => {
       wallet_pass_use_value: item.wallet_pass_use_value || void 0
     };
   });
+  return formatted;
 };
 var sortUserIdentificationCodeList = (list) => {
   if (!Array.isArray(list) || list.length === 0) {

package/lib/modules/SalesSummary/utils.js

@@ -423,9 +423,7 @@ function calculateSalesSummary(params) {
     tax_fee: toFixed2(productTaxFee),
     surcharge_fee: toFixed2(surchargeAmount),
     surcharges: surcharge,
-    discount_amount: toFixed2(
-      import_decimal.default.max(productOriginalAmount.minus(productAmount), 0).plus(shopDiscountAmount)
-    ),
+    discount_amount: toFixed2(shopDiscountAmount),
     deposit_amount: deposit ? deposit.total : "0.00",
     deposit,
     expect_amount: toFixed2(totalAmount),

package/lib/server/index.d.ts

@@ -284,6 +284,9 @@ declare class Server {
      * @example 批量：GET /update/localOrder?order_ids=96971,96972,96973
      */
     private handleUpdateLocalOrder;
+    private handleOrderSalesCheckout;
+    private handleOrderCheckout;
+    private handleOrderCheckoutSubmit;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
@@ -311,8 +314,12 @@ declare class Server {
      * 从 url 中解析指定 query 参数，兼容相对路径与绝对路径
      */
     private extractQueryParam;
-    private extractOrderSalesDetailId;
+    private extractOrderSalesDetailLookup;
+    private shouldForceRemoteSalesDetail;
     private buildOrderSalesDetailBackendPath;
+    private extractOrderDataFromCheckoutResponse;
+    private normalizeCheckoutResponse;
+    private extractBackendErrorResponse;
     /**
      * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
      */