@pisell/pisellos 0.0.313 → 0.0.315
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.
|
@@ -1679,7 +1679,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
1679
1679
|
console.log('[Checkout] 定金状态无变化,跳过更新');
|
|
1680
1680
|
return _context19.abrupt("return");
|
|
1681
1681
|
case 10:
|
|
1682
|
-
deposit_amount =
|
|
1682
|
+
deposit_amount = this.store.currentOrder.deposit_amount || '0.00'; // 如果原来没有 deposit_amount,则默认把待付金额置为 deposit_amount
|
|
1683
1683
|
if (!deposit_amount || Number(deposit_amount) === 0) {
|
|
1684
1684
|
deposit_amount = this.store.currentOrder.expect_amount;
|
|
1685
1685
|
}
|
|
@@ -3287,8 +3287,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3287
3287
|
return item.status !== 'voided' && item.order_payment_type === 'deposit';
|
|
3288
3288
|
}).reduce(function (sum, item) {
|
|
3289
3289
|
var amt = new Decimal(item.amount || '0');
|
|
3290
|
-
|
|
3291
|
-
return sum.plus(amt).plus(rounding);
|
|
3290
|
+
return sum.plus(amt);
|
|
3292
3291
|
}, new Decimal(0)).toFixed(2);
|
|
3293
3292
|
}
|
|
3294
3293
|
// 如果当前是定金支付,并且定金额度已经大于等于了订单总计,则 finalDepositAmount 为实际付出去的定金金额
|
|
@@ -3297,8 +3296,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3297
3296
|
return item.status !== 'voided' && item.order_payment_type === 'deposit';
|
|
3298
3297
|
}).reduce(function (sum, item) {
|
|
3299
3298
|
var amt = new Decimal(item.amount || '0');
|
|
3300
|
-
|
|
3301
|
-
return sum.plus(amt).plus(rounding);
|
|
3299
|
+
return sum.plus(amt);
|
|
3302
3300
|
}, new Decimal(0)).toFixed(2);
|
|
3303
3301
|
}
|
|
3304
3302
|
this.logInfo('定金金额确定结果', {
|
|
@@ -1098,7 +1098,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
1098
1098
|
console.log("[Checkout] 定金状态无变化,跳过更新");
|
|
1099
1099
|
return;
|
|
1100
1100
|
}
|
|
1101
|
-
let deposit_amount =
|
|
1101
|
+
let deposit_amount = this.store.currentOrder.deposit_amount || "0.00";
|
|
1102
1102
|
if (!deposit_amount || Number(deposit_amount) === 0) {
|
|
1103
1103
|
deposit_amount = this.store.currentOrder.expect_amount;
|
|
1104
1104
|
}
|
|
@@ -2035,15 +2035,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
2035
2035
|
if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.some((item) => item.order_payment_type === "deposit")) {
|
|
2036
2036
|
finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
|
|
2037
2037
|
const amt = new import_decimal.default(item.amount || "0");
|
|
2038
|
-
|
|
2039
|
-
return sum.plus(amt).plus(rounding);
|
|
2038
|
+
return sum.plus(amt);
|
|
2040
2039
|
}, new import_decimal.default(0)).toFixed(2);
|
|
2041
2040
|
}
|
|
2042
2041
|
if (this.store.currentOrder.is_deposit === 1 && new import_decimal.default(finalDepositAmount).gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
|
|
2043
2042
|
finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
|
|
2044
2043
|
const amt = new import_decimal.default(item.amount || "0");
|
|
2045
|
-
|
|
2046
|
-
return sum.plus(amt).plus(rounding);
|
|
2044
|
+
return sum.plus(amt);
|
|
2047
2045
|
}, new import_decimal.default(0)).toFixed(2);
|
|
2048
2046
|
}
|
|
2049
2047
|
this.logInfo("定金金额确定结果", {
|