@pisell/pisellos 0.0.298 → 0.0.300

package/dist/solution/Checkout/index.js

@@ -496,6 +496,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         item.deposit = deposit;
         if (deposit !== null && deposit !== void 0 && deposit.total && Number(deposit.total) > 0) {
           summaryDeposit.protocols = summaryDeposit.protocols.concat(deposit.protocols);
+          summaryDeposit.total = new Decimal(summaryDeposit.total).plus(deposit.total).toNumber();
           summaryDeposit.hasDeposit = true;
         }
       });
@@ -1668,15 +1669,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);
 
@@ -1687,31 +1690,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

@@ -295,6 +295,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         summaryDeposit.protocols = summaryDeposit.protocols.concat(
           deposit.protocols
         );
+        summaryDeposit.total = new import_decimal.default(summaryDeposit.total).plus(deposit.total).toNumber();
         summaryDeposit.hasDeposit = true;
       }
     });
@@ -1080,10 +1081,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
@@ -1783,7 +1780,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       return "0.00";
     }
     let totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
-    const currentOrder = await this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
+    const currentOrder = await this.payment.getPaymentOrderByUuidAsync(
+      this.store.currentOrder.uuid
+    );
     if ((currentOrder == null ? void 0 : currentOrder.is_deposit) && (currentOrder == null ? void 0 : currentOrder.deposit_amount) && Number(currentOrder == null ? void 0 : currentOrder.deposit_amount) > 0) {
       totalAmount = new import_decimal.default(currentOrder == null ? void 0 : currentOrder.deposit_amount);
     }
@@ -1829,8 +1828,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d;
     try {
       if (((_a = this.store.currentOrder) == null ? void 0 : _a.is_deposit) === 1) {
-        const paymentItems = await this.payment.getPaymentItemsAsync((_b = this.store.currentOrder) == null ? void 0 : _b.uuid);
-        const depositPaidAmount = paymentItems.filter((item) => item.order_payment_type === "deposit" && item.status !== "voided").reduce((sum, item) => {
+        const paymentItems = await this.payment.getPaymentItemsAsync(
+          (_b = this.store.currentOrder) == null ? void 0 : _b.uuid
+        );
+        const depositPaidAmount = paymentItems.filter(
+          (item) => item.order_payment_type === "deposit" && item.status !== "voided"
+        ).reduce((sum, item) => {
           if (item.voucher_id && !item.isSynced) {
             return sum;
           }
@@ -2048,13 +2051,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           deposit: void 0
         };
       }),
-      relation_products: (_f = this.store.localOrderData.relation_products) == null ? void 0 : _f.map((item) => {
-        return {
-          ...item,
-          custom_deposit_data: void 0,
-          deposit: void 0
-        };
-      })
+      relation_products: (_f = this.store.localOrderData.relation_products) == null ? void 0 : _f.map(
+        (item) => {
+          return {
+            ...item,
+            custom_deposit_data: void 0,
+            deposit: void 0
+          };
+        }
+      )
     };
     if (isUpdateOperation) {
       if ((0, import_utils.isVirtualOrderId)(currentOrderId)) {

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.298",
+  "version": "0.0.300",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",