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">
ORDER BY
-
+
GS.SUBSVC_NM ASC, SUBSVC_GNR ASC,
-
+
GS.SUBSVC_NM DESC, SUBSVC_GNR DESC,
@@ -262,7 +262,7 @@
, USE_AT
, REGUSR
, REGIST_DT)
- VALUES (#{sopmalCd}
+ VALUES (#{sopmalCd}
, #{subsvcNm}
, #{subPd}
, #{subsvcGnr}
@@ -314,29 +314,29 @@
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
-
-
+