@yolo-croket-dev/amqp-access 0.7.187 → 0.7.189

package/order-server/dto/purchased-info.modules/purchased-info-admin/command/accept-crawler-proxy-order-for-admin.dto.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @author jun
+ * @description 관리자용 크롤러 사입 주문 확인 Payload
+ */
+export declare class AcceptCrawlerProxyOrderForAdminPayload {
+    /** 주문 확인할 결제정보 ID */
+    pInfoId: string;
+}

package/order-server/dto/purchased-info.modules/purchased-info-admin/command/accept-crawler-proxy-order-for-admin.dto.js

@@ -0,0 +1,24 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcceptCrawlerProxyOrderForAdminPayload = void 0;
+const class_validator_1 = require("class-validator");
+/**
+ * @author jun
+ * @description 관리자용 크롤러 사입 주문 확인 Payload
+ */
+class AcceptCrawlerProxyOrderForAdminPayload {
+}
+exports.AcceptCrawlerProxyOrderForAdminPayload = AcceptCrawlerProxyOrderForAdminPayload;
+__decorate([
+    (0, class_validator_1.IsMongoId)(),
+    __metadata("design:type", String)
+], AcceptCrawlerProxyOrderForAdminPayload.prototype, "pInfoId", void 0);

package/order-server/dto/purchased-info.modules/purchased-info-admin/command/index.d.ts

@@ -13,5 +13,6 @@ export * from './upsert-split-invoice-for-admin.dto';
 export * from './delete-split-invoice-for-admin.dto';
 export * from './transfer-p-info-seller.dto';
 export * from './update-crawler-proxy-order-info-for-admin.dto';
+export * from './accept-crawler-proxy-order-for-admin.dto';
 export * from './update-price-compare-affiliate-settle-status.dto';
 export * from './manage-crawler-forwarding-agent.dto';

package/order-server/dto/purchased-info.modules/purchased-info-admin/command/index.js

@@ -29,5 +29,6 @@ __exportStar(require("./upsert-split-invoice-for-admin.dto"), exports);
 __exportStar(require("./delete-split-invoice-for-admin.dto"), exports);
 __exportStar(require("./transfer-p-info-seller.dto"), exports);
 __exportStar(require("./update-crawler-proxy-order-info-for-admin.dto"), exports);
+__exportStar(require("./accept-crawler-proxy-order-for-admin.dto"), exports);
 __exportStar(require("./update-price-compare-affiliate-settle-status.dto"), exports);
 __exportStar(require("./manage-crawler-forwarding-agent.dto"), exports);

package/order-server/dto/purchased-info.modules/purchased-info-admin/command/update-crawler-proxy-order-info-for-admin.dto.d.ts

@@ -1,22 +1,22 @@
-import { CrawlerProxyOrderStatusEnum } from '@yolo-croket-dev/entity-v2/purchased-info/purchased-info.entity';
+import { CrawlerProxyForwardingStatusEnum, CrawlerProxyPurchaseStatusEnum } from '@yolo-croket-dev/entity-v2/purchased-info/purchased-info.entity';
 export declare class UpdateCrawlerProxyOrderInfoForAdminPayload {
     /** 결제정보 ID */
     pInfoId: string;
-    /** 대신 주문 상태 */
-    status?: CrawlerProxyOrderStatusEnum;
+    /** 사입 상태 */
+    purchaseStatus?: CrawlerProxyPurchaseStatusEnum;
+    /** 배대지 상태 */
+    forwardingStatus?: CrawlerProxyForwardingStatusEnum;
     forwardingAgentId?: string;
-    /** 배대지 이름 */
-    forwardingAgentName?: string;
-    /** 사용할 배대지 주소 */
-    forwardingAddress?: string;
+    /** 판매처 사입 주문번호 */
+    purchaseOrderNumber?: string;
+    /** 판매처에서 배대지까지의 사입 택배사 */
+    purchaseCarrier?: string;
+    /** 판매처에서 배대지까지의 사입 송장번호 */
+    purchaseInvoice?: string;
     /** 배대지 금액 */
     forwardingFee?: number;
     /** 실제 사입금(원화). null이면 기존 값을 초기화한다. */
     actualPurchaseAmount?: number | null;
-    /** 배대지 메모 */
-    forwardingMemo?: string;
-    proxyReceiverName?: string;
-    proxyReceiverAddress?: string;
-    proxyReceiverPhoneNumber?: string;
-    forwardingInvoice?: string;
+    /** 실제 사입 결제가(달러) */
+    purchasePaidAmountUsd?: number;
 }

