@pisell/pisellos 2.3.56 → 2.3.58

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

@@ -235,6 +235,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private isRemoteProductMembershipChangeSource;
     private getProductMembershipKey;
     private doProductsHaveStableMembershipIdentity;
     /**

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

@@ -1331,7 +1331,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 _context11.next = 4;
                 break;
               }
-              this.logInfo('upsertOrdersFromRemote-订单列表为空', {});
+              this.logInfo('upsertOrdersFromRemote-订单列表为空', {
+                source: source
+              });
               return _context11.abrupt("return");
             case 4:
               this.logInfo('upsertOrdersFromRemote-开始', {
@@ -2638,6 +2640,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isRemoteEchoMergeSource(source) {
       return source === 'pubsub.bodyUpsert' || source === 'pubsub.httpRefresh';
     }
+  }, {
+    key: "isRemoteProductMembershipChangeSource",
+    value: function isRemoteProductMembershipChangeSource(source) {
+      return this.isRemoteEchoMergeSource(source) || source === 'manual.editOpenRemoteCheck';
+    }
   }, {
     key: "getProductMembershipKey",
     value: function getProductMembershipKey(product) {
@@ -2677,7 +2684,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
       var _this17 = this,
         _mergedOrder$order_id;
-      if (!this.isRemoteEchoMergeSource(source)) return null;
+      if (!this.isRemoteProductMembershipChangeSource(source)) return null;
       var previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
       var currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
       var unmatchedCurrentIndexes = new Set(currentProducts.map(function (_, index) {

package/dist/server/modules/order/types.d.ts

@@ -568,7 +568,7 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
-export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
+export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh' | 'manual.editOpenRemoteCheck';
 /**
  * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
  * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。

package/dist/solution/BaseSales/index.js

@@ -4049,7 +4049,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanWalletAsset",
     value: (function () {
       var _scanWalletAsset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(code) {
-        var result;
+        var wallet, businessData, result;
         return _regeneratorRuntime().wrap(function _callee42$(_context42) {
           while (1) switch (_context42.prev = _context42.next) {
             case 0:
@@ -4059,22 +4059,27 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('payment 模块未初始化');
             case 2:
-              _context42.next = 4;
-              return this.store.payment.wallet.scanWalletAssetAsync(code);
-            case 4:
+              wallet = this.store.payment.wallet; // 扫码可能早于后台 Wallet 刷新，搜索参数必须以当前订单为准。
+              businessData = this.buildWalletInitBusinessData();
+              if (businessData) {
+                wallet.generateWalletParams(businessData);
+              }
+              _context42.next = 7;
+              return wallet.scanWalletAssetAsync(code);
+            case 7:
               result = _context42.sent;
               if (!(result.type === 'normalCode')) {
-                _context42.next = 10;
+                _context42.next = 13;
                 break;
               }
-              _context42.next = 8;
+              _context42.next = 11;
               return this.syncSelectedWalletAssets(result.state);
-            case 8:
-              _context42.next = 10;
+            case 11:
+              _context42.next = 13;
               return this.publishWalletAssetsState(result.state);
-            case 10:
+            case 13:
               return _context42.abrupt("return", result);
-            case 11:
+            case 14:
             case "end":
               return _context42.stop();
           }

package/lib/modules/Rules/index.js

@@ -858,15 +858,30 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const explicitlySelectedDiscountCard = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
+      const explicitlySelectedDiscount = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
         const discountType = discount.tag || discount.type;
-        return String(discount.id) === String(options.discountId) && ["discount_card", "product_discount_card"].includes(discountType);
+        return String(discount.id) === String(options.discountId) && ["good_pass", "discount_card", "product_discount_card"].includes(
+          discountType
+        );
       }) : void 0;
+      const explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== "good_pass" ? explicitlySelectedDiscount : void 0;
       const scannedSelectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
       const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
-      const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
+      const selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
+      const prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === "good_pass" ? [
+        explicitlySelectedDiscount,
+        ...applicableDiscounts.filter(
+          (discount) => {
+            const discountType = discount.tag || discount.type;
+            return discountType === "good_pass" && String(discount.id) !== String(explicitlySelectedDiscount.id);
+          }
+        ),
+        ...applicableDiscounts.filter(
+          (discount) => (discount.tag || discount.type) !== "good_pass"
+        )
+      ] : applicableDiscounts;
       let isManualDiscount = false;
       let isItemRewardProductDiscount = false;
       if (flatItem.type === "main") {
@@ -1103,7 +1118,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           );
         }
         for (let i = 0; i < splitCount; i++) {
-          const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
+          const selectedDiscount2 = isNeedSplit ? prioritizedApplicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[i];
           usedDiscounts.set(selectedDiscount2.id, true);
           if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
             const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;
@@ -1230,7 +1245,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const discountNum = splitCount;
           const normalNum = totalQuantity - discountNum;
           for (let i = 0; i < discountNum; i++) {
-            const selectedDiscount2 = applicableDiscounts[i];
+            const selectedDiscount2 = prioritizedApplicableDiscounts[i];
             usedDiscounts.set(selectedDiscount2.id, true);
             if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
               const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;

package/lib/server/index.d.ts

@@ -164,6 +164,12 @@ declare class Server {
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
     refreshOrdersInBackground(): Promise<void>;
+    /**
+     * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+     * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+     * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+     */
+    checkRemoteOrderProductMembership(orderId: string | number): Promise<void>;
     /**
      * 清空所有server模块的IndexedDB缓存
      * @returns Promise<void>

package/lib/server/index.js

@@ -1789,6 +1789,57 @@ var Server = class {
       });
     }
   }
+  /**
+   * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+   * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+   * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+   */
+  async checkRemoteOrderProductMembership(orderId) {
+    const normalizedOrderId = String(orderId ?? "").trim();
+    if (!normalizedOrderId || normalizedOrderId.startsWith("local_order")) {
+      this.logInfo("checkRemoteOrderProductMembership: 跳过非正式订单", {
+        orderId
+      });
+      return;
+    }
+    if (!this.order) {
+      const error = new Error("Order 模块未注册");
+      this.logWarning("checkRemoteOrderProductMembership: Order 模块未注册", {
+        orderId: normalizedOrderId
+      });
+      throw error;
+    }
+    this.logInfo("checkRemoteOrderProductMembership 开始", {
+      orderId: normalizedOrderId
+    });
+    const startTime = Date.now();
+    try {
+      const freshOrders = await this.order.fetchOrdersByHttp([
+        normalizedOrderId
+      ]);
+      const freshOrder = freshOrders.find(
+        (order) => String(order == null ? void 0 : order.order_id) === normalizedOrderId
+      );
+      if (!freshOrder) {
+        throw new Error("Server 未返回目标订单最新快照");
+      }
+      await this.order.upsertOrdersFromRemote(
+        [freshOrder],
+        "manual.editOpenRemoteCheck"
+      );
+      this.logInfo("checkRemoteOrderProductMembership 完成", {
+        orderId: normalizedOrderId,
+        duration: `${Date.now() - startTime}ms`
+      });
+    } catch (error) {
+      this.logError("checkRemoteOrderProductMembership 失败", {
+        orderId: normalizedOrderId,
+        duration: `${Date.now() - startTime}ms`,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
   /**
    * 清空所有server模块的IndexedDB缓存
    * @returns Promise<void>

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

@@ -235,6 +235,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private isRemoteProductMembershipChangeSource;
     private getProductMembershipKey;
     private doProductsHaveStableMembershipIdentity;
     /**

package/lib/server/modules/order/index.js

@@ -920,10 +920,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async upsertOrdersFromRemote(freshOrders, source = "upsertOrdersFromRemote") {
     if (!(freshOrders == null ? void 0 : freshOrders.length)) {
-      this.logInfo("upsertOrdersFromRemote-订单列表为空", {});
+      this.logInfo("upsertOrdersFromRemote-订单列表为空", { source });
       return;
     }
-    this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length, source });
+    this.logInfo("upsertOrdersFromRemote-开始", {
+      count: freshOrders.length,
+      source
+    });
     await this.mergeOrdersToStore(freshOrders, source);
   }
   async markOrderSyncedByExternalSaleNumber(params) {
@@ -1685,6 +1688,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isRemoteEchoMergeSource(source) {
     return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
   }
+  isRemoteProductMembershipChangeSource(source) {
+    return this.isRemoteEchoMergeSource(source) || source === "manual.editOpenRemoteCheck";
+  }
   getProductMembershipKey(product) {
     const persistentId = (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("product", product);
     if (persistentId)
@@ -1717,7 +1723,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
    */
   getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
-    if (!this.isRemoteEchoMergeSource(source))
+    if (!this.isRemoteProductMembershipChangeSource(source))
       return null;
     const previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
     const currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];

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

@@ -568,7 +568,7 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
-export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
+export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh' | 'manual.editOpenRemoteCheck';
 /**
  * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
  * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。

package/lib/solution/BaseSales/index.js

@@ -2661,7 +2661,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async scanWalletAsset(code) {
     if (!this.store.payment)
       throw new Error("payment 模块未初始化");
-    const result = await this.store.payment.wallet.scanWalletAssetAsync(code);
+    const wallet = this.store.payment.wallet;
+    const businessData = this.buildWalletInitBusinessData();
+    if (businessData) {
+      wallet.generateWalletParams(businessData);
+    }
+    const result = await wallet.scanWalletAssetAsync(code);
     if (result.type === "normalCode") {
       await this.syncSelectedWalletAssets(result.state);
       await this.publishWalletAssetsState(result.state);

package/package.json

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