From ce15736c9d5fa0f7f892733b68b5358a8b71cfdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= <dev13@gcone.kr>
Date: Mon, 13 Apr 2026 16:44:07 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=8F=85=EC=84=9C=EB=B9=84=EC=8A=A4?=
 =?UTF-8?q?=20=EA=B2=B0=EC=A0=9C=20-=20=EC=A3=BC=EB=AC=B8=EB=AC=B4?=
 =?UTF-8?q?=ED=9A=A8=20=EC=B2=98=EB=A6=AC=20=ED=9B=84=20=EC=9E=AC=EA=B3=A0?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/subsvc/mapper/BOSubsvcMapper.java   |  2 +
 .../goods/subsvc/service/BOSubsvcService.java | 16 ++++
 .../service/BORtngudrefndService.java         | 13 ++-
 .../gcone/goods/subsvc/BOSubsvcMapper.xml     | 82 ++++++++++++-------
 4 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/mapper/BOSubsvcMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/mapper/BOSubsvcMapper.java
index bf357ec2..0c496288 100644
--- a/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/mapper/BOSubsvcMapper.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/mapper/BOSubsvcMapper.java
@@ -35,6 +35,8 @@ public interface BOSubsvcMapper {
 	public void updateSubsvcOrdrUsefulInvntryQy(BOSubsvcVO vo);
 	/** 구독서비스 환불에 따른 판매재고수량 수정*/
 	public void updateSubsvcRefundUsefulInvntryQy(BOSubsvcVO vo);
+	/** 구독서비스 주문취소에 따른 판매재고수량 수정*/
+	public void updateSubsvcCancelOrderUsefulInvntryQy(BOSubsvcVO vo);
 	/** 판매재고수량 변경에 따른 구독서비스 상태 수정*/
 	public void updateInvntryPolicySubsvcSttusChng(BOSubsvcVO vo);
 }
diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/service/BOSubsvcService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/service/BOSubsvcService.java
index e4705ead..36741fa7 100644
--- a/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/service/BOSubsvcService.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/service/BOSubsvcService.java
@@ -170,4 +170,20 @@ public class BOSubsvcService {
 		//구독서비스 상태 수정
 		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
 	}
+
+	/**
+	 * 주문취소에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcCancelOrderUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcCancelOrderUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
 }
diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java
index 33f2f677..97d1b78e 100644
--- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java
@@ -1542,7 +1542,18 @@ public class BORtngudrefndService {
 
 
 			// ########################################### 상품 재고  ###########################################
-			boGoodsService.updateCancelOrderUsefulInvntryQy(ordrVO, ordrVO.getOrdrInnb());
+			BOOrdrVO boOrdrVO = new BOOrdrVO();
+			boOrdrVO.setOrdrInnb(ordrVO.getOrdrInnb());
+			boOrdrVO.setSopmalCd(ordrVO.getSopmalCd());
+
+			DataMap ordrDtl = ordrMapper.selectOrdrDtl(boOrdrVO);
+			boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+			if(subsvcAt) {
+				boOrdrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+				subsvcService.updateSubsvcCancelOrderUsefulInvntryQy(boOrdrVO);
+			} else {
+				boGoodsService.updateCancelOrderUsefulInvntryQy(ordrVO, ordrVO.getOrdrInnb());
+			}
 
 			resotreResult.put("restoreResult", "0");
 		} catch (Exception e) {
diff --git a/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml
index 832ba32f..f607ab43 100644
--- a/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml
@@ -8,8 +8,8 @@
 			resultType="dataMap">
 		<![CDATA[
 			SELECT GS.SUBSVC_INNB
-			     , SUBSVC_STTUS_CD
-			     , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
+				 , SUBSVC_STTUS_CD
+				 , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
 			FROM GC_SUBSVC GS
 			WHERE GS.SOPMAL_CD = 'SK'
 			  AND GS.SUBSVC_STTUS_CD != '03'
@@ -34,7 +34,7 @@
 				 , GS.SUBSVC_NM
 				 , GS.SUB_PD					/*구독기간*/
 				 , GS.SUBSVC_GNR				/*기수*/