package/order-server/dto/purchased-info.modules/purchased-info-admin/command/update-crawler-proxy-order-info-for-admin.dto.js

@@ -20,10 +20,15 @@ __decorate([
     __metadata("design:type", String)
 ], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "pInfoId", void 0);
 __decorate([
-    (0, class_validator_1.IsEnum)(purchased_info_entity_1.CrawlerProxyOrderStatusEnum),
+    (0, class_validator_1.IsEnum)(purchased_info_entity_1.CrawlerProxyPurchaseStatusEnum),
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "status", void 0);
+], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "purchaseStatus", void 0);
+__decorate([
+    (0, class_validator_1.IsEnum)(purchased_info_entity_1.CrawlerProxyForwardingStatusEnum),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingStatus", void 0);
 __decorate([
     (0, class_validator_1.IsMongoId)(),
     (0, class_validator_1.IsOptional)(),
@@ -31,16 +36,25 @@ __decorate([
 ], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingAgentId", void 0);
 __decorate([
     (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MaxLength)(100),
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingAgentName", void 0);
+], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "purchaseOrderNumber", void 0);
 __decorate([
     (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MaxLength)(100),
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingAddress", void 0);
+], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "purchaseCarrier", void 0);
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MaxLength)(100),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", String)
+], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "purchaseInvoice", void 0);
 __decorate([
     (0, class_validator_1.IsNumber)(),
+    (0, class_validator_1.Min)(0),
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", Number)
 ], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingFee", void 0);
@@ -51,31 +65,8 @@ __decorate([
     __metadata("design:type", Object)
 ], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "actualPurchaseAmount", void 0);
 __decorate([
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.IsOptional)(),
-    __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingMemo", void 0);
-__decorate([
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.MaxLength)(100),
-    (0, class_validator_1.IsOptional)(),
-    __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "proxyReceiverName", void 0);
-__decorate([
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.MaxLength)(500),
-    (0, class_validator_1.IsOptional)(),
-    __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "proxyReceiverAddress", void 0);
-__decorate([
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.MaxLength)(50),
-    (0, class_validator_1.IsOptional)(),
-    __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "proxyReceiverPhoneNumber", void 0);
-__decorate([
-    (0, class_validator_1.IsString)(),
-    (0, class_validator_1.MaxLength)(100),
+    (0, class_validator_1.IsNumber)({ maxDecimalPlaces: 2 }),
+    (0, class_validator_1.Min)(0),
     (0, class_validator_1.IsOptional)(),
-    __metadata("design:type", String)
-], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "forwardingInvoice", void 0);
+    __metadata("design:type", Number)
+], UpdateCrawlerProxyOrderInfoForAdminPayload.prototype, "purchasePaidAmountUsd", void 0);

package/order-server/dto/purchased-info.modules/purchased-info-admin/query/get-crawler-proxy-order-list-for-admin.dto.d.ts

@@ -1,4 +1,4 @@
-import { CrawlerProxyOrderInfo, CrawlerProxyOrderStatusEnum, CrawlerPurchaseInfo, DeliveryData, PInfoBuyerInfo, PInfoPCCCInfo, PInfoPOptionInfo, PurchasedInfoOption, PurchasedProcessEnum, PurchasedProcessV2Enum, SplitDeliveryData } from '@yolo-croket-dev/entity-v2/purchased-info/purchased-info.entity';
+import { CrawlerProxyOrderInfo, CrawlerProxyPurchaseStatusEnum, CrawlerPurchaseInfo, DeliveryData, PInfoBuyerInfo, PInfoPCCCInfo, PInfoPOptionInfo, PurchasedInfoOption, PurchasedProcessEnum, PurchasedProcessV2Enum, SplitDeliveryData } from '@yolo-croket-dev/entity-v2/purchased-info/purchased-info.entity';
 export declare enum GetCrawlerProxyOrderListForAdminSortTypeEnum {
     '최근 결제일순' = "\uCD5C\uADFC \uACB0\uC81C\uC77C\uC21C",
     '오래된 결제일순' = "\uC624\uB798\uB41C \uACB0\uC81C\uC77C\uC21C"
@@ -8,8 +8,8 @@ export declare class GetCrawlerProxyOrderListForAdminPayload {
     paymentStartDate?: string | Date;
     /** 결제일 종료일 */
     paymentEndDate?: string | Date;
-    /** 대신 주문 상태 */
-    status?: CrawlerProxyOrderStatusEnum;
+    /** 사입 상태 */
+    purchaseStatus?: CrawlerProxyPurchaseStatusEnum;
     /** 결제 아이디 */
     pInfoId?: string;
     /** 주문번호 */

package/order-server/dto/purchased-info.modules/purchased-info-admin/query/get-crawler-proxy-order-list-for-admin.dto.js

@@ -31,10 +31,10 @@ __decorate([
     __metadata("design:type", Object)
 ], GetCrawlerProxyOrderListForAdminPayload.prototype, "paymentEndDate", void 0);
 __decorate([
-    (0, class_validator_1.IsEnum)(purchased_info_entity_1.CrawlerProxyOrderStatusEnum),
+    (0, class_validator_1.IsEnum)(purchased_info_entity_1.CrawlerProxyPurchaseStatusEnum),
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", String)
-], GetCrawlerProxyOrderListForAdminPayload.prototype, "status", void 0);
+], GetCrawlerProxyOrderListForAdminPayload.prototype, "purchaseStatus", void 0);
 __decorate([
     (0, class_validator_1.IsMongoId)(),
     (0, class_validator_1.IsOptional)(),

package/order-server/services/purchased-info.modules/amqp.purchased-info-admin.service.d.ts

@@ -1,6 +1,6 @@
 import { ClientProxy } from '@nestjs/microservices';
 import { AbstractParam } from '@yolo-croket-dev/core';
-import { GetPurchasedInfosForAdminPayload, GetPurchasedInfosForAdminResult, GetPurchasedInfoDetailForAdminEditPayload, GetPurchasedInfoDetailForAdminEditResult, EditPInfoEtcDataPayload, EditPInfoMemoPayload, EditPInfoPricePayload, EditPInfoProcessPayload, EditPInfoReceiverInfoPayload, EditPInfoWaitingReceiveInfoPayload, EditPInfoUsedCouponInfoPayload, DeletePInfoUsedCouponInfoPayload, GetPurchasedInfoLogsForCouponInfoPayload, GetPurchasedInfoLogsForCouponInfoResult, UpdateProcessFinishedToCancelledPayload, GetDeliveryListForAdminPayload, GetDeliveryListForAdminResult, UpsertInvoiceForAdminPayload, DeleteInvoiceForAdminPayload, UpsertSplitInvoiceForAdminPayload, DeleteSplitInvoiceForAdminPayload, TransferPInfoSellerPayload, GetPInfosByYgTypePayload, GetPInfosByYgTypeResult, GetCrawlerProxyOrderListForAdminPayload, GetCrawlerProxyOrderListForAdminResult, UpdateCrawlerProxyOrderInfoForAdminPayload, GetPriceCompareAffiliatePInfosForAdminPayload, GetPriceCompareAffiliatePInfosForAdminResult, GetPriceCompareAffiliatePInfosForAdminExcelResult, GetPriceCompareAffiliateSettleDoneRefundedPInfosForAdminPayload, GetPriceCompareAffiliateSettleDoneRefundedPInfosForAdminExcelResult, UpdatePriceCompareAffiliateSettleStatusPayload, GetCrawlerForwardingAgentsForAdminPayload, GetCrawlerForwardingAgentsForAdminResult, CreateCrawlerForwardingAgentForAdminPayload, UpdateCrawlerForwardingAgentForAdminPayload, UpdateCrawlerForwardingAgentActiveForAdminPayload } from '../../dto/purchased-info.modules/purchased-info-admin';
+import { GetPurchasedInfosForAdminPayload, GetPurchasedInfosForAdminResult, GetPurchasedInfoDetailForAdminEditPayload, GetPurchasedInfoDetailForAdminEditResult, EditPInfoEtcDataPayload, EditPInfoMemoPayload, EditPInfoPricePayload, EditPInfoProcessPayload, EditPInfoReceiverInfoPayload, EditPInfoWaitingReceiveInfoPayload, EditPInfoUsedCouponInfoPayload, DeletePInfoUsedCouponInfoPayload, GetPurchasedInfoLogsForCouponInfoPayload, GetPurchasedInfoLogsForCouponInfoResult, UpdateProcessFinishedToCancelledPayload, GetDeliveryListForAdminPayload, GetDeliveryListForAdminResult, UpsertInvoiceForAdminPayload, DeleteInvoiceForAdminPayload, UpsertSplitInvoiceForAdminPayload, DeleteSplitInvoiceForAdminPayload, TransferPInfoSellerPayload, GetPInfosByYgTypePayload, GetPInfosByYgTypeResult, GetCrawlerProxyOrderListForAdminPayload, GetCrawlerProxyOrderListForAdminResult, UpdateCrawlerProxyOrderInfoForAdminPayload, AcceptCrawlerProxyOrderForAdminPayload, GetPriceCompareAffiliatePInfosForAdminPayload, GetPriceCompareAffiliatePInfosForAdminResult, GetPriceCompareAffiliatePInfosForAdminExcelResult, GetPriceCompareAffiliateSettleDoneRefundedPInfosForAdminPayload, GetPriceCompareAffiliateSettleDoneRefundedPInfosForAdminExcelResult, UpdatePriceCompareAffiliateSettleStatusPayload, GetCrawlerForwardingAgentsForAdminPayload, GetCrawlerForwardingAgentsForAdminResult, CreateCrawlerForwardingAgentForAdminPayload, UpdateCrawlerForwardingAgentForAdminPayload, UpdateCrawlerForwardingAgentActiveForAdminPayload } from '../../dto/purchased-info.modules/purchased-info-admin';
 export declare class AmqpPurchasedInfoAdminService {
     private readonly client;
     private readonly amqpManager;
@@ -26,6 +26,7 @@ export declare class AmqpPurchasedInfoAdminService {
     getPInfosByYgType(payload: GetPInfosByYgTypePayload, param: AbstractParam): Promise<GetPInfosByYgTypeResult>;
     getCrawlerProxyOrderListForAdmin(payload: GetCrawlerProxyOrderListForAdminPayload, param: AbstractParam): Promise<GetCrawlerProxyOrderListForAdminResult>;
     updateCrawlerProxyOrderInfoForAdmin(payload: UpdateCrawlerProxyOrderInfoForAdminPayload, param: AbstractParam): Promise<void>;
+    acceptCrawlerProxyOrderForAdmin(payload: AcceptCrawlerProxyOrderForAdminPayload, param: AbstractParam): Promise<void>;
     getPriceCompareAffiliatePInfosForAdmin(payload: GetPriceCompareAffiliatePInfosForAdminPayload, param: AbstractParam): Promise<GetPriceCompareAffiliatePInfosForAdminResult>;
     getPriceCompareAffiliatePInfosForAdminExcel(payload: GetPriceCompareAffiliatePInfosForAdminPayload, param: AbstractParam): Promise<GetPriceCompareAffiliatePInfosForAdminExcelResult>;
     getPriceCompareAffiliateSettleDoneRefundedPInfosForAdminExcel(payload: GetPriceCompareAffiliateSettleDoneRefundedPInfosForAdminPayload, param: AbstractParam): Promise<GetPriceCompareAffiliateSettleDoneRefundedPInfosForAdminExcelResult>;

package/order-server/services/purchased-info.modules/amqp.purchased-info-admin.service.js

@@ -85,6 +85,9 @@ let AmqpPurchasedInfoAdminService = class AmqpPurchasedInfoAdminService {
     async updateCrawlerProxyOrderInfoForAdmin(payload, param) {
         return this.amqpManager.call('관리자용 크롤러 대신 주문 정보 수정', 'purchased-info-admin.update.crawler-proxy-order-info', payload, param, { isErrorThrowing: true });
     }
+    async acceptCrawlerProxyOrderForAdmin(payload, param) {
+        return this.amqpManager.call('관리자용 크롤러 사입 주문 확인', 'purchased-info-admin.accept.crawler-proxy-order', payload, param, { isErrorThrowing: true });
+    }
     async getPriceCompareAffiliatePInfosForAdmin(payload, param) {
         return this.amqpManager.call('가격비교 제휴 유입 결제건 관리자 조회', 'purchased-info.get.price-compare-affiliate-p-infos-for-admin', payload, param, { isErrorThrowing: true });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/amqp-access",
-  "version": "0.7.187",
+  "version": "0.7.189",
   "main": "index.js",
   "author": "Yolo Co., Ltd.",
   "description": "크로켓 amqp-access npm",
@@ -22,7 +22,7 @@
     "@yolo-croket-dev/domain": "0.2.38",
     "@yolo-croket-dev/dto-v2": "^0.2.15",
     "@yolo-croket-dev/entity": "0.2.90",
-    "@yolo-croket-dev/entity-v2": "0.2.173",
+    "@yolo-croket-dev/entity-v2": "0.2.174",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
     "dotenv": "^16.3.1"