Merge branch 'style' into develop

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

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

@@ -16,7 +16,7 @@ import com.style24.persistence.domain.Payment;
  */
 @ShopDs
 public interface TscOrderChangeDao {
-	
+
 	/**
 	 * 주문변경대상목록 조회(취소, 반품, 교환)
 	 *
@@ -26,7 +26,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 16
 	 */
 	List<Order> getCancelRequestTargetList(Order order);
-	
+
 	/**
 	 * 주문변경대상목록 조회(취소, 반품, 교환) 2
 	 *
@@ -36,7 +36,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 24
 	 */
 	List<Order> getCancelRequestTargetList2(Order order);
-	
+
 	/**
 	 * 주문변경신청목록 조회 (취소, 반품, 교환)
 	 *
@@ -46,7 +46,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 16
 	 */
 	List<Order> getOrderChangeDetailList(Order order);
-	
+
 	/**
 	 * 주문상세단품정보 수정
 	 *
@@ -56,7 +56,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int updateOrderDetailItem(Order order);
-	
+
 	/**
 	 * 2021.08.20 주문상세단품정보(교환결제완료용) 수정
 	 *
@@ -76,7 +76,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 07
 	 */
 	int updateOrderDetailItemForExchange(Order order);
-	
+
 	/**
 	 * 주문상세단품이력정보 등록
 	 *
@@ -86,7 +86,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createOrderDetailItemHst(Order order);
-	
+
 	/**
 	 * 상품옵션재고정보 등록
 	 *
@@ -96,7 +96,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 01. 22
 	 */
 	int createSellQty(OrderChange orderChange);
-	
+
 	/**
 	 * 주문변경정보 등록
 	 *
@@ -106,7 +106,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createOrderChange(OrderChange orderChange);
-	
+
 	/**
 	 * 주문변경상세정보 등록
 	 *
@@ -126,7 +126,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createOrderChangeDetailHst(OrderChange orderChange);
-	
+
 	/**
 	 * 주문상세정보 수정
 	 *
@@ -156,7 +156,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createPayment(Order order);
-	
+
 	/**
 	 * 주문환불정보 등록
 	 *
@@ -166,7 +166,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int createRefund(Order order);
-	
+
 	/**
 	 * 주문추가배송금액 등록
 	 *
@@ -186,7 +186,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 01
 	 */
 	int updateDeliveryFee(Order order);
-	
+
 	/**
 	 * 주문사은품전체취소
 	 *
@@ -196,7 +196,7 @@ public interface TscOrderChangeDao {
 	 * @since 2020. 12. 22
 	 */
 	int updateOrdFreegiftDel(Order order);
-	
+
 	/**
 	 * 주문상세이력정보등록 취소신청철회
 	 *
@@ -206,7 +206,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 01. 26
 	 */
 	int createOrderDtlHstCancel(Order order);
-	
+
 	/**
 	 * 주문변경상세정보 수정(취소신청 철회)
 	 *
@@ -246,7 +246,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 01. 05
 	 */
 	int saveRefundAccount(Order order);
-	
+
 	/**
 	 * 고객환불계좌정보 존재유무
 	 *
@@ -256,7 +256,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 21
 	 */
 	int getCustAccountChk(Order order);
-	
+
 	/**
 	 * 고객환불계좌정보 수정
 	 *
@@ -267,6 +267,14 @@ public interface TscOrderChangeDao {
 	 */
 	int updateRefundAccount(Order order);
 
+	/**
+	 * 고객환불계좌정보 삭제
+	 * @param custNo - 고객번호
+	 * @author gagamel
+	 * @since 2021. 11. 19
+	 */
+	void deleteRefundAccount(Integer custNo);
+
 	/**
 	 * 주문상세정보 생성
 	 *
@@ -636,7 +644,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 04. 22
 	 */
 	int getLeftAmt(int ordNo);
-	
+
 	/**
 	 * 입점업체 클레임 주문변경상태변경
 	 *
@@ -646,7 +654,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 17
 	 */
 	int updateOrderChangeDtlForSeller(Order order);
-	
+
 	/**
 	 * 입점업체 클레임 주문변경요청정보변경
 	 *
@@ -656,7 +664,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 17
 	 */
 	int updateOrderChangeForSeller(Order order);
-	
+
 	/**
 	 * 입점업체 클레임 주문변경상세정보조회
 	 *
@@ -666,7 +674,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 17
 	 */
 	Collection<Order> getWithdrawInfoForSeller(Order order);
-	
+
 	/**
 	 * 회수정보마스터등록
 	 *
@@ -676,7 +684,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 17
 	 */
 	int insertTbWithdraw(Order order);
-	
+
 	/**
 	 * 회수정보상세등록(단품단위)
 	 *
@@ -686,8 +694,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 17
 	 */
 	int insertTbWithdrawDetail(Order order);
-	
-	
+
 	/**
 	 * 주문변경 요청메모 수정
 	 *
@@ -727,7 +734,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 24
 	 */
 	int updateOrderChangeDtl(OrderChange orderChange);
-	
+
 	/**
 	 * 주문취소시 주문상세단품정보등록을 정보 조회
 	 *
@@ -737,7 +744,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021.05.26
 	 */
 	Collection<Order> getOrderDetailItemForCnclRtn(Order order);
-	
+
 	/**
 	 * 반품 배송비 마이너스처리
 	 *
@@ -747,7 +754,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 31
 	 */
 	int insertTbDeliveryFeeMinus(OrderChange orderChange);
-	
+
 	/**
 	 * 착불비 반품배송비로 처리 
 	 *
@@ -756,8 +763,8 @@ public interface TscOrderChangeDao {
 	 * @author moon
 	 * @since 2021. 06. 02
 	 */
-	int insertTbDeliveryFeeCodFee(OrderChange orderChange);	
-	
+	int insertTbDeliveryFeeCodFee(OrderChange orderChange);
+
 	/**
 	 * 환불금액 배송비 포함 변경
 	 *
@@ -766,8 +773,8 @@ public interface TscOrderChangeDao {
 	 * @author moon
 	 * @since 2021. 05. 31
 	 */
-	int updateRefundChange(OrderChange orderChange);	
-	
+	int updateRefundChange(OrderChange orderChange);
+
 	/**
 	 * 동봉비, 착불비 업데이트 
 	 *
@@ -857,7 +864,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 06. 09
 	 */
 	Collection<OrderChange> getCancelFreeGiftList(OrderChange orderChange);
-	
+
 	/**
 	 * 교환출고 재고부족 취소처리
 	 *
@@ -867,7 +874,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 06. 15
 	 */
 	int updateExchangeDelvFailCnclYn(Order order);
-	
+
 	/**
 	 * 교환 주문상세정보 수정
 	 *
@@ -875,9 +882,8 @@ public interface TscOrderChangeDao {
 	 * @return
 	 * @author moon
 	 * @since 2021. 06. 14
-	 */	
+	 */
 	int updateChgOrderDetailTemp(Order order);
-	
 
 	/**
 	 * 교환 주문상세단품정보 수정
@@ -886,9 +892,9 @@ public interface TscOrderChangeDao {
 	 * @return
 	 * @author moon
 	 * @since 2021. 06. 14
-	 */	
-	int updateChgOrderDetailItemTemp(Order order);	
-	
+	 */
+	int updateChgOrderDetailItemTemp(Order order);
+
 	/**
 	 * 교환배송실패 변경요청단위 전체취소 여부
 	 *
@@ -898,7 +904,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 01. 28
 	 */
 	int getExchangeDelvFailQty(OrderChange orderChange);
-	
+
 	/**
 	 * 추가배송비 취소 처리 (부분취소)
 	 *
@@ -938,7 +944,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 06. 28
 	 */
 	Collection<Order> getNonArrivalInfo(Order order);
-	
+
 	/**
 	 * 주문변경신청 완료 정보 조회(취소,반품)
 	 * 
@@ -957,7 +963,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 05
 	 */
 	Collection<OrderChange> getOrderRecallExceptionInfo(OrderChange param);
-	
+
 	/**
 	 * 현재결제금액조회
 	 *
@@ -967,7 +973,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 07
 	 */
 	int getPaymentPayamt(Payment payment);
-	
+
 	/**
 	 * 환불컨펌시 배송중상태 조회 
 	 *
@@ -977,7 +983,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 07
 	 */
 	int getOrderDetailItem20Cnt(Order param);
-	
+
 	/**
 	 * 환불컨펌시 배송중상태 조회 전체취소
 	 *
@@ -1027,7 +1033,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 07. 19
 	 */
 	Collection<Order> getRtnLocInfo(Order order);
-	
+
 	/**
 	 * 교환상품 출고예외등록
 	 *
@@ -1107,7 +1113,7 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 09. 07
 	 */
 	Collection<Order> getReturnOrderInfo(Order order);
-	
+
 	/**
 	 * 2021.11.15 회수컨펌 변경요청사유 변경
 	 *

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

@@ -26,13 +26,12 @@ public class CustAccount extends TscBaseDomain {
 	private String delYn;				// 삭제여부
 	private String ipAddress;			// IP주소
 
-
 	public String getAccountNo() {
 		this.accountNo = CryptoUtils.decryptAES(this.accountNo);
 		return this.accountNo;
 	}
 
-	public void encryptData () {
+	public void encryptData() {
 		this.encodedAccountNo = CryptoUtils.encryptAES(this.accountNo);
 	}
 }

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

@@ -164,9 +164,9 @@
 		     , SECEDE_DT
 		     , RM_DORMANT_DT
 		     , BIRTH_MM
-		     , BANK_CD
-		     , ACCOUNT_NO
-		     , ACCOUNT_NM
+		     -- , BANK_CD
+		     -- , ACCOUNT_NO
+		     -- , ACCOUNT_NM
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -213,15 +213,15 @@
 		     , C.SECEDE_DT
 		     , C.RM_DORMANT_DT
 		     , C.BIRTH_MM
-		     , CA.BANK_CD
-		     , CA.ACCOUNT_NO
-		     , CA.ACCOUNT_NM
+		     -- , CA.BANK_CD
+		     -- , CA.ACCOUNT_NO
+		     -- , CA.ACCOUNT_NM
 		     , #{regNo}   AS REG_NO
 		     , NOW()      AS REG_DT
 		     , C.UPD_NO
 		     , C.UPD_DT
 		FROM   TB_CUSTOMER C
-		LEFT   OUTER JOIN TB_CUST_ACCOUNT CA ON C.CUST_NO = CA.CUST_NO
+		-- LEFT OUTER JOIN TB_CUST_ACCOUNT CA ON C.CUST_NO = CA.CUST_NO
 		WHERE  C.CUST_NO = #{custNo}
 	</insert>
 
@@ -494,15 +494,15 @@
 		     , CA.DEL_YN
 		     , CASE WHEN CA.CUST_NO = CA.REG_NO THEN CONCAT(C.CUST_ID,'/',FN_DEC_AES(C.CUST_NM))
 		            ELSE (SELECT CONCAT(USER_ID,'/',USER_NM)
-		                    FROM   TB_USER
-		                   WHERE  USER_NO = CA.REG_NO
-		            )
+		                  FROM   TB_USER
+		                  WHERE  USER_NO = CA.REG_NO
+		                 )
 		       END                                        AS REG_NM
 		     , DATE_FORMAT(CA.REG_DT,'%Y-%m-%d %H:%i:%S') AS REG_DT
-		  FROM TB_CUST_ACCOUNT CA
+		FROM   TB_CUST_ACCOUNT CA
 		     , TB_CUSTOMER C
-		 WHERE CA.CUST_NO = C.CUST_NO
-		   AND CA.CUST_NO = #{custNo}
+		WHERE  CA.CUST_NO = C.CUST_NO
+		AND    CA.CUST_NO = #{custNo}
 	</select>
 
 	<!--고객계좌 번호 업데이트 전 초기화-->

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

@@ -1276,6 +1276,13 @@
 		AND    CA.CUST_NO = #{custNo}
 	</update>
 	
+	<!-- 고객환불계좌정보 삭제 -->
+	<delete id="deleteRefundAccount" parameterType="Integer">
+		/* OrderChange.deleteRefundAccount */
+		DELETE FROM TB_CUST_ACCOUNT
+		WHERE  CUST_NO = #{custNo}
+	</delete>
+	
 	<!-- 주문변경상세정보 취소신청철회 -->
 	<update id="updateOrderChangeDtlCancel" parameterType="Order">
 		/* OrderChange.updateOrderChangeDtlCancel */
@@ -4524,7 +4531,7 @@
 		 INNER JOIN TB_PAYMENT P
 		    ON P.ORD_CHG_SQ = DF.ORD_CHG_SQ
 		   AND P.PAY_STAT = 'G016_30'
-		   AND DF.DLEV_FEE_GB = 'G018_30'
+		   AND DF.DELV_FEE_GB = 'G018_30'
 		   AND P.PAY_GB = 'D'
 		 WHERE DF.ORD_CHG_SQ = #{ordChgSq}
 	</insert>