@chevre/domain 21.33.0-alpha.28 → 21.33.0-alpha.29

package/lib/chevre/service/payment/creditCard/factory.d.ts

@@ -1,16 +1,16 @@
 import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../../factory';
 interface IProcessAlterTranResult {
-    searchTradeArgs: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
-    searchTradeResult: GMO.factory.credit.ISearchTradeResult;
+    searchTradeArgs?: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
+    searchTradeResult?: GMO.factory.credit.ISearchTradeResult;
     alterTranArgs?: GMO.factory.credit.IAlterTranArgs & GMO.factory.credit.IOptionalSiteArgs;
-    alterTranResult: GMO.factory.credit.IAlterTranResult;
+    alterTranResult?: GMO.factory.credit.IAlterTranResult;
 }
 interface IProcessAlterTranResult4refund {
-    searchTradeArgs: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
-    searchTradeResult: GMO.factory.credit.ISearchTradeResult;
+    searchTradeArgs?: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
+    searchTradeResult?: GMO.factory.credit.ISearchTradeResult;
     alterTranArgs?: GMO.factory.credit.IAlterTranArgs & GMO.factory.credit.IOptionalSiteArgs;
-    alterTranResult: GMO.factory.credit.IAlterTranResult | factory.action.trade.refund.IAlterTranResultAsError;
+    alterTranResult?: GMO.factory.credit.IAlterTranResult | factory.action.trade.refund.IAlterTranResultAsError;
 }
 declare function processAlterTranResult2payRecipe(params: {
     processAlterTranResults: IProcessAlterTranResult[];

package/lib/chevre/service/payment/creditCard/factory.js

@@ -16,19 +16,12 @@ function processAlterTranResult2payRecipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.searchTrade,
-                        itemListElement: [{
-                                typeOf: 'HowToDirection',
-                                beforeMedia: searchTradeArgs,
-                                afterMedia: searchTradeResult
-                                // text: 'entryTran'
-                            }]
+                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { afterMedia: searchTradeResult } : undefined)]
                     },
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.alterTran,
-                        itemListElement: [Object.assign({ typeOf: 'HowToDirection', afterMedia: alterTranResult }, (alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined
-                            // text: 'execTran'
-                            )]
+                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (alterTranResult !== undefined) ? { afterMedia: alterTranResult } : undefined), (alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined)]
                     }
                 ]
             };
@@ -38,6 +31,7 @@ function processAlterTranResult2payRecipe(params) {
 exports.processAlterTranResult2payRecipe = processAlterTranResult2payRecipe;
 function processAlterTranResult2refundRecipe(params) {
     const { processAlterTranResult, project, action } = params;
+    const { searchTradeArgs, searchTradeResult, alterTranResult, alterTranArgs } = processAlterTranResult;
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: 'Recipe',
@@ -49,21 +43,12 @@ function processAlterTranResult2refundRecipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.searchTrade,
-                        itemListElement: [{
-                                typeOf: 'HowToDirection',
-                                beforeMedia: processAlterTranResult.searchTradeArgs,
-                                afterMedia: processAlterTranResult.searchTradeResult
-                                // text: 'entryTran'
-                            }]
+                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { afterMedia: searchTradeResult } : undefined)]
                     },
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.alterTran,
-                        itemListElement: [Object.assign({ typeOf: 'HowToDirection', afterMedia: processAlterTranResult.alterTranResult }, (processAlterTranResult.alterTranArgs !== undefined)
-                                ? { beforeMedia: processAlterTranResult.alterTranArgs }
-                                : undefined
-                            // text: 'execTran'
-                            )]
+                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined), (alterTranResult !== undefined) ? { afterMedia: alterTranResult } : undefined)]
                     }
                 ]
             }]

package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts

@@ -1,10 +1,11 @@
-import * as factory from '../../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+type IPayAction = factory.action.trade.pay.IAction;
 /**
  * クレジットカード決済
  */
@@ -15,5 +16,5 @@ declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (r
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
+}) => Promise<IPayAction>;
 export { payCreditCard };

package/lib/chevre/service/payment/creditCard/payCreditCard.js

@@ -14,7 +14,6 @@ const GMO = require("@motionpicture/gmo-service");
 const createDebug = require("debug");
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 const onPaid_1 = require("../any/onPaid");
 const factory_1 = require("./factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
@@ -45,27 +44,33 @@ function payCreditCard(params) {
         // アクション開始
         let action = yield repos.action.start(params);
         const alterTranResults = [];
+        const processAlterTranResults = [];
         try {
             const creditCardService = new GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl),
                 useFetch: credentials_1.credentials.gmo.useFetch
             }, { timeout: credentials_1.credentials.gmo.timeout });
