geek-custom-api-core 0.0.44 → 0.0.46

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

@@ -55,9 +55,10 @@ const depositCoupon_entity_1 = require("./entity/depositCoupon.entity");
 const depositCouponManager_entity_1 = require("./entity/depositCouponManager.entity");
 const typeorm_1 = require("typeorm");
 const depositOrderDetail_entity_1 = require("./entity/depositOrderDetail.entity");
-const depositOrder_entity_1 = require("./entity/depositOrder.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");
 let DepositService = class DepositService extends default_service_1.DefaultService {
     constructor(partnerService, moduleRef) {
         super(moduleRef);
@@ -88,6 +89,8 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
                 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,
@@ -104,12 +107,14 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
             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, depositType, source, managerSno,
+        (partnerSno, memberNo, memberId, memberName, depositType, source, managerSno,
          refType, refSno, depositAmount, balanceAfter, reason)
-        VALUES (?, ?, 'ISSUE', 'ADMIN', ?, 'JOB_DETAIL', ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, 'ISSUE', 'ADMIN', ?, 'JOB_DETAIL', ?, ?, ?, ?)
         `, [
                 dto.partnerSno,
                 dto.memberNo,
+                dto.memberId,
+                dto.memberName,
                 dto.managerSno,
                 jobDetail.sno,
                 dto.amount,
@@ -180,70 +185,92 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
     }
     async issueSingleRow({ row, jobSno, managerSno, partnerSno, systemKey, longLivedToken, }) {
         const { memberNo, amount, reason, expiredDt } = row;
-        if (!memberNo || !amount || !reason) {
-            throw new Error('필수 컬럼 누락');
+        const targetAmount = Number(amount);
+        if (!memberNo || isNaN(targetAmount) || targetAmount === 0 || !reason) {
+            throw new Error('필수 컬럼 누락 또는 금액 오류');
         }
-        if (Number(amount) <= 0) {
-            throw new Error('지급 금액 오류');
-        }
-        const member = (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: memberNo });
+        if (!member)
+            throw new Error('존재하지 않는 회원');
         const entityManager = await this.getEntityManager();
         return await entityManager.transaction(async (manager) => {
             var _a;
-            const jdResult = await manager.query(`
-        INSERT INTO gs_depositJobDetail
-        (jobSno, partnerSno, memberNo, memberId, memberName, depositAmount, reason, expiredDt)
-        VALUES (?, ?, ?, ?, ?, ?)
-        `, [
-                jobSno,
-                partnerSno,
-                memberNo,
-                member['memberId'],
-                member['memberName'],
-                amount,
-                reason,
-                expiredDt !== null && expiredDt !== void 0 ? expiredDt : null,
-            ]);
-            const jobDetailSno = jdResult.insertId;
-            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 = (_a = lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) !== null && _a !== void 0 ? _a : 0;
-            const nextBalance = prevBalance + Number(amount);
-            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,
-                managerSno,
-                jobDetailSno,
-                amount,
-                nextBalance,
-                reason,
-            ]);
+            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,
+                    partnerSno,
+                    memberNo,
+                    member['memberId'],
+                    member['memberName'],
+                    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,
+                ]);
+            }
+            else {
+                const deductAmount = Math.abs(targetAmount);
+                if (prevBalance < deductAmount)
+                    throw new Error(`잔액 부족 (가용: ${prevBalance})`);
+                const deductOrder = await manager.save(depositOrder_entity_1.DepositOrder, {
+                    partnerSno,
+                    memberNo,
+                    memberId: member['memberId'],
+                    memberName: member['memberName'],
+                    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,
+                ]);
+            }
         });
     }
     async getDepositManagerList(dto) {
@@ -267,12 +294,12 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         }
         if (dto.fromDt) {
             qb.andWhere('dm.regDt >= :fromDt', {
-                fromDt: dto.fromDt,
+                fromDt: dto.fromDt + ' 00:00:00',
             });
         }
         if (dto.endDt) {
             qb.andWhere('dm.regDt <= :endDt', {
-                endDt: dto.endDt,
+                endDt: dto.endDt + ' 23:59:59',
             });
         }
         qb.select([
@@ -347,8 +374,8 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
             'dm.*',
             'o.orderNo as orderNo',
             'o.usedAmount as usedAmount',
-            'od.orderGoodsNo as orderGoodsNo',
-            'od.orderGoodsName as orderGoodsName',
+            'od.orderProductNo as orderProductNo',
+            'od.orderProductName as orderProductName',
             'od.orderAmount as orderAmount',
             'od.usedDepositAmount as usedDepositAmount',
             'od.allocatedRatio as allocatedRatio',
@@ -362,7 +389,7 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
             throw new common_1.HttpException('쿠폰 등록 시작일은 쿠폰 등록 종료일 이전이어야 합니다.', common_1.HttpStatus.BAD_REQUEST);
         }
         const entityManager = await this.getEntityManager();
-        const couponManager = await entityManager.transaction(async (manager) => {
+        return await entityManager.transaction(async (manager) => {
             var _a;
             const result = await manager.save(depositCouponManager_entity_1.DepositCouponManager, {
                 partnerSno: dto.partnerSno,
@@ -375,24 +402,24 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
                 useFl: (_a = dto.useFl) !== null && _a !== void 0 ? _a : enum_1.YN.Y,
             });
             const managerSno = result.sno;
+            const coupons = [];
             for (let i = 0; i < dto.issueLimit; i++) {
-                const couponCode = (0, gsUtil_1.getRandomString)(10);
-                await manager.save(depositCoupon_entity_1.DepositCoupon, {
+                coupons.push({
                     policySno: managerSno,
-                    couponCode: couponCode,
+                    couponCode: (0, gsUtil_1.getRandomString)(10),
                     partnerSno: dto.partnerSno,
                 });
             }
+            if (coupons.length > 0) {
+                await manager.insert(depositCoupon_entity_1.DepositCoupon, coupons);
+            }
             return result;
         });
-        return couponManager;
     }
     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}%`,
@@ -420,18 +447,14 @@ 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');
@@ -457,9 +480,7 @@ 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')
@@ -470,9 +491,7 @@ 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();
@@ -484,8 +503,9 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         return deposit;
     }
     async redeemCoupon(dto) {
+        console.log(dto);
         const entityManager = await this.getEntityManager();
-        entityManager.transaction(async (manager) => {
+        return await entityManager.transaction(async (manager) => {
             var _a;
             const coupon = await manager.findOne(depositCoupon_entity_1.DepositCoupon, {
                 where: {
@@ -495,6 +515,8 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
             if (!coupon) {
                 throw new common_1.HttpException('쿠폰이 존재하지 않습니다.', common_1.HttpStatus.BAD_REQUEST);
             }
+            console.log('########################');
+            console.log(coupon);
             if (coupon.usedFl === enum_1.YN.Y) {
                 throw new common_1.HttpException('이미 사용된 쿠폰입니다.', common_1.HttpStatus.BAD_REQUEST);
             }
@@ -510,7 +532,8 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
                 throw new common_1.HttpException('사용 불가능한 쿠폰입니다.', common_1.HttpStatus.BAD_REQUEST);
             }
             if (couponManager.issueLimit !== null &&
-                couponManager.issueCount >= couponManager.issueLimit) {
+                couponManager.issueCount >= couponManager.issueLimit &&
+                couponManager.issueLimit !== 0) {
                 throw new common_1.HttpException('쿠폰 발급 수량이 초과되었습니다.', common_1.HttpStatus.BAD_REQUEST);
             }
             const job = await manager.save(depositJob_entity_1.DepositJob, {
@@ -524,17 +547,14 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
             });
             let expireDt = null;
             if (couponManager.expireAfterDays > 0) {
-                expireDt = new Date();
-                expireDt
-                    .setDate(expireDt.getDate() + couponManager.expireAfterDays)
-                    .format('YYYY-MM-DD 23:59:59');
+                expireDt = (0, date_fns_1.endOfDay)((0, date_fns_1.addDays)(new Date(), couponManager.expireAfterDays));
             }
             const jobDetail = await manager.save(depositJobDetail_entity_1.DepositJobDetail, {
                 jobSno: job.sno,
                 partnerSno: coupon.partnerSno,
                 depositAmount: couponManager.depositAmount,
                 reason: couponManager.title,
-                memberNo: coupon.memberNo,
+                memberNo: dto.memberNo,
                 memberId: dto.memberId,
                 memberName: dto.memberName,
                 expiredDt: expireDt,
@@ -581,18 +601,34 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         });
     }
     async getDeposit(memberNo, partnerSno) {
-        var _a;
         const entityManager = await this.getEntityManager();
-        const deposit = await entityManager.findOne(depositManager_entity_1.DepositManager, {
-            where: {
-                memberNo: memberNo,
-                partnerSno: partnerSno,
-            },
-            order: {
-                sno: 'DESC',
-            },
-        });
-        return { depositAmount: (_a = deposit === null || deposit === void 0 ? void 0 : deposit.balanceAfter) !== null && _a !== void 0 ? _a : 0 };
+        const [balanceRow] = await entityManager.query(`
+      SELECT (
+        -- 1. 유효한 총 지급액 합계
+        (SELECT IFNULL(SUM(depositAmount), 0)
+         FROM gs_depositJobDetail
+         WHERE partnerSno = ? 
+           AND memberNo = ?
+           AND expireFl = 'N'
+           AND depositAmount > 0
+           AND (expiredDt IS NULL OR expiredDt >= NOW())
+        ) 
+        - 
+        -- 2. 해당 지급건들에 연결된 실제 순사용액(사용-환불) 합계
+        (SELECT IFNULL(SUM(usedDepositAmount - refundAmount), 0)
+         FROM gs_depositOrderDetail
+         WHERE partnerSno = ? 
+           AND memberNo = ?
+           AND issueDetailSno IN (
+             SELECT sno FROM gs_depositJobDetail 
+             WHERE partnerSno = ? AND memberNo = ? AND expireFl = 'N'
+           )
+        )
+      ) AS totalAvailable
+      `, [partnerSno, memberNo, partnerSno, memberNo, partnerSno, memberNo]);
+        return {
+            depositAmount: Number((balanceRow === null || balanceRow === void 0 ? void 0 : balanceRow.totalAvailable) || 0),
+        };
     }
     async getDepositHistory(dto) {
         const entityManager = await this.getEntityManager();
@@ -612,147 +648,268 @@ let DepositService = class DepositService extends default_service_1.DefaultServi
         const data = [list, count];
         return (0, gsUtil_1.paginateResponse)(data, dto.page, dto.take);
     }
-    async useDepositForOrder(dto) {
+    async useDepositPrepare(dto) {
+        const entityManager = await this.getEntityManager();
         const partner = await this.partnerService.findOne(dto.partnerSno);
-        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',
-                resmessage: '사용자 정보를 찾을 수 없습니다.',
-            };
-        }
-        dto.memberId = user.memberId;
-        dto.memberName = user.memberName;
-        if (dto.payAmt <= 0) {
-            return {
-                rescode: '0002',
-                resmessage: '사용 금액은 0보다 커야 합니다.',
-            };
-        }
-        const order = await (0, gsUtil_1.shopByServerApi)(`/order/${dto.orderNo}`, enum_1.HTTP_METHOD.GET, partner.systemKey, partner.longLivedToken);
-        if (!order) {
-            return {
-                rescode: '0003',
-                resmessage: '주문번호가 존재하지 않습니다.',
-            };
+        if (!partner) {
+            return { rescode: '0002', message: '유효하지 않은 파트너 정보입니다.' };
         }
-        for (const orderProducts of order.orderProducts) {
-            dto.orderProducts.push({
-                orderProductNo: orderProducts.orderProductNo,
-                orderProductName: orderProducts.productName,
-                orderProductAmount: orderProducts.productSalePrice,
-            });
-        }
-        if (!dto.orderProducts || dto.orderProducts.length === 0) {
-            throw new common_1.HttpException('주문 상품 정보가 필요합니다.', common_1.HttpStatus.BAD_REQUEST);
+        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: '사용자 정보를 찾을 수 없습니다.' };
         }
-        const entityManager = await this.getEntityManager();
+        const targetMemberNo = Number(user.memberNo);
+        const targetPartnerSno = partner.sno;
         return await entityManager.transaction(async (manager) => {
-            var _a, _b;
-            const availableIssues = await manager.query(`
-                    SELECT
-                        jd.sno AS issueDetailSno,
-                        jd.depositAmount,
-                        jd.expiredDt,
-                        (jd.depositAmount - IFNULL(usedSub.usedTotal, 0)) AS remainAmount
-                    FROM gs_depositJobDetail jd
-                    LEFT JOIN (
-                        SELECT issueDetailSno, SUM(usedDepositAmount) AS usedTotal
-                        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
-                    `, [dto.partnerSno, user.memberNo]);
-            const totalAvailable = availableIssues.reduce((sum, row) => sum + Number(row.remainAmount), 0);
+            const [balanceRow] = await manager.query(`
+        SELECT 
+          (SUM(jd.depositAmount) - IFNULL(SUM(usedSub.netUsed), 0)) AS totalAvailable
+        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())
+      `, [targetPartnerSno, targetMemberNo]);
+            const totalAvailable = Number((balanceRow === null || balanceRow === void 0 ? void 0 : balanceRow.totalAvailable) || 0);
             if (totalAvailable < dto.payAmt) {
-                throw new common_1.HttpException(`예치금 잔액이 부족합니다. (가용: ${totalAvailable}, 요청: ${dto.payAmt})`, common_1.HttpStatus.BAD_REQUEST);
+                return {
+                    rescode: '0006',
+                    message: `예치금 잔액이 부족합니다. (가용: ${totalAvailable}, 요청: ${dto.payAmt})`,
+                };
             }
             const depositOrder = await manager.save(depositOrder_entity_1.DepositOrder, {
+                partnerSno: targetPartnerSno,
+                memberNo: targetMemberNo,
                 orderNo: dto.orderNo,
-                partnerSno: dto.partnerSno,
-                memberNo: user.memberNo,
-                memberId: dto.memberId,
-                memberName: dto.memberName,
+                memberId: user.memberId,
+                memberName: user.memberName,
                 usedAmount: dto.payAmt,
+                orderStatus: 'PENDING',
+            });
+            return {
+                rescode: '0000',
+                message: 'SUCCESS',
+                transactionId: depositOrder.sno,
+            };
+        });
+    }
+    async confirmDepositOrder(orderInfo) {
+        const entityManager = await this.getEntityManager();
+        const orderNo = orderInfo.order.orderNo;
+        const depositOrder = await entityManager.findOne(depositOrder_entity_1.DepositOrder, {
+            where: { orderNo: orderNo },
+        });
+        if (!depositOrder || depositOrder.orderStatus !== 'PENDING') {
+            throw new common_1.HttpException('유효하지 않거나 이미 처리된 예약 건입니다.', common_1.HttpStatus.BAD_REQUEST);
+        }
+        const targetOrderSno = depositOrder.sno;
+        const targetPartnerSno = depositOrder.partnerSno;
+        const targetMemberNo = depositOrder.memberNo;
+        return await entityManager.transaction(async (manager) => {
+            var _a;
+            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
+      `, [targetPartnerSno, targetMemberNo]);
+            const flattenedOptions = [];
+            orderInfo.order.orderProducts.forEach((product) => {
+                product.orderProductOptions.forEach((option) => {
+                    flattenedOptions.push({
+                        mallProductNo: String(product.mallProductNo),
+                        productName: product.productName,
+                        orderProductOptionNo: String(option.orderProductOptionNo),
+                        orderCnt: option.orderCnt,
+                        optionName: option.optionName,
+                        optionValue: option.optionValue,
+                        mallOptionNo: option.mallOptionNo,
+                        price: Number(option.adjustedAmt || option.salePrice),
+                    });
+                });
             });
-            let remainToDeduct = dto.payAmt;
-            const totalOrderAmount = dto.orderProducts.reduce((sum, g) => sum + g.orderProductAmount, 0);
+            const totalBaseAmount = orderInfo.order.lastStandardAmt ||
+                flattenedOptions.reduce((sum, opt) => sum + opt.price, 0);
+            let remainToDeductMaster = depositOrder.usedAmount;
+            let issueIndex = 0;
             const orderDetails = [];
-            for (const issue of availableIssues) {
-                if (remainToDeduct <= 0)
-                    break;
-                const deductFromThisIssue = Math.min(Number(issue.remainAmount), remainToDeduct);
-                remainToDeduct -= deductFromThisIssue;
-                let allocatedSumInIssue = 0;
-                for (let i = 0; i < dto.orderProducts.length; i++) {
-                    const goods = dto.orderProducts[i];
-                    const ratio = totalOrderAmount > 0
-                        ? order.lastMainPayAmt / totalOrderAmount
-                        : 1 / dto.orderProducts.length;
-                    const allocatedInIssue = i === dto.orderProducts.length - 1
-                        ? deductFromThisIssue - allocatedSumInIssue
-                        : Math.round(deductFromThisIssue * ratio);
-                    allocatedSumInIssue += allocatedInIssue;
-                    if (allocatedInIssue <= 0)
-                        continue;
-                    orderDetails.push(manager.create(depositOrderDetail_entity_1.DepositOrderDetail, {
-                        orderSno: depositOrder.sno,
-                        partnerSno: dto.partnerSno,
-                        memberNo: user.memberNo,
-                        memberId: dto.memberId,
-                        memberName: dto.memberName,
-                        orderProductNo: goods.orderProductNo,
-                        orderProductName: goods.orderProductName,
-                        orderProductAmount: goods.orderProductAmount,
-                        issueDetailSno: issue.issueDetailSno,
-                        usedDepositAmount: allocatedInIssue,
-                        allocatedRatio: Number(ratio.toFixed(6)),
-                        allocatedAmount: allocatedInIssue,
-                        expireDt: (_a = issue.expiredDt) !== null && _a !== void 0 ? _a : null,
-                    }));
+            for (let i = 0; i < flattenedOptions.length; i++) {
+                const opt = flattenedOptions[i];
+                const ratio = totalBaseAmount > 0
+                    ? parseFloat((opt.price / totalBaseAmount).toFixed(6))
+                    : 0;
+                let amountToAllocate = i === flattenedOptions.length - 1
+                    ? remainToDeductMaster
+                    : Math.round(depositOrder.usedAmount * ratio);
+                remainToDeductMaster -= amountToAllocate;
+                while (amountToAllocate > 0 && issueIndex < availableIssues.length) {
+                    const currentIssue = availableIssues[issueIndex];
+                    const canTake = Math.min(Number(currentIssue.remainAmount), amountToAllocate);
+                    if (canTake > 0) {
+                        orderDetails.push(manager.create(depositOrderDetail_entity_1.DepositOrderDetail, {
+                            orderSno: targetOrderSno,
+                            partnerSno: targetPartnerSno,
+                            memberNo: targetMemberNo,
+                            orderProductOptionNo: opt.orderProductOptionNo,
+                            mallProductNo: opt.mallProductNo,
+                            mallOptionNo: opt.mallOptionNo,
+                            orderProductName: `${opt.productName} (${opt.optionName}:${opt.optionValue})`,
+                            orderCnt: opt.orderCnt,
+                            orderAmount: opt.price,
+                            allocatedRatio: ratio,
+                            allocatedAmount: canTake,
+                            issueDetailSno: currentIssue.issueDetailSno,
+                            usedDepositAmount: canTake,
+                            expireDt: (_a = currentIssue.expiredDt) !== null && _a !== void 0 ? _a : null,
+                            refundYn: enum_1.YN.N,
+                        }));
+                        amountToAllocate -= canTake;
+                        currentIssue.remainAmount =
+                            Number(currentIssue.remainAmount) - canTake;
+                    }
+                    if (Number(currentIssue.remainAmount) <= 0) {
+                        issueIndex++;
+                    }
                 }
             }
-            await manager.save(depositOrderDetail_entity_1.DepositOrderDetail, orderDetails);
-            const [lastLedger] = await manager.query(`
-                    SELECT balanceAfter
-                    FROM gs_depositManager
-                    WHERE partnerSno = ? AND memberNo = ?
-                    ORDER BY sno DESC
-                    LIMIT 1
-                    FOR UPDATE
-                    `, [dto.partnerSno, user.memberNo]);
-            const prevBalance = (_b = lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) !== null && _b !== void 0 ? _b : 0;
-            const nextBalance = prevBalance - dto.payAmt;
-            const depositManager = await manager.save(depositManager_entity_1.DepositManager, {
-                partnerSno: dto.partnerSno,
-                memberNo: user.memberNo,
-                memberId: dto.memberId,
-                memberName: dto.memberName,
+            if (orderDetails.length === 0 && depositOrder.usedAmount > 0) {
+                throw new common_1.HttpException('주문번호: ' +
+                    orderNo +
+                    ' :: 결제에 사용할 수 있는 예치금 상세 내역이 없습니다. (잔액 부족 또는 만료)', common_1.HttpStatus.INTERNAL_SERVER_ERROR);
+            }
+            if (orderDetails.length > 0) {
+                await manager.save(depositOrderDetail_entity_1.DepositOrderDetail, orderDetails);
+            }
+            await manager.update(depositOrder_entity_1.DepositOrder, targetOrderSno, {
+                orderStatus: 'DONE',
+                memberId: orderInfo.order.memberId || depositOrder.memberId,
+                memberName: orderInfo.order.ordererName || depositOrder.memberName,
+            });
+            const [lastLedger] = await manager.query(`SELECT balanceAfter FROM gs_depositManager WHERE partnerSno = ? AND memberNo = ? ORDER BY sno DESC LIMIT 1 FOR UPDATE`, [targetPartnerSno, targetMemberNo]);
+            const prevBalance = Number((lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) || 0);
+            await manager.save(depositManager_entity_1.DepositManager, {
+                partnerSno: targetPartnerSno,
+                memberNo: targetMemberNo,
+                memberId: orderInfo.order.memberId || depositOrder.memberId,
+                memberName: orderInfo.order.ordererName || depositOrder.memberName,
                 depositType: enum_1.DEPOSIT_TYPE.USE,
                 source: enum_1.DEPOSIT_SOURCE.ORDER,
-                managerSno: 0,
                 refType: enum_1.DEPOSIT_REF_TYPE.ORDER,
-                refSno: depositOrder.sno,
-                depositAmount: -dto.payAmt,
-                balanceAfter: nextBalance,
-                reason: `주문 예치금 사용 (주문번호: ${dto.orderNo})`,
+                refSno: targetOrderSno,
+                depositAmount: -depositOrder.usedAmount,
+                balanceAfter: prevBalance - depositOrder.usedAmount,
+                reason: `주문 예치금 사용 완료 (주문번호: ${orderNo})`,
             });
-            return {
-                transactionId: depositManager.sno,
-                rescode: '0000',
-                message: 'SUCCESS',
-            };
+            return { rescode: '0000', message: 'SUCCESS' };
+        });
+    }
+    async refundDepositOrder(targetItems) {
+        const entityManager = await this.getEntityManager();
+        return await entityManager.transaction(async (manager) => {
+            for (const item of targetItems) {
+                const orderNo = item.orderNo;
+                const productNo = String(item.mallProductNo);
+                const optionNo = String(item.mallOptionNo);
+                const cancelQty = Number(item.orderCnt || 0);
+                const depositOrder = await manager.findOne(depositOrder_entity_1.DepositOrder, {
+                    where: { orderNo },
+                });
+                if (!depositOrder)
+                    continue;
+                const usedDetails = await manager.find(depositOrderDetail_entity_1.DepositOrderDetail, {
+                    where: {
+                        orderSno: depositOrder.sno,
+                        mallProductNo: productNo,
+                        mallOptionNo: Number(optionNo),
+                    },
+                    order: { sno: 'ASC' },
+                });
+                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);
+                if (totalRemainAmt <= 0 || totalRemainQty <= 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;
+                let remainRefundAmt = totalRefundAmt;
+                for (const detail of usedDetails) {
+                    if (remainRefundAmt <= 0)
+                        break;
+                    const recordRemainAmt = Number(detail.usedDepositAmount) - Number(detail.refundAmount);
+                    if (recordRemainAmt <= 0)
+                        continue;
+                    const takeAmt = Math.min(recordRemainAmt, remainRefundAmt);
+                    const newRefundAmount = Number(detail.refundAmount) + takeAmt;
+                    const isRecordDone = newRefundAmount >= Number(detail.usedDepositAmount);
+                    await manager.update(depositOrderDetail_entity_1.DepositOrderDetail, detail.sno, {
+                        refundAmount: newRefundAmount,
+                        refundYn: isRecordDone ? enum_1.YN.Y : enum_1.YN.N,
+                        refundDt: new Date(),
+                    });
+                    remainRefundAmt -= takeAmt;
+                }
+                const updatedRefundCnt = Math.min(Number(usedDetails[0].refundCnt) + actualTakeQty, Number(usedDetails[0].orderCnt));
+                const isFullyRefunded = updatedRefundCnt >= Number(usedDetails[0].orderCnt) &&
+                    Number(usedDetails[0].refundAmount) >=
+                        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);
+                    await manager.save(depositManager_entity_1.DepositManager, {
+                        partnerSno: depositOrder.partnerSno,
+                        memberNo: depositOrder.memberNo,
+                        memberId: depositOrder.memberId,
+                        memberName: depositOrder.memberName,
+                        depositType: enum_1.DEPOSIT_TYPE.REFUND,
+                        source: enum_1.DEPOSIT_SOURCE.ORDER,
+                        refType: enum_1.DEPOSIT_REF_TYPE.ORDER,
+                        refSno: depositOrder.sno,
+                        depositAmount: totalRefundAmt,
+                        balanceAfter: prevBalance + totalRefundAmt,
+                        reason: `주문 환불 (상품:${(item.productName || productNo).substring(0, 15)}, 수량:${actualTakeQty})`,
+                    });
+                }
+            }
+            return { rescode: '0000', message: 'SUCCESS' };
         });
     }
 };