@chevre/domain 21.20.0-alpha.2 → 21.20.0-alpha.22

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -14,14 +14,16 @@ exports.onOrderProcessing = void 0;
  * 注文処理時処理
  */
 const createDebug = require("debug");
+const util = require("util");
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
@@ -53,13 +55,15 @@ function onOrderProcessing(params) {
             case factory.orderStatus.OrderProcessing:
                 // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
                 yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
-                // 冗長なsendOrderタスク作成を回避(2023-08-25~)
-                yield createSendOrderTransactionTaskIfNotExist({
-                    object: params.order,
-                    potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
-                })(repos);
+                if (settings_1.USE_SEND_ORDER_ON_ORDER_PROCESSING) {
+                    // 冗長なsendOrderタスク作成を回避(2023-08-25~)
+                    // await createSendOrderTransactionTaskIfNotExist({
+                    //     object: params.order,
+                    //     potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
+                    // })(repos);
+                }
                 yield createGivePointAwardTaskIfNotExist({
-                    potentialActions: (_f = (_e = (_d = params.placeOrderTransaction) === null || _d === void 0 ? void 0 : _d.potentialActions) === null || _e === void 0 ? void 0 : _e.order) === null || _f === void 0 ? void 0 : _f.potentialActions
+                    potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
                 })(repos);
                 break;
             default:
@@ -67,14 +71,10 @@ function onOrderProcessing(params) {
     });
 }
 exports.onOrderProcessing = onOrderProcessing;
-// const COA_TASK_DELAY_IN_SECONDS = 0;
 function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const taskRunsAt = new Date();
         const taskRunsAt4coa = new Date();
-        // const taskRunsAt4coa = moment(order.orderDate)
-        //     .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
-        //     .toDate();
         const confirmObjects = [
             ...(0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order }),
             ...(0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order })
@@ -93,7 +93,9 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                         : factory.service.webAPI.Identifier.Chevre
                 }
             };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
+                identifier: taskIdentifier,
                 project: order.project,
                 name: factory.taskName.ConfirmReserveTransaction,
                 status: factory.taskStatus.Ready,
@@ -103,7 +105,8 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            yield repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
+            // await repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
+            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
         })));
     });
 }
@@ -159,30 +162,42 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
         }
     });
 }
-function createSendOrderTransactionTaskIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const now = new Date();
-        const sendOrderByTransaction = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendOrder;
-        if (sendOrderByTransaction !== undefined) {
-            const sendOrderTaskData = {
-                project: sendOrderByTransaction.project,
-                object: Object.assign(Object.assign({}, sendOrderByTransaction.object), { confirmationNumber: params.object.confirmationNumber })
-            };
-            const sendOrderTask = {
-                project: sendOrderByTransaction.project,
-                name: factory.taskName.SendOrder,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: sendOrderTaskData
-            };
-            yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
-        }
-    });
-}
+// function createSendOrderTransactionTaskIfNotExist(params: {
+//     object: factory.order.IOrder | IExternalOrder;
+//     potentialActions?: factory.action.trade.order.IPotentialActions;
+// }) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }): Promise<void> => {
+//         const now = new Date();
+//         const sendOrderByTransaction = params.potentialActions?.sendOrder;
+//         if (sendOrderByTransaction !== undefined) {
+//             const sendOrderTaskData: factory.task.IData<factory.taskName.SendOrder> = {
+//                 project: sendOrderByTransaction.project,
+//                 object: {
+//                     ...sendOrderByTransaction.object,
+//                     confirmationNumber: params.object.confirmationNumber,
+//                     previousOrderStatus: factory.orderStatus.OrderProcessing
+//                 }
+//             };
+//             const taskIdentifier: string =
+// tslint:disable-next-line:max-line-length
+//                 `${sendOrderTaskData.project.id}:${factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
+//             const sendOrderTask: factory.task.IAttributes<factory.taskName.SendOrder> = {
+//                 identifier: taskIdentifier,
+//                 project: sendOrderByTransaction.project,
+//                 name: factory.taskName.SendOrder,
+//                 status: factory.taskStatus.Ready,
+//                 runsAt: now, // なるはやで実行
+//                 remainingNumberOfTries: 10,
+//                 numberOfTried: 0,
+//                 executionResults: [],
+//                 data: sendOrderTaskData
+//             };
+//             await repos.task.createIfNotExistByIdentifier(sendOrderTask, { emitImmediately: true });
+//         }
+//     };
+// }
 function createGivePointAwardTaskIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;

package/lib/chevre/service/order/onOrderStatusChanged.d.ts