-            const processAlterTranResults = [];
             yield Promise.all(payObject.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
                 const processAlterTranResult = yield processAlterTran({
                     shopId, shopPass, availableChannel, paymentMethod
                 })({ creditCardService });
-                alterTranResults.push(processAlterTranResult.alterTranResult);
                 processAlterTranResults.push(processAlterTranResult);
+                if (processAlterTranResult.processAlterTranError === undefined) {
+                    if (processAlterTranResult.alterTranResult !== undefined) {
+                        alterTranResults.push(processAlterTranResult.alterTranResult);
+                    }
+                }
+                else {
+                    // 代行決済連携中にエラーがあればそのままthrow
+                    throw processAlterTranResult.processAlterTranError;
+                }
             })));
             // add recipe(2024-06-03~)
-            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-                yield repos.action.saveOneRecipe((0, factory_1.processAlterTranResult2payRecipe)({
-                    processAlterTranResults,
-                    project: { id: params.project.id },
-                    action: { id: action.id, typeOf: action.typeOf }
-                }));
-            }
+            yield repos.action.saveOneRecipe((0, factory_1.processAlterTranResult2payRecipe)({
+                processAlterTranResults,
+                project: { id: params.project.id },
+                action: { id: action.id, typeOf: action.typeOf }
+            }));
         }
         catch (error) {
             try {
@@ -76,10 +81,7 @@ function payCreditCard(params) {
             }
             throw error;
         }
-        // アクション完了
-        const actionResult = {
-            creditCardSales: alterTranResults
-        };
+        const actionResult = { creditCardSales: alterTranResults };
         action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
         yield (0, onPaid_1.onPaid)(action)(repos);
         return action;
@@ -89,74 +91,77 @@ exports.payCreditCard = payCreditCard;
 function processAlterTran(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
+        let searchTradeArgs;
+        let searchTradeResult;
         let alterTranArgs;
         let alterTranResult;
-        const paymentMethod = params.paymentMethod;
-        const orderId = paymentMethod.paymentMethod.paymentMethodId;
-        // 取引状態参照
-        const searchTradeArgs = {
-            shopId: params.shopId,
-            shopPass: params.shopPass,
-            orderId: orderId,
-            siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-            sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
-        };
-        const searchTradeResult = yield repos.creditCardService.searchTrade(searchTradeArgs);
-        const amount = (_c = paymentMethod.paymentMethod.totalPaymentDue) === null || _c === void 0 ? void 0 : _c.value;
-        if (typeof amount !== 'number') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
+        let processAlterTranError;
+        try {
+            const { shopId, shopPass } = params;
+            const paymentMethod = params.paymentMethod;
+            const orderId = paymentMethod.paymentMethod.paymentMethodId;
+            // 取引状態参照
+            searchTradeArgs = {
+                shopId, shopPass, orderId,
+                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
+                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
+            };
+            searchTradeResult = yield repos.creditCardService.searchTrade(searchTradeArgs);
+            const { accessId, accessPass } = searchTradeResult;
+            const amount = (_c = paymentMethod.paymentMethod.totalPaymentDue) === null || _c === void 0 ? void 0 : _c.value;
+            if (typeof amount !== 'number') {
+                throw new factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
+            }
+            switch (searchTradeResult.jobCd) {
+                case GMO.utils.util.JobCd.Capture:
+                case GMO.utils.util.JobCd.Sales:
+                    debug('already in SALES');
+                    // すでに即時売上済み
+                    alterTranResult = {
+                        accessId, accessPass,
+                        forward: searchTradeResult.forward,
+                        approve: searchTradeResult.approve,
+                        tranId: searchTradeResult.tranId,
+                        tranDate: ''
+                    };
+                    break;
+                case GMO.utils.util.JobCd.Void:
+                    // 返品手数料決済の場合を追加(状態が取消であれば即時売上)
+                    debug('calling alterTran...');
+                    alterTranArgs = {
+                        shopId, shopPass,
+                        accessId, accessPass,
+                        jobCd: GMO.utils.util.JobCd.Capture,
+                        amount: amount,
+                        siteId: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
+                        sitePass: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass,
+                        method: GMO.utils.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
+                    };
+                    alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
+                    debug('alterTran processed.');
+                    break;
+                case GMO.utils.util.JobCd.Auth:
+                    debug('calling alterTran...');
+                    alterTranArgs = {
+                        shopId, shopPass,
+                        accessId, accessPass,
+                        jobCd: GMO.utils.util.JobCd.Sales,
+                        amount: amount,
+                        siteId: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
+                        sitePass: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
+                    };
+                    alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
+                    // 失敗したら取引状態確認してどうこう、という処理も考えうるが、
+                    // GMOはapiのコール制限が厳しく、下手にコールするとすぐにクライアントサイドにも影響をあたえてしまう
+                    // リトライはタスクの仕組みに含まれているので失敗してもここでは何もしない
+                    break;
+                default:
+                    throw new factory.errors.NotImplemented(`jobCd '${searchTradeResult.jobCd}' not implemented`);
+            }
         }
-        switch (searchTradeResult.jobCd) {
-            case GMO.utils.util.JobCd.Capture:
-            case GMO.utils.util.JobCd.Sales:
-                debug('already in SALES');
-                // すでに即時売上済み
-                alterTranResult = {
-                    accessId: searchTradeResult.accessId,
-                    accessPass: searchTradeResult.accessPass,
-                    forward: searchTradeResult.forward,
-                    approve: searchTradeResult.approve,
-                    tranId: searchTradeResult.tranId,
-                    tranDate: ''
-                };
-                break;
-            case GMO.utils.util.JobCd.Void:
-                // 返品手数料決済の場合を追加(状態が取消であれば即時売上)
-                debug('calling alterTran...');
-                alterTranArgs = {
-                    shopId: params.shopId,
-                    shopPass: params.shopPass,
-                    accessId: searchTradeResult.accessId,
-                    accessPass: searchTradeResult.accessPass,
-                    jobCd: GMO.utils.util.JobCd.Capture,
-                    amount: amount,
-                    siteId: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                    sitePass: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass,
-                    method: GMO.utils.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
-                };
-                alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
-                debug('alterTran processed.');
-                break;
-            case GMO.utils.util.JobCd.Auth:
-                debug('calling alterTran...');
-                alterTranArgs = {
-                    shopId: params.shopId,
-                    shopPass: params.shopPass,
-                    accessId: searchTradeResult.accessId,
-                    accessPass: searchTradeResult.accessPass,
-                    jobCd: GMO.utils.util.JobCd.Sales,
-                    amount: amount,
-                    siteId: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
-                    sitePass: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
-                };
-                alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
-                // 失敗したら取引状態確認してどうこう、という処理も考えうるが、
-                // GMOはapiのコール制限が厳しく、下手にコールするとすぐにクライアントサイドにも影響をあたえてしまう
-                // リトライはタスクの仕組みに含まれているので失敗してもここでは何もしない
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`jobCd '${searchTradeResult.jobCd}' not implemented`);
+        catch (error) {
+            processAlterTranError = error;
         }
-        return { searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult };
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { searchTradeResult } : undefined), (alterTranArgs !== undefined) ? { alterTranArgs } : undefined), (alterTranResult !== undefined) ? { alterTranResult } : undefined), (processAlterTranError !== undefined) ? { processAlterTranError } : undefined);
     });
 }

