@pisell/pisellos 0.0.287 → 0.0.289

package/dist/modules/Rules/index.js

@@ -536,7 +536,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + "___" + index,
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,

package/dist/solution/Checkout/index.js

@@ -1407,7 +1407,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 更新 stateAmount 为剩余未支付金额
               _context17.next = 22;
-              return this.updateStateAmountToRemaining();
+              return this.updateStateAmountToRemaining(false);
             case 22:
               _context17.next = 24;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
@@ -2838,14 +2838,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateStateAmountToRemaining",
     value: (function () {
       var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
-        var remainingAmount, currentStateAmount;
+        var checkOrder,
+          remainingAmount,
+          currentStateAmount,
+          _args34 = arguments;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              _context34.prev = 0;
-              _context34.next = 3;
+              checkOrder = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : true;
+              _context34.prev = 1;
+              _context34.next = 4;
               return this.calculateRemainingAmountAsync();
-            case 3:
+            case 4:
               remainingAmount = _context34.sent;
               currentStateAmount = this.store.stateAmount; // 只有当剩余金额与当前 stateAmount 不同时才更新
               if (remainingAmount !== currentStateAmount) {
@@ -2869,23 +2873,30 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 同步更新系统内部的 balanceDueAmount
-              _context34.next = 8;
+              _context34.next = 9;
               return this.updateBalanceDueAmount();
-            case 8:
-              _context34.next = 10;
+            case 9:
+              if (checkOrder) {
+                _context34.next = 12;
+                break;
+              }
+              this.logInfo('外部传入无需 checkOrder，不执行订单支付完成检测和同步');
+              return _context34.abrupt("return");
+            case 12:
+              _context34.next = 14;
               return this.checkOrderPaymentCompletion();
-            case 10:
-              _context34.next = 15;
+            case 14:
+              _context34.next = 19;
               break;
-            case 12:
-              _context34.prev = 12;
-              _context34.t0 = _context34["catch"](0);
+            case 16:
+              _context34.prev = 16;
+              _context34.t0 = _context34["catch"](1);
               this.logError('更新 stateAmount 为剩余金额失败:', _context34.t0);
-            case 15:
+            case 19:
             case "end":
               return _context34.stop();
           }
-        }, _callee34, this, [[0, 12]]);
+        }, _callee34, this, [[1, 16]]);
       }));
       function updateStateAmountToRemaining() {
         return _updateStateAmountToRemaining.apply(this, arguments);

package/lib/modules/Rules/index.js

@@ -379,7 +379,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         } else {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + "___" + index,
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,

package/lib/solution/Checkout/index.js

@@ -876,7 +876,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
         this.store.currentOrder = updatedOrder;
       }
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
@@ -1754,7 +1754,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   /**
    * 更新 stateAmount 为当前剩余未支付金额
    */
-  async updateStateAmountToRemaining() {
+  async updateStateAmountToRemaining(checkOrder = true) {
     try {
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const currentStateAmount = this.store.stateAmount;
@@ -1776,6 +1776,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         });
       }
       await this.updateBalanceDueAmount();
+      if (!checkOrder) {
+        this.logInfo("外部传入无需 checkOrder，不执行订单支付完成检测和同步");
+        return;
+      }
       await this.checkOrderPaymentCompletion();
     } catch (error) {
       this.logError("更新 stateAmount 为剩余金额失败:", error);

package/package.json

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