@@ -3,7 +3,9 @@
  */
 import { onOrderCancelled } from './onOrderStatusChanged/onOrderCancelled';
 import { onOrderDelivered } from './onOrderStatusChanged/onOrderDelivered';
+import { onOrderDeliveredPartially } from './onOrderStatusChanged/onOrderDeliveredPartially';
+import { onOrderInTransit } from './onOrderStatusChanged/onOrderInTransit';
 import { onOrderPaymentDue } from './onOrderStatusChanged/onOrderPaymentDue';
 import { IExternalOrder, onOrderProcessing } from './onOrderStatusChanged/onOrderProcessing';
 import { onOrderReturned } from './onOrderStatusChanged/onOrderReturned';
-export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderPaymentDue, onOrderProcessing, onOrderReturned };
+export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned };

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
+exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
 /**
  * 注文ステータス変更時処理
  */
@@ -8,6 +8,10 @@ const onOrderCancelled_1 = require("./onOrderStatusChanged/onOrderCancelled");
 Object.defineProperty(exports, "onOrderCancelled", { enumerable: true, get: function () { return onOrderCancelled_1.onOrderCancelled; } });
 const onOrderDelivered_1 = require("./onOrderStatusChanged/onOrderDelivered");
 Object.defineProperty(exports, "onOrderDelivered", { enumerable: true, get: function () { return onOrderDelivered_1.onOrderDelivered; } });
+const onOrderDeliveredPartially_1 = require("./onOrderStatusChanged/onOrderDeliveredPartially");
+Object.defineProperty(exports, "onOrderDeliveredPartially", { enumerable: true, get: function () { return onOrderDeliveredPartially_1.onOrderDeliveredPartially; } });
+const onOrderInTransit_1 = require("./onOrderStatusChanged/onOrderInTransit");
+Object.defineProperty(exports, "onOrderInTransit", { enumerable: true, get: function () { return onOrderInTransit_1.onOrderInTransit; } });
 const onOrderPaymentDue_1 = require("./onOrderStatusChanged/onOrderPaymentDue");
 Object.defineProperty(exports, "onOrderPaymentDue", { enumerable: true, get: function () { return onOrderPaymentDue_1.onOrderPaymentDue; } });
 const onOrderProcessing_1 = require("./onOrderStatusChanged/onOrderProcessing");

package/lib/chevre/service/order/placeOrder.d.ts

@@ -2,6 +2,7 @@ import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOf
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { MongoRepository as OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import { IExternalOrder } from './onOrderStatusChanged';
@@ -39,6 +40,7 @@ declare function placeOrder(params: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     order: OrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<{

package/lib/chevre/service/order/placeOrder.js

@@ -159,7 +159,7 @@ function placeOrderWithoutTransaction(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+        yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         // 経理レポートを保管は外部注文の場合保留(2023-12-08~)
         // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
     });
@@ -168,7 +168,6 @@ exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
 /**
  * 注文を作成する
  */
-// tslint:disable-next-line:max-func-body-length
 function placeOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -182,6 +181,10 @@ function placeOrder(params) {
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
+        // USE_ORDER_PAYMENT_DUE_ON_PLACED設定を廃止したので、必ずOrderPaymentDueのはず(2024-01-10~)
+        if (order.orderStatus !== factory.orderStatus.OrderPaymentDue) {
+            throw new factory.errors.ServiceUnavailable(`orderStatus must be ${factory.orderStatus.OrderPaymentDue}`);
+        }
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -224,6 +227,8 @@ function placeOrder(params) {
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {
+                // orderInTransactionを考慮(2024-01-14~)
+                yield repos.orderInTransaction.placeOrder(order);
                 yield repos.order.createIfNotExist(order);
             }
             catch (error) {
@@ -235,7 +240,7 @@ function placeOrder(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+            yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管
@@ -259,27 +264,26 @@ function placeOrder(params) {
                 })({
                     task: repos.task
                 });
-            }
-            else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
-                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
-                // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
-                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: {
-                        paymentMethods: order.paymentMethods,
-                        project: order.project,
-                        orderNumber: order.orderNumber,
-                        confirmationNumber: order.confirmationNumber,
-                        customer: order.customer,
-                        orderDate: order.orderDate,
-                        seller: order.seller,
-                        typeOf: order.typeOf,
-                        price: order.price,
-                        priceCurrency: order.priceCurrency,
-                        orderStatus: factory.orderStatus.OrderPaymentDue
-                    }
-                })({
-                    task: repos.task
-                });
+                // } else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
+                //     // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
+                //     // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
+                //     await onOrderPaymentDue({
+                //         order: {
+                //             paymentMethods: order.paymentMethods,
+                //             project: order.project,
+                //             orderNumber: order.orderNumber,
+                //             confirmationNumber: order.confirmationNumber,
+                //             customer: order.customer,
+                //             orderDate: order.orderDate,
+                //             seller: order.seller,
+                //             typeOf: order.typeOf,
+                //             price: order.price,
+                //             priceCurrency: order.priceCurrency,
+                //             orderStatus: factory.orderStatus.OrderPaymentDue
+                //         }
+                //     })({
+                //         task: repos.task
+                //     });
             }
             else {
                 throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
@@ -295,11 +299,6 @@ function placeOrder(params) {
                 })(repos);
             }
         }
