휴대폰-취소시-계좌번호-입력화면-오류-문의

src/main/java/com/style24/core/biz/dao/TscOrderChangeDao.java

@@ -226,6 +226,16 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 01. 04
 	 */
 	Collection<Order> getRefundAccount(Order order);
+	
+	/**
+	 * 주문상세 > 주문취소 > 고객환불계좌정보 조회 (TB_REFUND)
+	 *
+	 * @param order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 12. 23
+	 */
+	Collection<Order> getOrdChgSqRefundAccount(Order order);
 
 	/**
 	 * 주문상세 > 주문취소 > 고객환불계좌정보 중복체크

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -2081,7 +2081,20 @@ public class TscOrderChangeService {
 	 * @since 2021. 01. 04.
 	 */
 	public Collection<Order> getRefundAccount(Order order) {
-		return orderChangeDao.getRefundAccount(order);
+		
+		Collection<Order> refundList = new ArrayList<Order>();
+		
+		// 2021.12.23 환불계좌조회시 변경번호가 있으면 TB_REFUND 에서 조회 되도록 변경
+		if (order.getOrdChgSq() > 0) {
+			refundList = orderChangeDao.getOrdChgSqRefundAccount(order);
+		} 
+		
+		// 환불정보에 등록된 정보가 없으면 고객개인 환불 계좌 정보를 불러옴
+		if (refundList.size() < 1) {
+			refundList = orderChangeDao.getRefundAccount(order);
+		}
+		
+		return refundList;
 	}
 
 	/**

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -1224,6 +1224,27 @@
 		  ) Z
 	</select>
 	
+	<!-- 주문상세 > 주문취소 > 고객환불계좌정보 조회 (tb_refund) -->
+	<select id="getOrdChgSqRefundAccount" parameterType="Order" resultType="Order">
+		/* OrderChange.getOrdChgSqRefundAccount */
+		SELECT Z.ACCOUNT_NO
+		     , Z.ACCOUNT_NM
+		     , Z.BANK_CD
+		     , FN_GET_CODE_NM('G940', Z.BANK_CD) AS BANK_NM
+		     , Z.DEFAULT_YN
+		     , Z.REG_DT
+		  FROM (
+		      SELECT RF.RA_NO AS ACCOUNT_NO
+		           , RF.RA_NM AS ACCOUNT_NM
+		           , RF.RA_BANK AS BANK_CD
+		           , 'N' AS DEFAULT_YN
+		           , RF.REG_DT
+		        FROM TB_REFUND RF 
+		       WHERE 1 = 1
+		         AND RF.ORD_CHG_SQ = #{ordChgSq}
+		  ) Z
+	</select>
+	
 	<!-- 주문상세 > 주문취소 > 고객환불계좌정보 중복체크 -->
 	<select id="getRefundAccountCheck" parameterType="Order" resultType="int">
 		/* OrderChange.getRefundAccountCheck */