@pisell/pisellos 2.2.192 → 2.2.193

package/dist/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/dist/modules/Order/utils.js

@@ -240,18 +240,18 @@ export function resolveEffectivePerUnitDiscount(product) {
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
+  var promo = metadata._promotion;
+  if ((promo === null || promo === void 0 ? void 0 : promo.inPromotion) !== true) return fromList;
   var optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
 
   // applyPromotion 写价后、Rules 剥离 promotion discount 的兜底
-  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) {
     var source = Number(metadata.source_product_price);
     var selling = Number(metadata.main_product_selling_price) - optionSum;
     if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
       return fromList + (source - selling);
     }
   }
-  var promo = metadata._promotion;
-  if ((promo === null || promo === void 0 ? void 0 : promo.inPromotion) !== true) return fromList;
   var originalPrice = Number(promo.originalPrice);
   var finalPrice = Number(promo.finalPrice);
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;

package/dist/modules/Payment/utils.js

@@ -11,7 +11,7 @@ export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
  * @param list
  */
 export var formatWalletPassList2PreparePayments = function formatWalletPassList2PreparePayments(list) {
-  return (list || []).map(function (item) {
+  var formatted = (list || []).map(function (item) {
     return {
       voucher_id: item.id || 0,
       amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
@@ -20,6 +20,7 @@ export var formatWalletPassList2PreparePayments = function formatWalletPassList2
       wallet_pass_use_value: item.wallet_pass_use_value || undefined
     };
   });
+  return formatted;
 };
 
 /**

package/dist/modules/SalesSummary/utils.js

@@ -490,7 +490,7 @@ export function calculateSalesSummary(params) {
     tax_fee: toFixed2(productTaxFee),
     surcharge_fee: toFixed2(surchargeAmount),
     surcharges: surcharge,
-    discount_amount: toFixed2(Decimal.max(productOriginalAmount.minus(productAmount), 0).plus(shopDiscountAmount)),
+    discount_amount: toFixed2(shopDiscountAmount),
     deposit_amount: deposit ? deposit.total : '0.00',
     deposit: deposit,
     expect_amount: toFixed2(totalAmount),

package/dist/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，去掉末尾 /）
      */