geek-custom-api-core 0.0.71 → 0.0.73

package/.history/package_20260512141355.json

@@ -0,0 +1,103 @@
+{
+    "name": "geek-custom-api-core",
+    "version": "0.0.72",
+    "description": "",
+    "author": "",
+    "license": "UNLICENSED",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "engines": {
+        "node": ">=22.0.0"
+    },
+    "scripts": {
+        "build": "nest build",
+        "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+        "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
+        "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+        "start": "nest start",
+        "yalc": "npm run build && yalc publish"
+    },
+    "dependencies": {
+        "@aws-sdk/client-s3": "^3.400.0",
+        "@aws-sdk/client-secrets-manager": "^3.939.0",
+        "@nestjs/axios": "^3.0.2",
+        "@nestjs/common": "^10.3.9",
+        "@nestjs/config": "^3.2.2",
+        "@nestjs/core": "^10.3.9",
+        "@nestjs/event-emitter": "^2.1.1",
+        "@nestjs/jwt": "^10.1.0",
+        "@nestjs/mapped-types": "^2.0.2",
+        "@nestjs/passport": "^10.0.0",
+        "@nestjs/platform-express": "^10.3.9",
+        "@nestjs/schedule": "^6.1.1",
+        "@nestjs/swagger": "^7.4.2",
+        "@nestjs/typeorm": "^10.0.0",
+        "axios": "^1.4.0",
+        "bcrypt": "^5.1.0",
+        "class-transformer": "^0.5.1",
+        "class-validator": "^0.14.0",
+        "date-fns": "^2.30.0",
+        "dayjs": "^1.11.10",
+        "fast-xml-parser": "^4.3.6",
+        "ioredis": "^5.4.1",
+        "moment": "^2.29.4",
+        "moment-timezone": "^0.5.46",
+        "multer-s3": "^3.0.1",
+        "mysql2": "^3.6.0",
+        "passport-jwt": "^4.0.1",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "^7.8.1",
+        "typeorm": "^0.3.17",
+        "uuid": "^9.0.1",
+        "xlsx": "^0.18.5"
+    },
+    "devDependencies": {
+        "@nestjs/cli": "^10.0.0",
+        "@nestjs/schematics": "^9.0.0",
+        "@nestjs/testing": "^10.4.22",
+        "@types/bcrypt": "^5.0.0",
+        "@types/express": "^4.17.13",
+        "@types/jest": "^29.5.0",
+        "@types/multer": "^2.0.0",
+        "@types/node": "^22.0.0",
+        "@types/passport-jwt": "^3.0.9",
+        "@types/supertest": "^2.0.12",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
+        "@typescript-eslint/parser": "^7.18.0",
+        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.0.0",
+        "jest": "^29.7.0",
+        "prettier": "^3.2.5",
+        "source-map-support": "^0.5.21",
+        "supertest": "^7.1.3",
+        "ts-jest": "^29.1.2",
+        "ts-loader": "^9.5.1",
+        "ts-node": "^10.9.2",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.3.3",
+        "webpack": "^5.90.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-node-externals": "^3.0.0"
+    },
+    "jest": {
+        "moduleFileExtensions": [
+            "js",
+            "json",
+            "ts"
+        ],
+        "rootDir": "src",
+        "testRegex": ".*\\.spec\\.ts$",
+        "transform": {
+            "^.+\\.(t|j)s$": "ts-jest"
+        },
+        "moduleNameMapper": {
+            "^src/(.*)$": "<rootDir>/$1"
+        },
+        "collectCoverageFrom": [
+            "**/*.(t|j)s"
+        ],
+        "coverageDirectory": "../coverage",
+        "testEnvironment": "node"
+    }
+}

package/.history/package_20260512160303.json

