geek-custom-api-core 0.0.47 → 0.0.49

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

@@ -41,6 +41,7 @@ var __importStar = (this && this.__importStar) || (function () {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var DepositService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DepositService = void 0;
 const common_1 = require("@nestjs/common");
@@ -48,6 +49,7 @@ const default_service_1 = require("../../../common/service/default.service");
 const depositJob_entity_1 = require("./entity/depositJob.entity");
 const enum_1 = require("../../../common/enum/enum");
 const depositJobDetail_entity_1 = require("./entity/depositJobDetail.entity");
+const depositJobResult_entity_1 = require("./entity/depositJobResult.entity");
 const XLSX = __importStar(require("xlsx"));
 const depositManager_entity_1 = require("./entity/depositManager.entity");
 const gsUtil_1 = require("../../../common/util/gsUtil");
@@ -59,70 +61,136 @@ 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");
-let DepositService = class DepositService extends default_service_1.DefaultService {
+let DepositService = DepositService_1 = class DepositService extends default_service_1.DefaultService {
     constructor(partnerService, moduleRef) {
         super(moduleRef);
         this.partnerService = partnerService;
         this.moduleRef = moduleRef;
+        this.logger = new common_1.Logger(DepositService_1.name);
     }
     async issueSingle(dto) {
-        if (dto.amount <= 0) {
-            throw new common_1.HttpException('예치금 금액은 0보다 큰 값이어야 합니다.', common_1.HttpStatus.BAD_REQUEST);
-        }
-        if (dto.expiredDt && dto.expiredDt < new Date()) {
-            throw new common_1.HttpException('만료일시는 현재 시간 이후여야 합니다.', common_1.HttpStatus.BAD_REQUEST);
-        }
+        const targetAmount = Number(dto.amount);
         const entityManager = await this.getEntityManager();
-        entityManager.transaction(async (manager) => {
-            var _a;
+        return await entityManager.transaction(async (manager) => {
+            const partner = await this.partnerService.findOne(dto.partnerSno);
+            const member = await (0, gsUtil_1.shopByServerApi)('/profile', enum_1.HTTP_METHOD.GET, partner.systemKey, partner.longLivedToken, { memberNo: dto.memberNo });
+            if (!member) {
+                throw new Error('존재하지 않는 회원');
+            }
+            const memberId = member.memberId;
+            const memberName = member.memberName;
             const job = await manager.save(depositJob_entity_1.DepositJob, {
                 managerSno: dto.managerSno,
                 jobType: enum_1.DEPOSIT_JOB_TYPE.SINGLE,
+                jobName: targetAmount > 0 ? '단건 지급' : '단건 차감',
                 totalCount: 1,
-                successCount: 0,
+                successCount: 1,
                 failCount: 0,
                 status: enum_1.DEPOSIT_STATUS.DONE,
             });
-            const jobDetail = await manager.save(depositJobDetail_entity_1.DepositJobDetail, {
-                jobSno: job.sno,
-                partnerSno: dto.partnerSno,
-                memberNo: dto.memberNo,
-                memberId: dto.memberId,
-                memberName: dto.memberName,
-                depositAmount: dto.amount,
-                reason: dto.reason,
-                expiredDt: dto.expiredDt,
-                depositType: enum_1.DEPOSIT_TYPE.ISSUE,
-                source: enum_1.DEPOSIT_SOURCE.ADMIN,
-            });
-            const [lastLedger] = await manager.query(`
-        SELECT balanceAfter
-        FROM gs_depositManager
-        WHERE partnerSno = ?
-          AND memberNo = ?
-        ORDER BY sno DESC
-        LIMIT 1
-        FOR UPDATE
-        `, [dto.partnerSno, dto.memberNo]);
-            const prevBalance = (_a = lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) !== null && _a !== void 0 ? _a : 0;
-            await manager.query(`
-        INSERT INTO gs_depositManager
-        (partnerSno, memberNo, memberId, memberName, depositType, source, managerSno,
-         refType, refSno, depositAmount, balanceAfter, reason)
-        VALUES (?, ?, ?, ?, 'ISSUE', 'ADMIN', ?, 'JOB_DETAIL', ?, ?, ?, ?)
-        `, [
-                dto.partnerSno,
-                dto.memberNo,
-                dto.memberId,
-                dto.memberName,
-                dto.managerSno,
-                jobDetail.sno,
-                dto.amount,
-                prevBalance + dto.amount,
-                dto.reason,
-            ]);
-            return { success: true };
+            if (targetAmount > 0) {
+                return await this.processIssue(manager, Object.assign(Object.assign({}, dto), { memberId: member.memberId, memberName: member.memberName, jobSno: job.sno, amount: targetAmount }));
+            }
+            else {
+                return await this.executeFifoDeduct(manager, Object.assign(Object.assign({}, dto), { memberId: member.memberId, memberName: member.memberName, amount: Math.abs(targetAmount), orderNo: `DEDUCT_SINGLE_${Date.now()}` }));
+            }
+        });
+    }
+    async executeFifoDeduct(manager, data) {
+        const deductOrder = await manager.save(depositOrder_entity_1.DepositOrder, {
+            partnerSno: data.partnerSno,
+            memberNo: data.memberNo,
+            orderNo: data.orderNo,
+            memberId: data.memberId,
+            memberName: data.memberName,
+            usedAmount: data.amount,
+            orderStatus: 'DONE',
+        });
+        const availableIssues = await manager.query(`
+          SELECT jd.sno AS issueDetailSno, jd.depositAmount, jd.expiredDt,
+                 (jd.depositAmount - IFNULL(usedSub.netUsed, 0)) AS remainAmount
+          FROM gs_depositJobDetail jd
+          LEFT JOIN (
+              SELECT issueDetailSno, SUM(usedDepositAmount - refundAmount) AS netUsed
+              FROM gs_depositOrderDetail GROUP BY issueDetailSno
+          ) usedSub ON jd.sno = usedSub.issueDetailSno
+          WHERE jd.partnerSno = ? AND jd.memberNo = ? AND jd.expireFl = 'N'
+            AND (jd.expiredDt IS NULL OR jd.expiredDt >= NOW())
+          HAVING remainAmount > 0
+          ORDER BY CASE WHEN jd.expiredDt IS NULL THEN 1 ELSE 0 END ASC, jd.expiredDt ASC, jd.sno ASC
+          FOR UPDATE
+      `, [data.partnerSno, data.memberNo]);
+        let remainToDeduct = data.amount;
+        const details = [];
+        for (const issue of availableIssues) {
+            if (remainToDeduct <= 0)
+                break;
+            const take = Math.min(Number(issue.remainAmount), remainToDeduct);
+            details.push(manager.create(depositOrderDetail_entity_1.DepositOrderDetail, {
+                orderSno: deductOrder.sno,
+                partnerSno: data.partnerSno,
+                memberNo: data.memberNo,
+                orderProductOptionNo: 'DEDUCT',
+                mallProductNo: 'DEDUCT',
+                orderProductName: `[관리자차감] ${data.reason}`,
+                usedDepositAmount: take,
+                issueDetailSno: issue.issueDetailSno,
+                refundYn: enum_1.YN.N,
+            }));
+            remainToDeduct -= take;
+        }
+        if (remainToDeduct > 0)
+            throw new Error(`잔액 부족 (부족분: ${remainToDeduct})`);
+        await manager.save(depositOrderDetail_entity_1.DepositOrderDetail, details);
+        const [lastLedger] = await manager.query(`SELECT balanceAfter FROM gs_depositManager WHERE partnerSno = ? AND memberNo = ? ORDER BY sno DESC LIMIT 1 FOR UPDATE`, [data.partnerSno, data.memberNo]);
+        const prevBalance = Number((lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) || 0);
+        await manager.save(depositManager_entity_1.DepositManager, {
+            partnerSno: data.partnerSno,
+            memberNo: data.memberNo,
+            memberId: data.memberId,
+            memberName: data.memberName,
+            depositType: enum_1.DEPOSIT_TYPE.ADJUST,
+            source: enum_1.DEPOSIT_SOURCE.ADMIN,
+            refType: enum_1.DEPOSIT_REF_TYPE.ORDER,
+            refSno: deductOrder.sno,
+            depositAmount: -data.amount,
+            balanceAfter: prevBalance - data.amount,
+            reason: data.reason,
+            managerSno: data.managerSno,
         });
+        return { success: true };
+    }
+    async processIssue(manager, data) {
+        var _a;
+        const jobDetail = await manager.save(depositJobDetail_entity_1.DepositJobDetail, {
+            jobSno: data.jobSno,
+            partnerSno: data.partnerSno,
+            memberNo: data.memberNo,
+            memberId: data.memberId,
+            memberName: data.memberName,
+            depositAmount: data.amount,
+            reason: data.reason,
+            expiredDt: data.expiredDt || null,
+        });
+        const [lastLedger] = await manager.query(`SELECT balanceAfter FROM gs_depositManager 
+           WHERE partnerSno = ? AND memberNo = ? 
+           ORDER BY sno DESC LIMIT 1 FOR UPDATE`, [data.partnerSno, data.memberNo]);
+        const prevBalance = Number((_a = lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) !== null && _a !== void 0 ? _a : 0);
+        await manager.save(depositManager_entity_1.DepositManager, {
+            partnerSno: data.partnerSno,
+            memberNo: data.memberNo,
+            memberId: data.memberId,
+            memberName: data.memberName,
+            depositType: enum_1.DEPOSIT_TYPE.ISSUE,
+            source: enum_1.DEPOSIT_SOURCE.ADMIN,
+            managerSno: data.managerSno,
+            refType: enum_1.DEPOSIT_REF_TYPE.JOB_DETAIL,
+            refSno: jobDetail.sno,
+            depositAmount: data.amount,
+            balanceAfter: prevBalance + data.amount,
+            reason: data.reason,
+        });
+        return { success: true, jobDetailSno: jobDetail.sno };
     }
     async issueByExcel(file, managerSno, partnerSno, jobName) {
         const workbook = XLSX.read(file.buffer, { type: 'buffer' });
@@ -133,146 +201,221 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         }
         const entityManager = await this.getEntityManager();
         const job = await entityManager.save(depositJob_entity_1.DepositJob, {
-            managerSno: managerSno,
+            managerSno,
             jobType: enum_1.DEPOSIT_JOB_TYPE.EXCEL,
-            jobName: jobName,
-            totalCount: rows.length,
+            jobName,
+            totalCount: rows.length - 1,
             successCount: 0,
             failCount: 0,
             status: enum_1.DEPOSIT_STATUS.PROCESSING,
         });
+        this.processExcelJobAsync(rows, job.sno, managerSno, partnerSno).catch((err) => this.logger.error(`Excel job ${job.sno} failed unexpectedly: ${err.message}`, err.stack));
+        return {
+            jobSno: job.sno,
+            totalCount: rows.length - 1,
+            status: enum_1.DEPOSIT_STATUS.PROCESSING,
+        };
+    }
+    async processExcelJobAsync(rows, jobSno, managerSno, partnerSno) {
+        const entityManager = await this.getEntityManager();
+        const partner = await this.partnerService.findOne(partnerSno);
         let successCount = 0;
         let failCount = 0;
-        const results = [];
-        const partner = await this.partnerService.findOne(partnerSno);
         for (const [index, row] of rows.entries()) {
+            if (index === 0)
+                continue;
+            const memberNo = row.memberNo ? Number(row.memberNo) : 0;
+            const amount = Number(row.amount || 0);
+            const member = await (0, gsUtil_1.shopByServerApi)('/profile', enum_1.HTTP_METHOD.GET, partner.systemKey, partner.longLivedToken, { memberNo: memberNo });
+            if (!member) {
+                throw new Error('존재하지 않는 회원');
+            }
+            const memberId = member.memberId;
+            const memberName = member.memberName;
             try {
-                if (index === 0) {
-                    continue;
-                }
                 await this.issueSingleRow({
                     row,
-                    jobSno: job.sno,
+                    jobSno,
                     managerSno,
                     partnerSno,
                     systemKey: partner.systemKey,
                     longLivedToken: partner.longLivedToken,
                 });
                 successCount++;
-                results.push({ row: index + 2, result: 'SUCCESS' });
+                await entityManager.save(depositJobResult_entity_1.DepositJobResult, {
+                    jobSno,
+                    partnerSno,
+                    memberNo,
+                    memberId,
+                    memberName,
+                    depositAmount: amount,
+                    status: enum_1.DEPOSIT_RESULT.SUCCESS,
+                    reason: row.reason || '',
+                });
             }
             catch (e) {
                 failCount++;
-                results.push({
-                    row: index + 2,
-                    result: 'FAIL',
-                    reason: e.message,
+                await entityManager.save(depositJobResult_entity_1.DepositJobResult, {
+                    jobSno,
+                    partnerSno,
+                    memberNo,
+                    memberId,
+                    memberName,
+                    depositAmount: amount,
+                    status: enum_1.DEPOSIT_RESULT.FAIL,
+                    reason: e.message || '알 수 없는 오류',
                 });
             }
         }
-        await entityManager.update(depositJob_entity_1.DepositJob, job.sno, {
+        await entityManager.update(depositJob_entity_1.DepositJob, jobSno, {
             successCount,
             failCount,
             status: enum_1.DEPOSIT_STATUS.DONE,
         });
+    }
+    async getJobList(dto) {
+        const entityManager = await this.getEntityManager();
+        const qb = entityManager.createQueryBuilder(depositJob_entity_1.DepositJob, 'j');
+        qb.andWhere('j.managerSno IN (SELECT sno FROM gs_manager WHERE partnerSno = :partnerSno)', {
+            partnerSno: dto.partnerSno,
+        });
+        if (dto.jobName) {
+            qb.andWhere('j.jobName LIKE :jobName', {
+                jobName: `%${dto.jobName}%`,
+            });
+        }
+        if (dto.jobType) {
+            qb.andWhere('j.jobType = :jobType', { jobType: dto.jobType });
+        }
+        if (dto.status) {
+            qb.andWhere('j.status = :status', { status: dto.status });
+        }
+        qb.select(['j.*']);
+        qb.orderBy('j.regDt', 'DESC');
+        qb.offset(dto.skip);
+        qb.limit(dto.take);
+        const list = await qb.getRawMany();
+        const count = await qb.getCount();
+        return (0, gsUtil_1.paginateResponse)([list, count], dto.page, dto.take);
+    }
+    async getJobResultList(jobSno, dto) {
+        const entityManager = await this.getEntityManager();
+        const qb = entityManager.createQueryBuilder(depositJobResult_entity_1.DepositJobResult, 'jr');
+        qb.andWhere('jr.jobSno = :jobSno', { jobSno });
+        qb.select(['jr.*']);
+        qb.orderBy('jr.sno', 'ASC');
+        qb.offset(dto.skip);
+        qb.limit(dto.take);
+        const list = await qb.getRawMany();
+        const count = await qb.getCount();
+        return (0, gsUtil_1.paginateResponse)([list, count], dto.page, dto.take);
+    }
+    async getJobStatus(jobSno, partnerSno) {
+        const entityManager = await this.getEntityManager();
+        const job = await entityManager.findOne(depositJob_entity_1.DepositJob, {
+            where: { sno: jobSno },
+        });
+        if (!job) {
+            throw new common_1.HttpException('작업을 찾을 수 없습니다.', common_1.HttpStatus.NOT_FOUND);
+        }
         return {
             jobSno: job.sno,
-            totalCount: rows.length - 1,
-            successCount,
-            failCount,
-            results,
+            jobName: job.jobName,
+            totalCount: job.totalCount,
+            successCount: job.successCount,
+            failCount: job.failCount,
+            status: job.status,
         };
     }
+    async getJobResultExcel(jobSno, partnerSno) {
+        const entityManager = await this.getEntityManager();
+        const job = await entityManager.findOne(depositJob_entity_1.DepositJob, {
+            where: { sno: jobSno },
+        });
+        if (!job) {
+            throw new common_1.HttpException('작업을 찾을 수 없습니다.', common_1.HttpStatus.NOT_FOUND);
+        }
+        if (job.status !== enum_1.DEPOSIT_STATUS.DONE) {
+            throw new common_1.HttpException('작업이 아직 진행 중입니다.', common_1.HttpStatus.BAD_REQUEST);
+        }
+        const results = await entityManager.find(depositJobResult_entity_1.DepositJobResult, {
+            where: { jobSno },
+            order: { sno: 'ASC' },
+        });
+        const excelData = results.map((r) => ({
+            회원번호: r.memberNo,
+            회원아이디: r.memberId || '',
+            회원명: r.memberName || '',
+            금액: r.depositAmount,
+            처리결과: r.status === enum_1.DEPOSIT_RESULT.SUCCESS ? '성공' : '실패',
+            실패사유: r.status === enum_1.DEPOSIT_RESULT.FAIL ? r.reason : '',
+        }));
+        const workbook = XLSX.utils.book_new();
+        const sheet = XLSX.utils.json_to_sheet(excelData);
+        XLSX.utils.book_append_sheet(workbook, sheet, '결과');
+        return Buffer.from(XLSX.write(workbook, { type: 'buffer', bookType: 'xlsx' }));
+    }
     async issueSingleRow({ row, jobSno, managerSno, partnerSno, systemKey, longLivedToken, }) {
         const { memberNo, amount, reason, expiredDt } = row;
         const targetAmount = Number(amount);
+        const formattedExpiredDt = this.parseExcelDate(expiredDt);
         if (!memberNo || isNaN(targetAmount) || targetAmount === 0 || !reason) {
             throw new Error('필수 컬럼 누락 또는 금액 오류');
         }
-        const member = await (0, gsUtil_1.shopByServerApi)('/profile', enum_1.HTTP_METHOD.GET, systemKey, longLivedToken, { memberNo: memberNo });
+        const member = await (0, gsUtil_1.shopByServerApi)('/profile', enum_1.HTTP_METHOD.GET, systemKey, longLivedToken, { memberNo });
         if (!member)
             throw new Error('존재하지 않는 회원');
         const entityManager = await this.getEntityManager();
         return await entityManager.transaction(async (manager) => {
-            var _a;
-            const [lastLedger] = await manager.query(`SELECT balanceAfter FROM gs_depositManager WHERE partnerSno = ? AND memberNo = ? ORDER BY sno DESC LIMIT 1 FOR UPDATE`, [partnerSno, memberNo]);
-            const prevBalance = Number((_a = lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) !== null && _a !== void 0 ? _a : 0);
             if (targetAmount > 0) {
-                const jdResult = await manager.query(`INSERT INTO gs_depositJobDetail (jobSno, partnerSno, memberNo, memberId, memberName, depositAmount, reason, expiredDt) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [
-                    jobSno,
+                return await this.processIssue(manager, {
                     partnerSno,
-                    memberNo,
-                    member['memberId'],
-                    member['memberName'],
-                    targetAmount,
+                    memberNo: Number(memberNo),
+                    memberId: member.memberId,
+                    memberName: member.memberName,
+                    amount: targetAmount,
                     reason,
-                    expiredDt !== null && expiredDt !== void 0 ? expiredDt : null,
-                ]);
-                await manager.query(`INSERT INTO gs_depositManager (partnerSno, memberNo, memberId, memberName, depositType, source, managerSno, refType, refSno, depositAmount, balanceAfter, reason)
-           VALUES (?, ?, ?, ?, 'ISSUE', 'ADMIN', ?, 'JOB_DETAIL', ?, ?, ?, ?)`, [
-                    partnerSno,
-                    memberNo,
-                    member['memberId'],
-                    member['memberName'],
                     managerSno,
-                    jdResult.insertId,
-                    targetAmount,
-                    prevBalance + targetAmount,
-                    reason,
-                ]);
+                    jobSno,
+                    expiredDt: formattedExpiredDt ? formattedExpiredDt : null,
+                });
             }
             else {
-                const deductAmount = Math.abs(targetAmount);
-                if (prevBalance < deductAmount)
-                    throw new Error(`잔액 부족 (가용: ${prevBalance})`);
-                const deductOrder = await manager.save(depositOrder_entity_1.DepositOrder, {
+                return await this.executeFifoDeduct(manager, {
                     partnerSno,
-                    memberNo,
-                    memberId: member['memberId'],
-                    memberName: member['memberName'],
+                    memberNo: Number(memberNo),
+                    memberId: member.memberId,
+                    memberName: member.memberName,
+                    amount: Math.abs(targetAmount),
+                    reason,
+                    managerSno,
                     orderNo: `DEDUCT_EXCEL_${Date.now()}`,
-                    usedAmount: deductAmount,
-                    orderStatus: 'DONE',
                 });
-                const availableIssues = await manager.query(`SELECT jd.sno AS issueDetailSno, jd.depositAmount, jd.expiredDt, (jd.depositAmount - IFNULL(usedSub.netUsed, 0)) AS remainAmount
-           FROM gs_depositJobDetail jd
-           LEFT JOIN (SELECT issueDetailSno, SUM(usedDepositAmount - refundAmount) AS netUsed FROM gs_depositOrderDetail GROUP BY issueDetailSno) usedSub ON jd.sno = usedSub.issueDetailSno
-           WHERE jd.partnerSno = ? AND jd.memberNo = ? AND jd.expireFl = 'N' AND (jd.expiredDt IS NULL OR jd.expiredDt >= NOW())
-           HAVING remainAmount > 0 ORDER BY CASE WHEN jd.expiredDt IS NULL THEN 1 ELSE 0 END ASC, jd.expiredDt ASC, jd.sno ASC FOR UPDATE`, [partnerSno, memberNo]);
-                let remainToDeduct = deductAmount;
-                for (const issue of availableIssues) {
-                    if (remainToDeduct <= 0)
-                        break;
-                    const take = Math.min(Number(issue.remainAmount), remainToDeduct);
-                    await manager.save(depositOrderDetail_entity_1.DepositOrderDetail, {
-                        orderSno: deductOrder.sno,
-                        partnerSno,
-                        memberNo,
-                        orderProductOptionNo: 'ADMIN_DEDUCT',
-                        mallProductNo: 'ADMIN_DEDUCT',
-                        orderProductName: `관리자 차감: ${reason}`,
-                        usedDepositAmount: take,
-                        issueDetailSno: issue.issueDetailSno,
-                        expireDt: issue.expiredDt,
-                        refundYn: enum_1.YN.N,
-                    });
-                    remainToDeduct -= take;
-                }
-                await manager.query(`INSERT INTO gs_depositManager (partnerSno, memberNo, memberId, memberName, depositType, source, managerSno, refType, refSno, depositAmount, balanceAfter, reason)
-           VALUES (?, ?, ?, ?, 'CANCEL', 'ADMIN', ?, 'ORDER', ?, ?, ?, ?)`, [
-                    partnerSno,
-                    memberNo,
-                    member['memberId'],
-                    member['memberName'],
-                    managerSno,
-                    deductOrder.sno,
-                    -deductAmount,
-                    prevBalance - deductAmount,
-                    reason,
-                ]);
             }
         });
     }
+    parseExcelDate(dateStr) {
+        if (!dateStr)
+            return null;
+        if (dateStr instanceof Date) {
+            dateStr.setHours(23, 59, 59, 0);
+            return dateStr;
+        }
+        if (typeof dateStr === 'number') {
+            const date = new Date((dateStr - 25569) * 86400 * 1000);
+            date.setHours(23, 59, 59, 0);
+            return isNaN(date.getTime()) ? null : date;
+        }
+        if (typeof dateStr === 'string') {
+            const normalized = dateStr.replace(/\./g, '-');
+            const date = new Date(normalized);
+            if (!isNaN(date.getTime())) {
+                date.setHours(23, 59, 59, 0);
+                return date;
+            }
+        }
+        return null;
+    }
     async getDepositManagerList(dto) {
         const entityManager = await this.getEntityManager();
         const qb = entityManager.createQueryBuilder(depositManager_entity_1.DepositManager, 'dm');
@@ -361,28 +504,30 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         return detail;
     }
     async getOrderDetail(entityManager, sno, partnerSno) {
-        const qb = entityManager.createQueryBuilder(depositManager_entity_1.DepositManager, 'dm');
-        qb.leftJoinAndSelect('gs_depositOrder', 'o', 'dm.refType = :refType AND dm.refSno = o.sno', { refType: enum_1.DEPOSIT_REF_TYPE.ORDER });
-        qb.leftJoinAndSelect('gs_depositOrderDetail', 'od', 'o.sno = od.orderSno');
-        qb.andWhere('dm.partnerSno = :partnerSno', {
-            partnerSno: partnerSno,
-        });
-        qb.andWhere('dm.sno = :sno', {
-            sno: sno,
-        });
-        qb.select([
-            'dm.*',
-            'o.orderNo as orderNo',
-            'o.usedAmount as usedAmount',
-            'od.orderProductNo as orderProductNo',
-            'od.orderProductName as orderProductName',
-            'od.orderAmount as orderAmount',
-            'od.usedDepositAmount as usedDepositAmount',
-            'od.allocatedRatio as allocatedRatio',
-            'od.allocatedAmount as allocatedAmount',
-        ]);
-        const detail = await qb.getRawOne();
-        return detail;
+        const managerEntry = await entityManager
+            .createQueryBuilder(depositManager_entity_1.DepositManager, 'dm')
+            .leftJoinAndSelect('gs_depositOrder', 'o', 'dm.refSno = o.sno AND dm.refType = "ORDER"')
+            .where('dm.sno = :sno AND dm.partnerSno = :partnerSno', {
+            sno,
+            partnerSno,
+        })
+            .getRawOne();
+        if (!managerEntry || !managerEntry.o_sno)
+            return null;
+        const usageDetails = await entityManager
+            .createQueryBuilder(depositOrderDetail_entity_1.DepositOrderDetail, 'od')
+            .leftJoin('gs_depositJobDetail', 'jd', 'od.issueDetailSno = jd.sno')
+            .select([
+            'jd.sno AS originSno',
+            'jd.regDt AS originRegDt',
+            'jd.reason AS originReason',
+            'jd.depositAmount AS originAmount',
+            'od.usedDepositAmount AS used',
+            'od.orderProductName AS pName',
+        ])
+            .where('od.orderSno = :orderSno', { orderSno: managerEntry.o_sno })
+            .getRawMany();
+        return Object.assign(Object.assign({}, managerEntry), { usageDetails });
     }
     async createCouponManager(dto) {
         if (dto.registerStartDt > dto.registerEndDt) {
@@ -419,7 +564,9 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
     async getCouponManagerList(dto) {
         const entityManager = await this.getEntityManager();
         const qb = entityManager.createQueryBuilder(depositCouponManager_entity_1.DepositCouponManager, 'dcm');
-        qb.andWhere('dcm.partnerSno = :partnerSno', { partnerSno: dto.partnerSno });
+        qb.andWhere('dcm.partnerSno = :partnerSno', {
+            partnerSno: dto.partnerSno,
+        });
         if (dto.title) {
             qb.andWhere('dcm.title LIKE :title', {
                 title: `%${dto.title}%`,
@@ -447,14 +594,18 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
     async getCouponCodeList(dto) {
         const entityManager = await this.getEntityManager();
         const qb = entityManager.createQueryBuilder(depositCoupon_entity_1.DepositCoupon, 'dc');
-        qb.andWhere('dc.partnerSno = :partnerSno', { partnerSno: dto.partnerSno });
+        qb.andWhere('dc.partnerSno = :partnerSno', {
+            partnerSno: dto.partnerSno,
+        });
         if (dto.couponCode) {
             qb.andWhere('dc.couponCode LIKE :couponCode', {
                 couponCode: `%${dto.couponCode}%`,
             });
         }
         if (dto.policySno) {
-            qb.andWhere('dc.policySno = :policySno', { policySno: dto.policySno });
+            qb.andWhere('dc.policySno = :policySno', {
+                policySno: dto.policySno,
+            });
         }
         qb.select(['dc.*']);
         qb.orderBy('dc.sno', 'DESC');
@@ -480,7 +631,9 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
             .addSelect('SUM(od.usedDepositAmount)', 'usedAmount')
             .from(depositOrderDetail_entity_1.DepositOrderDetail, 'od')
             .groupBy('od.issueDetailSno'), 'od', 'jd.sno = od.issueDetailSno')
-            .where('jd.partnerSno = :partnerSno', { partnerSno: dto.partnerSno })
+            .where('jd.partnerSno = :partnerSno', {
+            partnerSno: dto.partnerSno,
+        })
             .andWhere('jd.expireFl = :expireFl', { expireFl: 'n' })
             .andWhere('(jd.expiredDt IS NULL OR jd.expiredDt >= NOW())')
             .groupBy('jd.memberNo')
@@ -491,7 +644,9 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         const countQb = entityManager
             .createQueryBuilder(depositJobDetail_entity_1.DepositJobDetail, 'jd')
             .select('COUNT(DISTINCT jd.memberNo)', 'cnt')
-            .where('jd.partnerSno = :partnerSno', { partnerSno: dto.partnerSno })
+            .where('jd.partnerSno = :partnerSno', {
+            partnerSno: dto.partnerSno,
+        })
             .andWhere('jd.expireFl = :expireFl', { expireFl: 'n' })
             .andWhere('(jd.expiredDt IS NULL OR jd.expiredDt >= NOW())');
         const count = await countQb.getRawOne();
@@ -652,11 +807,17 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         const entityManager = await this.getEntityManager();
         const partner = await this.partnerService.findOne(dto.partnerSno);
         if (!partner) {
-            return { rescode: '0002', message: '유효하지 않은 파트너 정보입니다.' };
+            return {
+                rescode: '0002',
+                message: '유효하지 않은 파트너 정보입니다.',
+            };
         }
         const user = await (0, gsUtil_1.shopByServerApi)('/profile', enum_1.HTTP_METHOD.GET, partner.systemKey, partner.longLivedToken, { memberNo: Number(dto.memberMappingKey) });
         if (!user) {
-            return { rescode: '0001', message: '사용자 정보를 찾을 수 없습니다.' };
+            return {
+                rescode: '0001',
+                message: '사용자 정보를 찾을 수 없습니다.',
+            };
         }
         const targetMemberNo = Number(user.memberNo);
         const targetPartnerSno = partner.sno;
@@ -770,7 +931,8 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
                     ? remainToDeductMaster
                     : Math.round(depositOrder.usedAmount * ratio);
                 remainToDeductMaster -= amountToAllocate;
-                while (amountToAllocate > 0 && issueIndex < availableIssues.length) {
+                while (amountToAllocate > 0 &&
+                    issueIndex < availableIssues.length) {
                     const currentIssue = availableIssues[issueIndex];
                     const canTake = Math.min(Number(currentIssue.remainAmount), amountToAllocate);
                     if (canTake > 0) {
@@ -854,8 +1016,10 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
                 });
                 if (!usedDetails.length)
                     continue;
-                const totalRemainQty = Number(usedDetails[0].orderCnt) - Number(usedDetails[0].refundCnt);
-                const totalRemainAmt = usedDetails.reduce((sum, d) => sum + (Number(d.usedDepositAmount) - Number(d.refundAmount)), 0);
+                const totalRemainQty = Number(usedDetails[0].orderCnt) -
+                    Number(usedDetails[0].refundCnt);
+                const totalRemainAmt = usedDetails.reduce((sum, d) => sum +
+                    (Number(d.usedDepositAmount) - Number(d.refundAmount)), 0);
                 if (totalRemainAmt <= 0 || totalRemainQty <= 0)
                     continue;
                 const isFullCancel = Number(item.orderCnt) === Number(item.originalOrderCnt);
@@ -870,7 +1034,8 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
                 for (const detail of usedDetails) {
                     if (remainRefundAmt <= 0)
                         break;
-                    const recordRemainAmt = Number(detail.usedDepositAmount) - Number(detail.refundAmount);
+                    const recordRemainAmt = Number(detail.usedDepositAmount) -
+                        Number(detail.refundAmount);
                     if (recordRemainAmt <= 0)
                         continue;
                     const takeAmt = Math.min(recordRemainAmt, remainRefundAmt);
@@ -914,7 +1079,7 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
     }
 };
 exports.DepositService = DepositService;
-exports.DepositService = DepositService = __decorate([
+exports.DepositService = DepositService = DepositService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [partner_service_1.PartnerService,
         core_1.ModuleRef])