Merge remote-tracking branch '112.172.147.34/jsh77b' into ST24PRJ-659(휴대폰-취소시-계좌번호-입력화면-오류-문의)

# Conflicts:
#	src/main/java/com/style24/core/biz/dao/TscOrderChangeDao.java
#	src/main/java/com/style24/core/biz/service/TscOrderChangeService.java
#	src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

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

@@ -276,6 +276,16 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 21
 	 */
 	int updateRefundAccount(Order order);
+	
+	/**
+	 * 고객환불계좌정보 수정 (TB_REFUND)
+	 *
+	 * @param order
+	 * @return int
+	 * @author jsh77b
+	 * @since 2021. 12. 27
+	 */
+	int updateTbRefundAccount(Order order);
 
 	/**
 	 * 고객환불계좌정보 삭제

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

@@ -2097,19 +2097,24 @@ public class TscOrderChangeService {
 	 */
 	public Collection<Order> getRefundAccount(Order order) {
 		
-		Collection<Order> refundList = new ArrayList<Order>();
+		// 2021.12.27 환불계좌정보 로직 변경 1순위 : TB_REFUND, TB_CUST_ACCOUNT
+		Collection<Order> orderRfAccountInfo = new ArrayList<Order>();
 		
-		// 2021.12.23 환불계좌조회시 변경번호가 있으면 TB_REFUND 에서 조회 되도록 변경
 		if (order.getOrdChgSq() > 0) {
-			refundList = orderChangeDao.getOrdChgSqRefundAccount(order);
-		} 
+			orderRfAccountInfo = orderChangeDao.getOrdChgSqRefundAccount(order); 
+		}
 		
-		// 환불정보에 등록된 정보가 없으면 고객개인 환불 계좌 정보를 불러옴
-		if (refundList.size() < 1) {
-			refundList = orderChangeDao.getRefundAccount(order);
+		if (orderRfAccountInfo != null && orderRfAccountInfo.size() < 1) {
+			orderRfAccountInfo = orderChangeDao.getRefundAccount(order);
 		}
 		
-		return refundList;
+		if (orderRfAccountInfo != null && orderRfAccountInfo.size() > 0) {
+			if (orderRfAccountInfo.iterator().next().getAccountNm() == null || "".equals(orderRfAccountInfo.iterator().next().getAccountNm())) {
+				orderRfAccountInfo = orderChangeDao.getRefundAccount(order);
+			}
+		}
+		
+		return orderRfAccountInfo;
 	}
 
 	/**
@@ -2133,6 +2138,22 @@ public class TscOrderChangeService {
 		
 		return 1;
 	}
+	
+	/**
+	 * 환불계좌 저장 (TB_REFUND)
+	 *
+	 * @param order - 주문정보
+	 * @return TsaOrder
+	 * @author jsh77b
+	 * @since 2021. 01. 05.
+	 */
+	public int saveTbRefundAccount(Order order) {
+		
+		// 2021.07.21 환불계좌존재하면 수정, 없으면 등록
+		orderChangeDao.updateTbRefundAccount(order);
+		
+		return 1;
+	}
 
 	/**
 	 * 교환 정보 조회

src/main/java/com/style24/persistence/domain/Order.java

@@ -838,7 +838,6 @@ public class Order extends TscBaseDomain {
 	private String cashReceipReqYn;	/*현금영수증신청여부*/
 	private String shotDelvGb;		/*총알배송구분*/
 	
-	
 	private int dcSumAmt;
 	private String addPayCostPayYn;
 	private String addPayCostPgGb;

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

@@ -1307,6 +1307,17 @@
 		AND    CA.CUST_NO = #{custNo}
 	</update>
 	
+	<!-- 고객환불계좌정보 수정 (TB_REFUND) -->
+	<update id="updateTbRefundAccount" parameterType="Order">
+		/* OrderChange.updateTbRefundAccount */
+		UPDATE TB_REFUND RF
+		SET    RA_BANK = #{bankCd}
+		     , RA_NO = #{accountNo}
+		     , RA_NM = #{accountNm}
+		WHERE  1=1
+		AND    RF.ORD_CHG_SQ = #{ordChgSq}
+	</update>
+	
 	<!-- 고객환불계좌정보 삭제 -->
 	<delete id="deleteRefundAccount" parameterType="Integer">
 		/* OrderChange.deleteRefundAccount */