@pisell/pisellos 0.0.347 → 0.0.349

package/dist/modules/Payment/index.js

@@ -1054,7 +1054,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
+        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1103,7 +1103,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               throw new Error(warningMessage);
             case 15:
-              paymentUuid = getUniqueId('payment_');
+              if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
+                paymentUuid = paymentItem.metadata.unique_payment_number;
+              } else {
+                paymentUuid = getUniqueId('payment_');
+              }
               newPaymentItem = {
                 uuid: paymentUuid,
                 id: paymentItem.id || 0,

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/solution/Checkout/index.js

@@ -3191,8 +3191,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 depositPaidAmount = paymentItems.filter(function (item) {
                   return item.order_payment_type === 'deposit' && item.status !== 'voided';
                 }).reduce(function (sum, item) {
-                  // 如果是 wallet，并且还没同步到后端，则不计入这一部分金额
-                  if (item.voucher_id && !item.isSynced) {
+                  // 如果是 wallet，并且还没同步到后端，且此时还没有其他类型的支付项（现金，eftpos，标记支付）,不计入已付金额
+                  // 如果有其他支付项了，代表此时处于马上要同步的状态，所以计入
+                  if (item.voucher_id && !item.isSynced && paymentItems.filter(function (item) {
+                    return !item.voucher_id;
+                  }).length === 0) {
                     return sum;
                   }
                   var amount = new Decimal(item.amount || '0');

package/lib/modules/Payment/index.js

@@ -502,7 +502,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 为某个订单添加支付项（新方法）
    */
   async addPaymentItemAsync(orderUuid, paymentItem) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
@@ -538,7 +538,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
       const newPaymentItem = {
         uuid: paymentUuid,
         id: paymentItem.id || 0,
@@ -570,15 +575,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       this.logInfo("addPaymentItemAsync completed successfully", {
         orderUuid,
         paymentUuid: newPaymentItem.uuid,
-        uniquePaymentNumber: (_a = newPaymentItem.metadata) == null ? void 0 : _a.unique_payment_number,
+        uniquePaymentNumber: (_b = newPaymentItem.metadata) == null ? void 0 : _b.unique_payment_number,
         newExpectAmount: order.expect_amount,
         paymentAmount: newPaymentItem.amount,
         paymentCode: newPaymentItem.code,
         orderPaymentType: newPaymentItem.order_payment_type,
         metadataFields: Object.keys(newPaymentItem.metadata || {}),
         // 现金支付找零信息
-        actualPaidAmount: (_b = newPaymentItem.metadata) == null ? void 0 : _b.actual_paid_amount,
-        changeGivenAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.change_given_amount
+        actualPaidAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
       });
     } catch (error) {
       console.error("[PaymentModule] 添加支付项失败", error);

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/solution/Checkout/index.js

@@ -1967,7 +1967,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const depositPaidAmount = paymentItems.filter(
           (item) => item.order_payment_type === "deposit" && item.status !== "voided"
         ).reduce((sum, item) => {
-          if (item.voucher_id && !item.isSynced) {
+          if (item.voucher_id && !item.isSynced && paymentItems.filter((item2) => !item2.voucher_id).length === 0) {
             return sum;
           }
           const amount = new import_decimal.default(item.amount || "0");

package/package.json

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