@pisell/pisellos 2.2.191 → 2.2.193

package/lib/solution/BaseSales/index.js

@@ -429,7 +429,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 加载销售订单到统一 tempOrder 工作区。
-   * 有 app.sqlite 时优先读取本地记录；本地未命中或 forceRemote=true 时再拉云端。
+   * 统一通过 OrderModule 的 sales detail lookup 加载订单详情。
    *
    * 子类可在 `super.loadSalesDetail` 之后基于返回的 `sales` 做业务侧装配
    * （比如把 `sales.customer` 写入 CustomerModule、emit 业务 hook 等）。
@@ -439,25 +439,19 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
     const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-    if (!params.forceRemote) {
-      const localRecord = params.orderId !== void 0 ? await this.store.order.getLocalOrderByOrderId(params.orderId) : externalSaleNumber ? await this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber) : params.orderNumber ? await this.store.order.getLocalOrderByOrderNumber(params.orderNumber) : null;
-      if (localRecord) {
-        const sales2 = await this.store.order.hydrateTempOrderFromRecord(localRecord, { recalcOnHydrate: false });
-        this.currentSalesDetail = sales2;
-        await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales: sales2 });
-        return sales2;
-      }
-    }
-    if (params.orderId === void 0 || params.orderId === null) {
-      throw new Error("加载销售详情需要 orderId，或本地库中存在对应 externalSaleNumber/orderNumber");
+    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber;
+    if (lookup === void 0 || lookup === null || lookup === "") {
+      throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
     }
-    const res = await this.store.order.getOrderInfoByRemote(Number(params.orderId));
+    const res = await this.store.order.getSalesOrderByLookup({
+      lookup,
+      forceRemote: params.forceRemote
+    });
     if (!res || res.code !== 200) {
-      const message = res && (res.message || res.msg) || `加载销售详情失败: ${params.orderId}`;
+      const message = res && (res.message || res.msg) || `加载销售详情失败: ${lookup}`;
       throw new Error(message);
     }
     const sales = await this.store.order.hydrateTempOrderFromRecord(res.data, { recalcOnHydrate: false });
-    await this.store.order.saveDraft();
     this.currentSalesDetail = sales;
     await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
     return sales;
@@ -733,6 +727,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(discountList || []).filter((discount) => !historyIds.has(discount.id))
     ];
   }
+  shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
+    if (params.discountAction !== "edit")
+      return false;
+    if (!params.products.length)
+      return false;
+    const hasDraftProduct = params.products.some((product) => !this.isPersistedOrderProduct(product));
+    if (hasDraftProduct)
+      return false;
+    const hasSelectedDiscount = params.currentDiscountList.some(
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+    );
+    if (hasSelectedDiscount)
+      return false;
+    return !params.nextDiscountList.some(
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
+    );
+  }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length)
       return discountList;
@@ -811,6 +822,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       currentDiscountList
     );
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
+    const shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
+      discountAction,
+      products: tempOrder.products || [],
+      currentDiscountList,
+      nextDiscountList
+    });
+    if (shouldSkipAutoApplyFetchedDiscounts) {
+      const summary2 = await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: nextDiscountList,
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
+      return {
+        productList: tempOrder.products || [],
+        discountList: nextDiscountList
+      };
+    }
     if (rulesModule) {
       const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
@@ -1173,8 +1204,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const paymentRecord = payment;
+    const paymentAmount = new import_decimal.default(paymentRecord.amount || 0);
+    if (paymentAmount.isZero()) {
+      this.logWarning("addOrderPayment: 支付金额为 0，跳过添加支付项", {
+        payment: paymentRecord
+      });
+      return this.store.order.getOrderPayments();
+    }
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
-    debugger;
     const shopWalletPassId = (_a = this.otherParams) == null ? void 0 : _a.shop_wallet_pass_id;
     if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
       metadata.shop_wallet_pass_id = shopWalletPassId;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -180,7 +180,6 @@ function transformBaseProductToOrderProduct(params) {
     duration: payload.duration,
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
-    origin,
     source_product_price: sourceProductPrice,
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,

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

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

@@ -279,7 +279,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/ScanOrder/index.js

@@ -1654,7 +1654,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         tempOrder.order_id = resourceState.lastOrderId;
       }
       if (tempOrder.order_id) {
-        const res = await ((_i = this.store.order) == null ? void 0 : _i.getOrderInfoByRemote(tempOrder.order_id));
+        const res = await ((_i = this.store.order) == null ? void 0 : _i.getSalesOrderByLookup({
+          lookup: tempOrder.order_id
+        }));
         const entryPaxNumber = (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.bookings) == null ? void 0 : _k.find((p) => {
           var _a2;
           return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.191",
+  "version": "2.2.193",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",