@pisell/pisellos 0.0.299 → 0.0.301

package/dist/solution/Checkout/index.js

@@ -674,7 +674,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
         var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
-        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, updated, created;
+        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, isNeedDeposit, created;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -727,7 +727,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
               });
               if (!existingOrder) {
-                _context10.next = 39;
+                _context10.next = 40;
                 break;
               }
               // 基于现有支付项计算新的 expect_amount
@@ -740,12 +740,13 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 var rounding = new Decimal(p.rounding_amount || '0').abs();
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
-              remaining = Decimal.max(0, totalAmount.minus(paidAmount)).toFixed(2); // 更新到支付模块（使用 uuid，不修改 payment 列表）
-              _context10.next = 26;
+              remaining = Decimal.max(0, totalAmount.minus(paidAmount)).toFixed(2); // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
+              _isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新到支付模块（使用 uuid，不修改 payment 列表）
+              _context10.next = 27;
               return this.payment.updateOrderAsync(existingOrder.uuid, {
                 total_amount: amountInfo.totalAmount,
-                is_deposit: params.orderData.is_deposit || 0,
-                deposit_amount: amountInfo.depositAmount || '0.00',
+                is_deposit: _isNeedDeposit.hasDeposit ? 1 : 0,
+                deposit_amount: _isNeedDeposit.total ? _isNeedDeposit.total.toString() : '0.00',
                 expect_amount: remaining,
                 order_info: {
                   original_order_data: params.orderData,
@@ -758,21 +759,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 26:
-              _context10.next = 28;
+            case 27:
+              _context10.next = 29;
               return this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
-            case 28:
+            case 29:
               updated = _context10.sent;
               if (updated) {
-                _context10.next = 31;
+                _context10.next = 32;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.UnknownError, '订单更新失败');
-            case 31:
+            case 32:
               this.store.currentOrder = updated;
-              _context10.next = 34;
+              _context10.next = 35;
               return this.updateStateAmountToRemaining(false);
-            case 34:
+            case 35:
               this.logInfo('本地订单更新成功(保留支付项):', {
                 orderId: params.orderId,
                 uuid: updated.uuid,
@@ -782,23 +783,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 事件通知（复用创建事件，便于上层监听刷新）
-              _context10.next = 37;
+              _context10.next = 38;
               return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
                 order: updated,
                 timestamp: Date.now()
               });
-            case 37:
+            case 38:
               this.initWalletData({
                 order_wait_pay_amount: Number(updated.expect_amount)
               });
               return _context10.abrupt("return", updated);
-            case 39:
-              _context10.next = 41;
+            case 40:
+              // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
+              isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
+              _context10.next = 43;
               return this.payment.createPaymentOrderAsync({
                 order_id: String(params.orderId),
                 total_amount: amountInfo.totalAmount,
-                is_deposit: params.orderData.is_deposit || 0,
-                deposit_amount: amountInfo.depositAmount || '0.00',
+                is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+                deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : '0.00',
                 order_info: {
                   original_order_data: params.orderData,
                   cart_summary: params.cartSummary,
@@ -810,15 +813,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 41:
+            case 43:
               created = _context10.sent;
               this.store.currentOrder = created;
-              _context10.next = 45;
+              _context10.next = 47;
               return this.updateStateAmountToRemaining();
-            case 45:
+            case 47:
               this.initWalletData();
               return _context10.abrupt("return", created);
-            case 47:
+            case 49:
             case "end":
               return _context10.stop();
           }
@@ -1669,15 +1672,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               updateParams = {
                 is_deposit: newDepositValue
               }; // 如果从定金改为全款，可以清空定金金额
-              if (isDeposit === 0 && this.store.currentOrder.deposit_amount !== '0.00') {
-                updateParams.deposit_amount = '0.00';
-                this.logInfo('订单从定金改为全款，清空定金金额');
-              }
-
+              // if (
+              //   isDeposit === 0 &&
+              //   this.store.currentOrder.deposit_amount !== '0.00'
+              // ) {
+              //   updateParams.deposit_amount = '0.00';
+              //   this.logInfo('订单从定金改为全款，清空定金金额');
+              // }
               // 调用 Payment 模块更新订单
-              _context19.next = 14;
+              _context19.next = 13;
               return this.payment.updateOrderAsync(this.store.currentOrder.uuid, updateParams);
-            case 14:
+            case 13:
               // 更新本地缓存的订单对象
               this.store.currentOrder = _objectSpread(_objectSpread({}, this.store.currentOrder), updateParams);
 
@@ -1688,31 +1693,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.updateStateAmountToRemaining();
 
               // 触发订单更新事件
-              _context19.next = 19;
+              _context19.next = 18;
               return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
                 order: this.store.currentOrder,
                 timestamp: Date.now()
               });
-            case 19:
+            case 18:
               this.logInfo('订单定金状态更新成功:', {
                 isDeposit: newDepositValue,
                 depositAmount: this.store.currentOrder.deposit_amount
               });
-              _context19.next = 28;
+              _context19.next = 27;
               break;
-            case 22:
-              _context19.prev = 22;
+            case 21:
+              _context19.prev = 21;
               _context19.t0 = _context19["catch"](0);
               this.logError('更新订单定金状态失败:', _context19.t0);
-              _context19.next = 27;
+              _context19.next = 26;
               return this.handleError(_context19.t0, CheckoutErrorType.ValidationFailed);
-            case 27:
+            case 26:
               throw _context19.t0;
-            case 28:
+            case 27:
             case "end":
               return _context19.stop();
           }
-        }, _callee19, this, [[0, 22]]);
+        }, _callee19, this, [[0, 21]]);
       }));
       function updateOrderDepositStatusAsync(_x18) {
         return _updateOrderDepositStatusAsync.apply(this, arguments);

package/dist/solution/ShopDiscount/index.js

@@ -488,6 +488,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
                   savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),