@@ -0,0 +1,103 @@
+{
+    "name": "geek-custom-api-core",
+    "version": "0.0.73",
+    "description": "",
+    "author": "",
+    "license": "UNLICENSED",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "engines": {
+        "node": ">=22.0.0"
+    },
+    "scripts": {
+        "build": "nest build",
+        "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+        "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
+        "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+        "start": "nest start",
+        "yalc": "npm run build && yalc publish"
+    },
+    "dependencies": {
+        "@aws-sdk/client-s3": "^3.400.0",
+        "@aws-sdk/client-secrets-manager": "^3.939.0",
+        "@nestjs/axios": "^3.0.2",
+        "@nestjs/common": "^10.3.9",
+        "@nestjs/config": "^3.2.2",
+        "@nestjs/core": "^10.3.9",
+        "@nestjs/event-emitter": "^2.1.1",
+        "@nestjs/jwt": "^10.1.0",
+        "@nestjs/mapped-types": "^2.0.2",
+        "@nestjs/passport": "^10.0.0",
+        "@nestjs/platform-express": "^10.3.9",
+        "@nestjs/schedule": "^6.1.1",
+        "@nestjs/swagger": "^7.4.2",
+        "@nestjs/typeorm": "^10.0.0",
+        "axios": "^1.4.0",
+        "bcrypt": "^5.1.0",
+        "class-transformer": "^0.5.1",
+        "class-validator": "^0.14.0",
+        "date-fns": "^2.30.0",
+        "dayjs": "^1.11.10",
+        "fast-xml-parser": "^4.3.6",
+        "ioredis": "^5.4.1",
+        "moment": "^2.29.4",
+        "moment-timezone": "^0.5.46",
+        "multer-s3": "^3.0.1",
+        "mysql2": "^3.6.0",
+        "passport-jwt": "^4.0.1",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "^7.8.1",
+        "typeorm": "^0.3.17",
+        "uuid": "^9.0.1",
+        "xlsx": "^0.18.5"
+    },
+    "devDependencies": {
+        "@nestjs/cli": "^10.0.0",
+        "@nestjs/schematics": "^9.0.0",
+        "@nestjs/testing": "^10.4.22",
+        "@types/bcrypt": "^5.0.0",
+        "@types/express": "^4.17.13",
+        "@types/jest": "^29.5.0",
+        "@types/multer": "^2.0.0",
+        "@types/node": "^22.0.0",
+        "@types/passport-jwt": "^3.0.9",
+        "@types/supertest": "^2.0.12",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
+        "@typescript-eslint/parser": "^7.18.0",
+        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.0.0",
+        "jest": "^29.7.0",
+        "prettier": "^3.2.5",
+        "source-map-support": "^0.5.21",
+        "supertest": "^7.1.3",
+        "ts-jest": "^29.1.2",
+        "ts-loader": "^9.5.1",
+        "ts-node": "^10.9.2",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.3.3",
+        "webpack": "^5.90.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-node-externals": "^3.0.0"
+    },
+    "jest": {
+        "moduleFileExtensions": [
+            "js",
+            "json",
+            "ts"
+        ],
+        "rootDir": "src",
+        "testRegex": ".*\\.spec\\.ts$",
+        "transform": {
+            "^.+\\.(t|j)s$": "ts-jest"
+        },
+        "moduleNameMapper": {
+            "^src/(.*)$": "<rootDir>/$1"
+        },
+        "collectCoverageFrom": [
+            "**/*.(t|j)s"
+        ],
+        "coverageDirectory": "../coverage",
+        "testEnvironment": "node"
+    }
+}

package/dist/api/app/deposit/deposit.service.d.ts