-			     , (SELECT MAX(A.SUBSVC_GNR) + 1 FROM GC_SUBSVC A WHERE A.SOPMAL_CD = GS.SOPMAL_CD AND A.SUBSVC_NM = GS.SUBSVC_NM) AS SUBSVC_NEXT_GNR		/*다음기수*/
+				 , (SELECT MAX(A.SUBSVC_GNR) + 1 FROM GC_SUBSVC A WHERE A.SOPMAL_CD = GS.SOPMAL_CD AND A.SUBSVC_NM = GS.SUBSVC_NM) AS SUBSVC_NEXT_GNR		/*다음기수*/
 				 , GS.SUBSVC_GNR_NM				/*기수명*/
 				 , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
 				 , GS.DLVY_CNT					/*배송횟수*/
@@ -131,10 +131,10 @@
 				</if>
 				ORDER BY
 				<choose>
-				    <when test="sortDv == 'subsvcGnrAsc'">
+					<when test="sortDv == 'subsvcGnrAsc'">
 						GS.SUBSVC_NM ASC, SUBSVC_GNR ASC,
 					</when>
-				    <otherwise>
+					<otherwise>
 						GS.SUBSVC_NM DESC, SUBSVC_GNR DESC,
 					</otherwise>
 				</choose>
@@ -262,7 +262,7 @@
 				  , USE_AT
 				  , REGUSR
 				  , REGIST_DT)
-		VALUES    (#{sopmalCd}
+		VALUES	(#{sopmalCd}
 				, #{subsvcNm}
 				, #{subPd}
 				, #{subsvcGnr}
@@ -314,29 +314,29 @@
 	</select>
 	
 
-    <!-- 구독서비스 주문에 따른 판매재고수량 수정 -->
-    <update id="updateSubsvcOrdrUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
-        <![CDATA[
-            UPDATE GC_SUBSVC GS
-                INNER JOIN (
-                    SELECT
-                        GO.SUBSVC_INNB,
-                        COUNT(*) AS ORDR_QY
-                    FROM GC_ORDER GO
-                    WHERE GO.SOPMAL_CD = #{sopmalCd}
-                      AND GO.ORDR_INNB = #{ordrInnb}
-                    GROUP BY
-                        GO.SUBSVC_INNB
-                ) SUBQUERY
-                ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
-            SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) + SUBQUERY.ORDR_QY
-            WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
-        ]]>
-    </update>
+	<!-- 구독서비스 주문에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcOrdrUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						COUNT(*) AS ORDR_QY
+					FROM GC_ORDER GO
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) + SUBQUERY.ORDR_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
 
 	<!-- 구독서비스 환불에 따른 판매재고수량 수정 -->
 	<update id="updateSubsvcRefundUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
-        <![CDATA[
+		<![CDATA[
 			UPDATE GC_SUBSVC GS
 				INNER JOIN (
 					SELECT
@@ -350,15 +350,35 @@
 					GROUP BY
 						GO.SUBSVC_INNB
 				) SUBQUERY
-			ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
-				SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.REFUND_QY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.REFUND_QY
 			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
 		]]>
-    </update>
+	</update>
+
+	<!-- 구독서비스 주문무효에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcCancelOrderUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						COUNT(*) AS ORDR_QY
+					FROM GC_ORDER GO
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.ORDR_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
 
 	<!-- 판매재고수량 변경에 따른 구독서비스 상태 수정 -->
 	<update id="updateInvntryPolicySubsvcSttusChng" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
-        <![CDATA[
+		<![CDATA[
 			UPDATE GC_SUBSVC
 			SET SUBSVC_STTUS_CD =
 				CASE
@@ -376,5 +396,5 @@
 			  AND SOPMAL_CD = #{sopmalCd}
 			  AND USE_AT = 'Y'
 		]]>
-    </update>
+	</update>
 </mapper>