@pisell/pisellos 0.0.196 → 0.0.200

package/dist/modules/Payment/index.js

@@ -1245,30 +1245,41 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               _context15.next = 8;
               return this.dbManager.update('order', order);
             case 8:
-              _context15.next = 10;
-              return this.addToSyncQueue(order, paymentData);
-            case 10:
-              _context15.next = 12;
-              return this.core.effects.emit(PaymentHooks.OnPaymentSubmitted, order);
+              if (!(paymentData.payments.length === 0)) {
+                _context15.next = 12;
+                break;
+              }
+              console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5217\u8868\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7\u961F\u5217\u63A8\u9001"));
+              this.logWarning('Empty payment queue submission', {
+                orderUuid: order.uuid,
+                orderId: order.order_info.order_id
+              });
+              return _context15.abrupt("return");
             case 12:
               _context15.next = 14;
+              return this.addToSyncQueue(order, paymentData);
+            case 14:
+              _context15.next = 16;
+              return this.core.effects.emit(PaymentHooks.OnPaymentSubmitted, order);
+            case 16:
+              _context15.next = 18;
               return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
                 action: 'submit',
                 order: order
               });
-            case 14:
-              _context15.next = 20;
+            case 18:
+              _context15.next = 24;
               break;
-            case 16:
-              _context15.prev = 16;
+            case 20:
+              _context15.prev = 20;
               _context15.t0 = _context15["catch"](0);
               console.error("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u63D0\u4EA4\u5931\u8D25"), _context15.t0);
               throw _context15.t0;
-            case 20:
+            case 24:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[0, 16]]);
+        }, _callee15, this, [[0, 20]]);
       }));
       function submitSingleOrderPayment(_x19) {
         return _submitSingleOrderPayment.apply(this, arguments);

package/dist/modules/Rules/index.js

@@ -317,7 +317,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct, i) {
-        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9;
+        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
           return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
@@ -328,11 +328,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
+          var _product$discount_lis6;
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
           if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
           // 折扣卡时总价为0时不可用
-          if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== 'good_pass') return false;
+          if ((Number(product.total) === 0 || !product.total) && !((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.find(function (n) {
+            var _n$discount;
+            return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
+          })) && (discount.tag || discount.type) !== 'good_pass') return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
@@ -356,12 +360,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
-        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || (product === null || product === void 0 || (_product$discount_lis7 = product.discount_list) === null || _product$discount_lis7 === void 0 || (_product$discount_lis8 = _product$discount_lis7.every) === null || _product$discount_lis8 === void 0 ? void 0 : _product$discount_lis8.call(_product$discount_lis7, function (item) {
+        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.length) || (product === null || product === void 0 || (_product$discount_lis8 = product.discount_list) === null || _product$discount_lis8 === void 0 || (_product$discount_lis9 = _product$discount_lis8.every) === null || _product$discount_lis9 === void 0 ? void 0 : _product$discount_lis9.call(_product$discount_lis8, function (item) {
           return item.type === 'product';
         })));
 
         // 勾选时覆盖手动折扣
-        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
+        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
           var _item$discount;
           return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
         })) {
@@ -423,7 +427,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _originProduct$_produ, _product$discount_lis10;
+          var _originProduct$_produ, _product$discount_lis11;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -439,7 +443,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             productOriginTotal = product.total;
           }
           // 如果当前 product 有 discount_list，则必须从 origin_total 拿
-          if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
+          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
 

package/lib/modules/Payment/index.js

@@ -588,6 +588,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
       paymentData.payment_status = order.payment_status === import_types.PaymentStatus.Finished ? "paid" : "partially_paid";
       await this.dbManager.update("order", order);
+      if (paymentData.payments.length === 0) {
+        console.log(`[PaymentModule] 订单 ${order.uuid} 支付列表为空，跳过队列推送`);
+        this.logWarning("Empty payment queue submission", {
+          orderUuid: order.uuid,
+          orderId: order.order_info.order_id
+        });
+        return;
+      }
       await this.addToSyncQueue(order, paymentData);
       await this.core.effects.emit(import_types.PaymentHooks.OnPaymentSubmitted, order);
       await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {

package/lib/modules/Rules/index.js

@@ -214,9 +214,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
+        var _a2;
         if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== "good_pass")
+        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+          var _a3;
+          return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
+        })) && (discount.tag || discount.type) !== "good_pass")
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")

package/package.json

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