@@ -25,6 +25,7 @@ export declare class DepositService extends DefaultService {
     private resolveOrderNo;
     private resolveMemberId;
     private resolveMemberName;
+    private getClaimRefundInfo;
     private getNextCashReceiptIssueStatus;
     private updateDepositOrderPaymentState;
     private buildCashReceiptSummary;

package/dist/api/app/deposit/deposit.service.js

@@ -59,7 +59,9 @@ const typeorm_1 = require("typeorm");
 const depositOrderDetail_entity_1 = require("./entity/depositOrderDetail.entity");
 const partner_service_1 = require("../../admin/partner/partner.service");
 const core_1 = require("@nestjs/core");
+const date_fns_1 = require("date-fns");
 const depositOrder_entity_1 = require("./entity/depositOrder.entity");
+const depositOrderClaimRefund_entity_1 = require("./entity/depositOrderClaimRefund.entity");
 let DepositService = DepositService_1 = class DepositService extends default_service_1.DefaultService {
     constructor(partnerService, moduleRef) {
         super(moduleRef);
@@ -98,6 +100,38 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
         var _a;
         return ((_a = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.order) === null || _a === void 0 ? void 0 : _a.ordererName) || fallback;
     }
+    async getClaimRefundInfo(partnerSno, claimNo) {
+        var _a, _b, _c;
+        const partner = await this.partnerService.findOne(partnerSno);
+        if (!partner) {
+            throw new common_1.HttpException('유효하지 않은 파트너 정보입니다.', common_1.HttpStatus.BAD_REQUEST);
+        }
+        const today = new Date();
+        const startYmd = (0, date_fns_1.format)((0, date_fns_1.subDays)(today, 3), 'yyyy-MM-dd');
+        const endYmd = (0, date_fns_1.format)(today, 'yyyy-MM-dd');
+        const claimResult = await (0, gsUtil_1.shopByServerApi)(`/claims`, enum_1.HTTP_METHOD.GET, partner.systemKey, partner.longLivedToken, {
+            searchType: 'CLAIM_NO',
+            searchValues: String(claimNo),
+            endYmd,
+            page: 1,
+            searchDateType: 'COMPLETE_YMDT',
+            size: 10,
+            startYmd,
+        });
+        const claimContent = Array.isArray(claimResult === null || claimResult === void 0 ? void 0 : claimResult.contents)
+            ? claimResult.contents[0]
+            : null;
+        this.logger.log(`[getClaimExternalPayRefundAmount] claimNo=${claimNo} claimResult=${JSON.stringify(claimResult)}`);
+        const externalPayAmt = Number(((_c = (_b = (_a = claimContent === null || claimContent === void 0 ? void 0 : claimContent.claimData) === null || _a === void 0 ? void 0 : _a.amounts) === null || _b === void 0 ? void 0 : _b.adjustedAmounts) === null || _c === void 0 ? void 0 : _c.externalPayAmt) || 0);
+        const orderOptionNos = Array.isArray(claimContent === null || claimContent === void 0 ? void 0 : claimContent.orderOptionNos)
+            ? claimContent.orderOptionNos.map((optionNo) => String(optionNo))
+            : [];
+        this.logger.log(`[getClaimExternalPayRefundAmount] claimNo=${claimNo} externalPayAmt=${externalPayAmt}`);
+        return {
+            externalPayAmt,
+            orderOptionNos,
+        };
+    }
     getNextCashReceiptIssueStatus(depositOrder, orderInfo) {
         return depositOrder.usedAmount > 0 &&
             this.isPaymentDone(orderInfo) &&
@@ -175,7 +209,9 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
             })),
         ].sort((a, b) => {
             const left = (a === null || a === void 0 ? void 0 : a.requestedAt) ? new Date(a.requestedAt).getTime() : 0;
-            const right = (b === null || b === void 0 ? void 0 : b.requestedAt) ? new Date(b.requestedAt).getTime() : 0;
+            const right = (b === null || b === void 0 ? void 0 : b.requestedAt)
+                ? new Date(b.requestedAt).getTime()
+                : 0;
             return right - left;
         });
         return {
@@ -238,7 +274,9 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
         const receiptIds = Array.from(new Set(Array.from(receiptByOrderNo.values()).map((receipt) => Number(receipt.sno))));
         const cancellationsByReceiptId = new Map();
         if (receiptIds.length) {
-            const cancellationPlaceholders = receiptIds.map(() => '?').join(', ');
+            const cancellationPlaceholders = receiptIds
+                .map(() => '?')
+                .join(', ');
             const cancellations = await entityManager.query(`
                 SELECT *
                 FROM gs_cash_receipt_cancellations
@@ -1185,8 +1223,7 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
                     });
                 });
             });
-            const totalBaseAmount = orderInfo.order.lastStandardAmt ||
-                flattenedOptions.reduce((sum, opt) => sum + opt.price, 0);
+            const totalBaseAmount = flattenedOptions.reduce((sum, opt) => sum + Number(opt.price || 0), 0);
             let remainToDeductMaster = depositOrder.usedAmount;
             let issueIndex = 0;
             const orderDetails = [];
@@ -1260,40 +1297,66 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
     async refundDepositOrder(targetItems) {
         const entityManager = await this.getEntityManager();
         return await entityManager.transaction(async (manager) => {
+            var _a;
+            const groupedClaims = new Map();
             for (const item of targetItems) {
+                const claimKey = String(item.claimNo || `${item.orderNo}-no-claim`);
+                const group = (_a = groupedClaims.get(claimKey)) !== null && _a !== void 0 ? _a : [];
+                group.push(item);
+                groupedClaims.set(claimKey, group);
+            }
+            for (const groupedItems of groupedClaims.values()) {
+                const item = groupedItems[0];
                 const orderNo = item.orderNo;
-                const productNo = String(item.mallProductNo);
-                const optionNo = String(item.mallOptionNo);
-                const cancelQty = Number(item.orderCnt || 0);
+                const claimNo = Number(item.claimNo || 0);
                 const depositOrder = await manager.findOne(depositOrder_entity_1.DepositOrder, {
                     where: { orderNo },
                 });
                 if (!depositOrder)
                     continue;
-                const usedDetails = await manager.find(depositOrderDetail_entity_1.DepositOrderDetail, {
+                if (Number(depositOrder.usedAmount || 0) <= 0)
+                    continue;
+                if (!claimNo)
+                    continue;
+                const alreadyRefundedByClaim = await manager.findOne(depositOrderClaimRefund_entity_1.DepositOrderClaimRefund, {
+                    where: {
+                        orderSno: depositOrder.sno,
+                        claimNo,
+                    },
+                });
+                if (alreadyRefundedByClaim)
+                    continue;
+                const claimRefundInfo = await this.getClaimRefundInfo(depositOrder.partnerSno, claimNo);
+                const requestedRefundAmt = claimRefundInfo.externalPayAmt;
+                const orderDetails = await manager.find(depositOrderDetail_entity_1.DepositOrderDetail, {
                     where: {
                         orderSno: depositOrder.sno,
-                        mallProductNo: productNo,
-                        mallOptionNo: Number(optionNo),
                     },
                     order: { sno: 'ASC' },
                 });
+                const targetOptionNos = new Set(claimRefundInfo.orderOptionNos);
+                const usedDetails = targetOptionNos.size
+                    ? orderDetails.filter((detail) => targetOptionNos.has(String(detail.orderProductOptionNo)))
+                    : orderDetails;
                 if (!usedDetails.length)
                     continue;
-                const totalRemainQty = Number(usedDetails[0].orderCnt) -
-                    Number(usedDetails[0].refundCnt);
+                if (requestedRefundAmt <= 0) {
+                    await manager.save(depositOrderClaimRefund_entity_1.DepositOrderClaimRefund, {
+                        orderSno: depositOrder.sno,
+                        partnerSno: depositOrder.partnerSno,
+                        memberNo: depositOrder.memberNo,
+                        claimNo,
+                        orderProductOptionNos: claimRefundInfo.orderOptionNos.join(','),
+                        refundAmount: 0,
+                        refundDt: new Date(),
+                    });
+                    continue;
+                }
                 const totalRemainAmt = usedDetails.reduce((sum, d) => sum +
                     (Number(d.usedDepositAmount) - Number(d.refundAmount)), 0);
-                if (totalRemainAmt <= 0 || totalRemainQty <= 0)
+                if (totalRemainAmt <= 0)
                     continue;
-                const isFullCancel = Number(item.orderCnt) === Number(item.originalOrderCnt);
-                const unitPrice = totalRemainAmt / totalRemainQty;
-                const actualTakeQty = Math.min(cancelQty, totalRemainQty);
-                let totalRefundAmt = isFullCancel
-                    ? totalRemainAmt
-                    : Math.round(unitPrice * actualTakeQty);
-                if (totalRefundAmt > totalRemainAmt)
-                    totalRefundAmt = totalRemainAmt;
+                const totalRefundAmt = Math.min(requestedRefundAmt, totalRemainAmt);
                 let remainRefundAmt = totalRefundAmt;
                 for (const detail of usedDetails) {
                     if (remainRefundAmt <= 0)
@@ -1310,6 +1373,9 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
                     await manager.update(depositOrderDetail_entity_1.DepositOrderDetail, detail.sno, {
                         refundAmount: newRefundAmount,
                         refundYn: isRecordDone ? enum_1.YN.Y : enum_1.YN.N,
+                        refundCnt: isRecordDone
+                            ? Number(detail.orderCnt || 0)
+                            : Number(detail.refundCnt || 0),
                         refundDt: new Date(),
                         cashReceiptCancelStatus: newRefundAmount > 0 &&
                             shouldRequestCashReceiptCancel
@@ -1318,17 +1384,6 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
                     });
                     remainRefundAmt -= takeAmt;
                 }
-                const updatedRefundCnt = Math.min(Number(usedDetails[0].refundCnt) + actualTakeQty, Number(usedDetails[0].orderCnt));
-                const firstDetailRefundGain = Math.min(Number(usedDetails[0].usedDepositAmount) -
-                    Number(usedDetails[0].refundAmount), totalRefundAmt);
-                const updatedFirstDetailRefundAmount = Number(usedDetails[0].refundAmount) + firstDetailRefundGain;
-                const isFullyRefunded = updatedRefundCnt >= Number(usedDetails[0].orderCnt) &&
-                    updatedFirstDetailRefundAmount >=
-                        Number(usedDetails[0].usedDepositAmount);
-                await manager.update(depositOrderDetail_entity_1.DepositOrderDetail, usedDetails[0].sno, {
-                    refundCnt: updatedRefundCnt,
-                    refundYn: isFullyRefunded ? enum_1.YN.Y : usedDetails[0].refundYn,
-                });
                 if (totalRefundAmt > 0) {
                     const [lastLedger] = await manager.query(`SELECT balanceAfter FROM gs_depositManager WHERE partnerSno = ? AND memberNo = ? ORDER BY sno DESC LIMIT 1 FOR UPDATE`, [depositOrder.partnerSno, depositOrder.memberNo]);
                     const prevBalance = Number((lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) || 0);
@@ -1343,9 +1398,18 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
                         refSno: depositOrder.sno,
                         depositAmount: totalRefundAmt,
                         balanceAfter: prevBalance + totalRefundAmt,
-                        reason: `주문 환불 (상품:${(item.productName || productNo).substring(0, 15)}, 수량:${actualTakeQty})`,
+                        reason: `주문 환불 (claimNo:${claimNo})`,
                     });
                 }
+                await manager.save(depositOrderClaimRefund_entity_1.DepositOrderClaimRefund, {
+                    orderSno: depositOrder.sno,
+                    partnerSno: depositOrder.partnerSno,
+                    memberNo: depositOrder.memberNo,
+                    claimNo,
+                    orderProductOptionNos: claimRefundInfo.orderOptionNos.join(','),
+                    refundAmount: totalRefundAmt,
+                    refundDt: new Date(),
+                });
             }
             return { rescode: '0000', message: 'SUCCESS' };
         });