package/lib/solution/Checkout/index.js

@@ -480,10 +480,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const remaining = import_decimal.default.max(0, totalAmount.minus(paidAmount)).toFixed(
         2
       );
+      const isNeedDeposit2 = this.checkIsNeedDepositAsync(
+        params.orderData.bookings,
+        params.orderData.relation_products
+      );
       await this.payment.updateOrderAsync(existingOrder.uuid, {
         total_amount: amountInfo.totalAmount,
-        is_deposit: params.orderData.is_deposit || 0,
-        deposit_amount: amountInfo.depositAmount || "0.00",
+        is_deposit: isNeedDeposit2.hasDeposit ? 1 : 0,
+        deposit_amount: isNeedDeposit2.total ? isNeedDeposit2.total.toString() : "0.00",
         expect_amount: remaining,
         order_info: {
           original_order_data: params.orderData,
@@ -522,11 +526,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       return updated;
     }
+    const isNeedDeposit = this.checkIsNeedDepositAsync(
+      params.orderData.bookings,
+      params.orderData.relation_products
+    );
     const created = await this.payment.createPaymentOrderAsync({
       order_id: String(params.orderId),
       total_amount: amountInfo.totalAmount,
-      is_deposit: params.orderData.is_deposit || 0,
-      deposit_amount: amountInfo.depositAmount || "0.00",
+      is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+      deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : "0.00",
       order_info: {
         original_order_data: params.orderData,
         cart_summary: params.cartSummary,
@@ -1081,10 +1089,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const updateParams = {
         is_deposit: newDepositValue
       };
-      if (isDeposit === 0 && this.store.currentOrder.deposit_amount !== "0.00") {
-        updateParams.deposit_amount = "0.00";
-        this.logInfo("订单从定金改为全款，清空定金金额");
-      }
       await this.payment.updateOrderAsync(
         this.store.currentOrder.uuid,
         updateParams

package/lib/solution/ShopDiscount/index.js

@@ -324,6 +324,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               }
               editModeDiscountList.push({
                 ...discount,
+                name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
                 savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),

package/package.json

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