Oak-Team
/
oak-pay-business
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

build

This commit is contained in:
Xu Chang 2025-01-21 15:43:25 +08:00
parent 98195eed5c
commit 736c939a2b
6 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
es/checkers/order.js
View File

@ -97,17 +97,8 @@ const checkers = [
assert(['paid', 'partiallyRefunded'].includes(iState));
assert(settlements && settlements.length > 0, '该结算订单需添加结算明细');
let amount = 0;
<<<<<<< HEAD
settlements.forEach((settlement) => {
amount += settlement.price;
=======
opers.forEach(({ action, data }) => {
assert(action === 'create');
const { type, totalPlus, availPlus, refundablePlus } = data;
assert(type === 'earn');
// assert(totalPlus === availPlus);
amount += totalPlus;
>>>>>>> build
});
assert(amount === paid - refunded);
});

15
es/configuration/attrUpdateMatrix.js
View File

@ -186,36 +186,21 @@ const attrUpdateMatrix = {
taxLossRatio: {
actions: ['update'],
},
<<<<<<< HEAD
/* depositLossRatio: {
actions: ['update'],
}, */
=======
// depositLossRatio: {
// actions: ['update'],
// },
>>>>>>> build
refundCompensateRatio: {
actions: ['update'],
},
refundGapDays: {
actions: ['update'],
},
<<<<<<< HEAD
/* refundLossRatio: {
actions: ['update'],
},
refundLossFloor: {
actions: ['update'],
},*/
=======
// refundLossRatio: {
// actions: ['update'],
// },
// refundLossFloor: {
// actions: ['update'],
// },
>>>>>>> build
publicKeyFilePath: {
actions: ['update'],
},

2
es/utils/payClazz/WechatPay/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import WechatPay from './WechatPay';
import WechatPayDebug from './WechatPay.debug';
declare const _default: typeof WechatPay | typeof WechatPayDebug;
declare const _default: typeof WechatPayDebug | typeof WechatPay;
export default _default;

9
lib/checkers/order.js
View File

@ -100,17 +100,8 @@ const checkers = [
(0, assert_1.default)(['paid', 'partiallyRefunded'].includes(iState));
(0, assert_1.default)(settlements && settlements.length > 0, '该结算订单需添加结算明细');
let amount = 0;
<<<<<<< HEAD
settlements.forEach((settlement) => {
amount += settlement.price;
=======
opers.forEach(({ action, data }) => {
(0, assert_1.default)(action === 'create');
const { type, totalPlus, availPlus, refundablePlus } = data;
(0, assert_1.default)(type === 'earn');
// (0, assert_1.default)(totalPlus === availPlus);
amount += totalPlus;
>>>>>>> build
});
(0, assert_1.default)(amount === paid - refunded);
});

2
lib/utils/payClazz/WechatPay/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import WechatPay from './WechatPay';
import WechatPayDebug from './WechatPay.debug';
declare const _default: typeof WechatPay | typeof WechatPayDebug;
declare const _default: typeof WechatPayDebug | typeof WechatPay;
export default _default;

5
lib/utils/wpProductFrontend.js
View File

@ -1,7 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.getWpProductTypeFromEnv = getWpProductTypeFromEnv;
exports.canStartPay = canStartPay;
exports.canStartPay = exports.getWpProductTypeFromEnv = void 0;
const utils_1 = require("oak-frontend-base/es/utils/utils");
function getWpProductTypeFromEnv() {
switch (process.env.OAK_PLATFORM) {
@ -24,6 +23,7 @@ function getWpProductTypeFromEnv() {
}
return [];
}
exports.getWpProductTypeFromEnv = getWpProductTypeFromEnv;
function canStartPay(pay, features) {
const { applicationId, wpProduct } = pay;
if (features.application.getApplicationId() !== applicationId) {
@ -32,3 +32,4 @@ function canStartPay(pay, features) {
const types = getWpProductTypeFromEnv();
return types.includes(wpProduct.type) && wpProduct.type !== 'native';
}
exports.canStartPay = canStartPay;