package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts

@@ -1,10 +1,11 @@
-import * as factory from '../../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+type IRefundAction = factory.action.trade.refund.IAction;
 /**
  * クレジットカード返金
  */
@@ -21,5 +22,5 @@ declare function refundCreditCard(params: factory.task.refund.IData & {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
+}) => Promise<IRefundAction>;
 export { refundCreditCard };

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -14,7 +14,6 @@ const GMO = require("@motionpicture/gmo-service");
 const createDebug = require("debug");
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 const onRefund_1 = require("../any/onRefund");
 const factory_1 = require("./factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
@@ -48,26 +47,35 @@ function refundCreditCard(params, options) {
         });
         let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_e = params.sameAs) === null || _e === void 0 ? void 0 : _e.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined));
         const alterTranResult = [];
+        let processAlterTranResult;
         try {
-            const processAlterTranResult = yield processChangeTransaction({
+            const creditCardService = new GMO.service.Credit({
+                endpoint: String(availableChannel.serviceUrl),
+                useFetch: credentials_1.credentials.gmo.useFetch
+            }, { timeout: credentials_1.credentials.gmo.timeout });
+            processAlterTranResult = yield processAlterTran({
                 availableChannel,
                 payAction: payAction,
                 paymentMethodId: paymentMethodId,
                 shopId: shopId,
                 shopPass: shopPass,
                 refundFee: (_f = params.object[0]) === null || _f === void 0 ? void 0 : _f.refundFee
-            });
-            if (processAlterTranResult.alterTranResult !== undefined) {
-                alterTranResult.push(processAlterTranResult.alterTranResult);
+            })({ creditCardService });
+            if (processAlterTranResult.processAlterTranError === undefined) {
+                if (processAlterTranResult.alterTranResult !== undefined) {
+                    alterTranResult.push(processAlterTranResult.alterTranResult);
+                }
             }
-            // add recipe(2024-06-04~)
-            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-                yield repos.action.saveOneRecipe((0, factory_1.processAlterTranResult2refundRecipe)({
-                    processAlterTranResult,
-                    project: { id: params.project.id },
-                    action: { id: action.id, typeOf: action.typeOf }
-                }));
+            else {
+                // 代行決済連携中にエラーがあればそのままthrow
+                throw processAlterTranResult.processAlterTranError;
             }
+            // add recipe(2024-06-04~)
+            yield repos.action.saveOneRecipe((0, factory_1.processAlterTranResult2refundRecipe)({
+                processAlterTranResult,
+                project: { id: params.project.id },
+                action: { id: action.id, typeOf: action.typeOf }
+            }));
         }
         catch (error) {
             try {
@@ -85,97 +93,99 @@ function refundCreditCard(params, options) {
     });
 }
 exports.refundCreditCard = refundCreditCard;
-// tslint:disable-next-line:max-func-body-length
-function processChangeTransaction(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    return __awaiter(this, void 0, void 0, function* () {
+function processAlterTran(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        let searchTradeArgs;
+        let searchTradeResult;
         let alterTranArgs;
         let alterTranResult;
+        let processAlterTranError;
         let alterTranError;
-        const creditCardService = new GMO.service.Credit({
-            endpoint: String(params.availableChannel.serviceUrl),
-            useFetch: credentials_1.credentials.gmo.useFetch
-        }, { timeout: credentials_1.credentials.gmo.timeout });
-        // 取引状態参照
-        const searchTradeArgs = {
-            shopId: params.shopId,
-            shopPass: params.shopPass,
-            orderId: params.paymentMethodId,
-            siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-            sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
-        };
-        const searchTradeResult = yield creditCardService.searchTrade(searchTradeArgs);
-        // 冪等性の担保をいったん保留
-        let creditCardSalesBefore;
-        if (Array.isArray((_d = (_c = params.payAction) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.creditCardSales)) {
-            creditCardSalesBefore = (_f = (_e = params.payAction) === null || _e === void 0 ? void 0 : _e.result) === null || _f === void 0 ? void 0 : _f.creditCardSales[0];
-        }
-        let alreadyRefunded = false;
-        // 決済時のGMO取引を確認できれば、既に返金済かどうかを判定
-        if (typeof (creditCardSalesBefore === null || creditCardSalesBefore === void 0 ? void 0 : creditCardSalesBefore.tranId) === 'string') {
-            // GMO取引状態に変更がなければ金額変更
-            if (searchTradeResult.tranId !== creditCardSalesBefore.tranId) {
-                alreadyRefunded = true;
+        try {
+            const { shopId, shopPass } = params;
+            // 取引状態参照
+            searchTradeArgs = {
+                shopId, shopPass,
+                orderId: params.paymentMethodId,
+                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
+                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
+            };
+            searchTradeResult = yield repos.creditCardService.searchTrade(searchTradeArgs);
+            const { accessId, accessPass } = searchTradeResult;
+            // 冪等性の担保をいったん保留
+            let creditCardSalesBefore;
+            if (Array.isArray((_d = (_c = params.payAction) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.creditCardSales)) {
+                creditCardSalesBefore = (_f = (_e = params.payAction) === null || _e === void 0 ? void 0 : _e.result) === null || _f === void 0 ? void 0 : _f.creditCardSales[0];
             }
-            // tranIdが空文字のケース(SPSwrapperで発生)に対応(Voidに対してVoidを実行してしまうので)(2024-04-20~)
-            if (searchTradeResult.tranId === '' && creditCardSalesBefore.tranId === '') {
-                if (searchTradeResult.status === GMO.utils.util.Status.Void) {
+            let alreadyRefunded = false;
+            // 決済時のGMO取引を確認できれば、既に返金済かどうかを判定
+            if (typeof (creditCardSalesBefore === null || creditCardSalesBefore === void 0 ? void 0 : creditCardSalesBefore.tranId) === 'string') {
+                // GMO取引状態に変更がなければ金額変更
+                if (searchTradeResult.tranId !== creditCardSalesBefore.tranId) {
                     alreadyRefunded = true;
                 }
+                // tranIdが空文字のケース(SPSwrapperで発生)に対応(Voidに対してVoidを実行してしまうので)(2024-04-20~)
+                if (searchTradeResult.tranId === '' && creditCardSalesBefore.tranId === '') {
+                    if (searchTradeResult.status === GMO.utils.util.Status.Void) {
+                        alreadyRefunded = true;
+                    }
+                }
             }
-        }
-        if (alreadyRefunded) {
-            alterTranResult = {
-                accessId: searchTradeResult.accessId,
-                accessPass: searchTradeResult.accessPass,
-                forward: searchTradeResult.forward,
-                approve: searchTradeResult.approve,
-                tranId: searchTradeResult.tranId,
-                tranDate: ''
-            };
-        }
-        else {
-            try {
-                // 手数料決済については、取消→即時売上の流れ
-                debug('alterTran processing... searchTradeResult:', searchTradeResult);
-                alterTranArgs = {
-                    shopId: params.shopId,
-                    shopPass: params.shopPass,
-                    accessId: searchTradeResult.accessId,
-                    accessPass: searchTradeResult.accessPass,
-                    jobCd: GMO.utils.util.JobCd.Void,
-                    siteId: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.siteId,
-                    sitePass: (_h = params.availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.sitePass
+            if (alreadyRefunded) {
+                alterTranResult = {
+                    accessId, accessPass,
+                    forward: searchTradeResult.forward,
+                    approve: searchTradeResult.approve,
+                    tranId: searchTradeResult.tranId,
+                    tranDate: ''
                 };
-                alterTranResult = yield creditCardService.alterTran(alterTranArgs);
-                debug('alterTran processed.');
             }
-            catch (error) {
-                let throwsError = true;
-                // 未決済(3D 登録済)->取消をトライするとE01050004エラーとなるが、この場合何もする必要はない(2024-01-09~)
-                if (error.name === 'GMOServiceBadRequestError') {
-                    // 会員が存在しない場合このエラーになる
-                    if (Array.isArray(error.errors) && error.errors.length === 1 && error.errors[0].info === 'E01050004') {
-                        debug('creditCardService.alterTran:E01050004:', 'orderId:', searchTradeResult.orderId, 'status:', searchTradeResult.status);
-                        if (searchTradeResult.status === GMO.utils.util.Status.Authenticated
-                            || searchTradeResult.status === GMO.utils.util.Status.Void) {
-                            alterTranError = error;
-                            throwsError = false;
+            else {
+                try {
+                    // 手数料決済については、取消→即時売上の流れ
+                    debug('alterTran processing... searchTradeResult:', searchTradeResult);
+                    alterTranArgs = {
+                        shopId, shopPass,
+                        accessId, accessPass,
+                        jobCd: GMO.utils.util.JobCd.Void,
+                        siteId: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.siteId,
+                        sitePass: (_h = params.availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.sitePass
+                    };
+                    alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
+                    debug('alterTran processed.');
+                }
+                catch (error) {
+                    let throwsError = true;
+                    // 未決済(3D 登録済)->取消をトライするとE01050004エラーとなるが、この場合何もする必要はない(2024-01-09~)
+                    if (error.name === 'GMOServiceBadRequestError') {
+                        // 会員が存在しない場合このエラーになる
+                        if (Array.isArray(error.errors) && error.errors.length === 1 && error.errors[0].info === 'E01050004') {
+                            debug('creditCardService.alterTran:E01050004:', 'orderId:', searchTradeResult.orderId, 'status:', searchTradeResult.status);
+                            if (searchTradeResult.status === GMO.utils.util.Status.Authenticated
+                                || searchTradeResult.status === GMO.utils.util.Status.Void) {
+                                alterTranError = error;
+                                throwsError = false;
+                            }
                         }
                     }
-                }
-                if (throwsError) {
-                    throw error;
+                    if (throwsError) {
+                        throw error;
+                    }
                 }
             }
+            if (alterTranResult === undefined && alterTranError !== undefined) {
+                alterTranResult = alterTranError;
+            }
+            if (alterTranResult === undefined) {
+                // impossible path
+                throw new factory.errors.NotImplemented('alterTranResult undefined not implemented');
+            }
         }
-        if (alterTranResult === undefined && alterTranError !== undefined) {
-            alterTranResult = alterTranError;
-        }
-        if (alterTranResult === undefined) {
-            // impossible path
-            throw new factory.errors.NotImplemented('alterTranResult undefined not implemented');
+        catch (error) {
+            processAlterTranError = error;
         }
-        return { searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult };
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { searchTradeResult } : undefined), (alterTranArgs !== undefined) ? { alterTranArgs } : undefined), (alterTranResult !== undefined) ? { alterTranResult } : undefined), (processAlterTranError !== undefined) ? { processAlterTranError } : undefined);
     });
 }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.5",
+    "@chevre/factory": "4.374.0-alpha.6",
     "@cinerino/sdk": "7.1.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.28"
+  "version": "21.33.0-alpha.29"
 }