-        // onOrderStatusChangedへ移行(2023-08-17~)
-        // await onPlaceOrder({
-        //     object: order,
-        //     potentialActions: params.potentialActions
-        // })(repos);
         return { order };
     });
 }

package/lib/chevre/service/order/returnOrder.js

@@ -26,15 +26,24 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({
+        const order = yield repos.order.findByOrderNumber({
             orderNumber,
             project: { id: params.project.id },
             inclusion: [
                 'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
-                'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
+                'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate', 'orderStatus'
             ],
             exclusion: []
         });
+        // 注文ステータス検証(2024-01-10~)
+        switch (order.orderStatus) {
+            case factory.orderStatus.OrderDelivered:
+            case factory.orderStatus.OrderReturned:
+                break;
+            default:
+                // OrderDeliveredへの処理が進行中と考えられるので、ひとまず失敗させてリトライに期待
+                throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
+        }
         // 返品取引検索
         const returnOrderTransactions = yield repos.transaction.search({
             limit: 1,
@@ -72,7 +81,7 @@ function returnOrder(params) {
             typeOf: factory.actionType.ReturnAction
         };
         let returnedOwnershipInfos = [];
-        // アクション開始
+        let returnedOrder;
         const action = yield repos.action.start(returnOrderActionAttributes);
         try {
             returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({
@@ -80,7 +89,7 @@ function returnOrder(params) {
                 ownershipInfo: repos.ownershipInfo
             });
             // 注文ステータス変更
-            order = yield repos.order.returnOrder({
+            returnedOrder = yield repos.order.returnOrder({
                 project: { id: order.project.id },
                 orderNumber,
                 dateReturned,
@@ -98,21 +107,21 @@ function returnOrder(params) {
             throw error;
         }
         const result = returnedOwnershipInfos;
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         if (params.useOnOrderStatusChanged) {
             yield (0, onOrderStatusChanged_1.onOrderReturned)({
                 order: {
-                    project: order.project,
-                    typeOf: order.typeOf,
-                    orderNumber: order.orderNumber,
-                    dateReturned: order.dateReturned,
-                    id: order.id,
-                    customer: order.customer,
-                    returner: order.returner,
-                    seller: order.seller,
-                    price: order.price,
-                    priceCurrency: order.priceCurrency,
-                    orderDate: order.orderDate,
+                    project: returnedOrder.project,
+                    typeOf: returnedOrder.typeOf,
+                    orderNumber: returnedOrder.orderNumber,
+                    dateReturned: returnedOrder.dateReturned,
+                    id: returnedOrder.id,
+                    customer: returnedOrder.customer,
+                    returner: returnedOrder.returner,
+                    seller: returnedOrder.seller,
+                    price: returnedOrder.price,
+                    priceCurrency: returnedOrder.priceCurrency,
+                    orderDate: returnedOrder.orderDate,
                     orderStatus: factory.orderStatus.OrderReturned
                 },
                 returnOrderTransaction

package/lib/chevre/service/order/sendOrder.d.ts

@@ -24,6 +24,11 @@ declare function sendOrder(params: {
     object: {
         confirmationNumber: string;
         orderNumber: string;
+        previousOrderStatus: factory.orderStatus.OrderProcessing | factory.orderStatus.OrderInTransit;
+        acceptedOffers: {
+            limit: number;
+            page: number;
+        };
     };
     useOnOrderStatusChanged: boolean;
 }): ISendOperation<void>;

package/lib/chevre/service/order/sendOrder.js

@@ -10,21 +10,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = void 0;
+const createDebug = require("debug");
 const order_1 = require("../../factory/order");
 const factory_1 = require("../delivery/factory");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 /**
  * 注文を配送する
  */
 function sendOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
+        if (typeof ((_a = params.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) !== 'number') {
+            throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
+        }
+        if (typeof ((_b = params.object.acceptedOffers) === null || _b === void 0 ? void 0 : _b.page) !== 'number') {
+            throw new factory.errors.Argument('object.acceptedOffers.page', 'must be number');
+        }
+        if (params.object.acceptedOffers.limit <= 0) {
+            throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
+        }
+        if (params.object.acceptedOffers.page <= 0) {
+            throw new factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
+        }
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
@@ -62,9 +76,11 @@ function sendOrder(params) {
                 priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
+            const { limit, page } = params.object.acceptedOffers;
+            const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: { limit, page } });
             const sendOrderActionAttributes = {
-                agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
-                object: simpleOrder,
+                agent: (typeof ((_c = params.agent) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? params.agent : order.project,
+                object: sendOrderObject,
                 potentialActions: {
                 // sendEmailMessage: undefined
                 },
@@ -74,23 +90,34 @@ function sendOrder(params) {
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
             let ownershipInfos;
+            let allOffersDelivered = false;
             try {
-                // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                            orderNumber: { $eq: order.orderNumber },
-                            project: { id: { $eq: order.project.id } }
-                        }) })
+                // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                //     orderNumber: { $eq: order.orderNumber },
+                //     project: { id: { $eq: order.project.id } }
+                // });
+                const { acceptedOffers, numAcceptedOffers } = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
+                    $slice: [limit * (page - 1), limit],
+                    orderNumber: { $eq: order.orderNumber },
+                    project: { id: { $eq: order.project.id } }
                 });
+                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers);
+                // 所有権作成
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));
-                order = yield repos.order.changeStatus({
-                    project: { id: order.project.id },
-                    orderNumber,
-                    orderStatus: factory.orderStatus.OrderDelivered,
-                    previousOrderStatus: factory.orderStatus.OrderProcessing
-                });
+                const deliveredCount = limit * page;
+                debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
+                if (deliveredCount >= numAcceptedOffers) {
+                    order = yield repos.order.changeStatus({
+                        project: { id: order.project.id },
+                        orderNumber,
+                        orderStatus: factory.orderStatus.OrderDelivered,
+                        previousOrderStatus: params.object.previousOrderStatus
+                    });
+                    allOffersDelivered = true;
+                }
             }
             catch (error) {
                 try {
@@ -102,22 +129,33 @@ function sendOrder(params) {
                 throw error;
             }
             const result = ownershipInfos;
-            yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderDelivered)({
-                    order: {
-                        id: order.id,
-                        customer: order.customer,
-                        orderDate: order.orderDate,
-                        orderNumber: order.orderNumber,
-                        project: order.project,
-                        typeOf: order.typeOf,
-                        orderStatus: factory.orderStatus.OrderDelivered
-                    },
-                    placeOrderTransaction
-                })({
-                    task: repos.task
-                });
+                if (allOffersDelivered) {
+                    yield (0, onOrderStatusChanged_1.onOrderDelivered)({
+                        order: {
+                            id: order.id,
+                            customer: order.customer,
+                            orderDate: order.orderDate,
+                            orderNumber: order.orderNumber,
+                            project: order.project,
+                            typeOf: order.typeOf,
+                            orderStatus: factory.orderStatus.OrderDelivered
+                        },
+                        placeOrderTransaction
+                    })({
+                        task: repos.task
+                    });
+                }
+                else {
+                    yield (0, onOrderStatusChanged_1.onOrderDeliveredPartially)({
+                        order: Object.assign(Object.assign({}, order), { acceptedOffers: params.object.acceptedOffers, orderStatus: params.object.previousOrderStatus })
+                        // placeOrderTransaction
+                    })({
+                        task: repos.task
+                    });
+                }
             }
         }
         catch (error) {

package/lib/chevre/service/payment/any.d.ts

@@ -10,7 +10,6 @@ import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentSe
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
@@ -18,7 +17,6 @@ import type { RedisRepository as TransactionNumberRepo } from '../../repo/transa
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
 import { person2username } from './any/person2username';
-type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -30,7 +28,6 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -41,7 +38,6 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -53,7 +49,6 @@ declare function processVoidPayTransaction(params: factory.task.IData<factory.ta
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -67,7 +62,6 @@ interface IAuthorizeRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
@@ -79,7 +73,6 @@ interface IPublishPaymentUrlRepos {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
-    project: ProjectRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -122,5 +115,10 @@ declare function authorize(params: {
         useCheckByIdentifierIfNotYet: boolean;
         useSearchTrade4accountId: boolean;
     };
-}): IAuthorizeOperation<IAuthorizePaymentAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };