@pisell/pisellos 0.0.348 → 0.0.349
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1054,7 +1054,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
1054
1054
|
key: "addPaymentItemAsync",
|
|
1055
1055
|
value: (function () {
|
|
1056
1056
|
var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
|
|
1057
|
-
var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
|
|
1057
|
+
var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
|
|
1058
1058
|
return _regeneratorRuntime().wrap(function _callee13$(_context13) {
|
|
1059
1059
|
while (1) switch (_context13.prev = _context13.next) {
|
|
1060
1060
|
case 0:
|
|
@@ -1103,7 +1103,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
1103
1103
|
});
|
|
1104
1104
|
throw new Error(warningMessage);
|
|
1105
1105
|
case 15:
|
|
1106
|
-
|
|
1106
|
+
if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
|
|
1107
|
+
paymentUuid = paymentItem.metadata.unique_payment_number;
|
|
1108
|
+
} else {
|
|
1109
|
+
paymentUuid = getUniqueId('payment_');
|
|
1110
|
+
}
|
|
1107
1111
|
newPaymentItem = {
|
|
1108
1112
|
uuid: paymentUuid,
|
|
1109
1113
|
id: paymentItem.id || 0,
|
|
@@ -502,7 +502,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
|
|
|
502
502
|
* 为某个订单添加支付项(新方法)
|
|
503
503
|
*/
|
|
504
504
|
async addPaymentItemAsync(orderUuid, paymentItem) {
|
|
505
|
-
var _a, _b, _c;
|
|
505
|
+
var _a, _b, _c, _d;
|
|
506
506
|
this.logInfo("Starting addPaymentItemAsync", {
|
|
507
507
|
orderUuid,
|
|
508
508
|
paymentAmount: paymentItem.amount,
|
|
@@ -538,7 +538,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
|
|
|
538
538
|
});
|
|
539
539
|
throw new Error(warningMessage);
|
|
540
540
|
}
|
|
541
|
-
|
|
541
|
+
let paymentUuid;
|
|
542
|
+
if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
|
|
543
|
+
paymentUuid = paymentItem.metadata.unique_payment_number;
|
|
544
|
+
} else {
|
|
545
|
+
paymentUuid = (0, import_utils.getUniqueId)("payment_");
|
|
546
|
+
}
|
|
542
547
|
const newPaymentItem = {
|
|
543
548
|
uuid: paymentUuid,
|
|
544
549
|
id: paymentItem.id || 0,
|
|
@@ -570,15 +575,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
|
|
|
570
575
|
this.logInfo("addPaymentItemAsync completed successfully", {
|
|
571
576
|
orderUuid,
|
|
572
577
|
paymentUuid: newPaymentItem.uuid,
|
|
573
|
-
uniquePaymentNumber: (
|
|
578
|
+
uniquePaymentNumber: (_b = newPaymentItem.metadata) == null ? void 0 : _b.unique_payment_number,
|
|
574
579
|
newExpectAmount: order.expect_amount,
|
|
575
580
|
paymentAmount: newPaymentItem.amount,
|
|
576
581
|
paymentCode: newPaymentItem.code,
|
|
577
582
|
orderPaymentType: newPaymentItem.order_payment_type,
|
|
578
583
|
metadataFields: Object.keys(newPaymentItem.metadata || {}),
|
|
579
584
|
// 现金支付找零信息
|
|
580
|
-
actualPaidAmount: (
|
|
581
|
-
changeGivenAmount: (
|
|
585
|
+
actualPaidAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.actual_paid_amount,
|
|
586
|
+
changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
|
|
582
587
|
});
|
|
583
588
|
} catch (error) {
|
|
584
589
|
console.error("[PaymentModule] 添加支付项失败", error);
|