Merge remote-tracking branch '112.172.147.34/style' into 제휴검색기능

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 회수컨펌 변경요청사유 변경
 	 *
@@ -1117,4 +1123,23 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 05. 31
 	 */
 	int updateOrderChangeChgReason(OrderChange orderChange);
+
+	/** 최초 주문상세 번호 조회
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 11. 18
+	 */
+	int getFirstOrdDtlNo(Order order);
+
+	/**
+	 * 최초주문상세번호 기준 상품쿠폰 할인액 조회
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 11. 19
+	 */
+	int getGoodsCpnDcAmt(Order order);
 }

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

@@ -369,4 +369,13 @@ public interface TscOrderOcmDao {
 	 */
 	void createOrderMemo(ExtmallOrder extmallOrder);
 
+	/**
+	 * 주문상세 최초주문상세번호 수정
+	 *
+	 * @param ExtmallOrder
+	 * @return int
+	 * @author card007
+	 * @since 2021. 11. 18
+	 */
+	int updateOrderDetail(ExtmallOrder extmallOrder);
 }

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

@@ -118,6 +118,7 @@ public class TscOrderOcmService {
 
 					// TODO 총알배송, 구매대행상품여부 체크
 					orderOcmDao.createOrderDetail(orderDetail); // 주문상세정보등록
+					orderOcmDao.updateOrderDetail(orderDetail); // 최초주문상세번호 수정
                     orderOcmDao.createOrderDetailHst(orderDetail); // 주문상세이력정보등록
 
                     Collection<ExtmallOrder> orderDetailItemList = orderOcmDao.getOrderDetailItem(orderDetail); // 주문상세단품정보조회

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

@@ -20,6 +20,7 @@ import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.dao.TscNaverPayDao;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.dao.TscOrderDao;
+import com.style24.core.biz.dao.TscPointDao;
 import com.style24.core.biz.dao.TscScmDao;
 import com.style24.core.biz.thirdparty.SsgKakaoSender;
 import com.style24.core.support.env.TscConstants;
@@ -88,6 +89,9 @@ public class TscOrderService {
 	@Autowired
 	private SsgKakaoSender kakaoSender;
 
+	@Autowired
+	private TscPointDao pointDao;
+
 	/**
 	 * 주문목록 카운트
 	 * @param Order
@@ -3069,7 +3073,8 @@ public class TscOrderService {
 				
 				for (Order withdrawVo : withdrawConfirmList) {
 					for (Order vo : cancelOrderRefundList) {
-						
+						Integer custNo = 0;
+
 						// 회수컨펌상세번호 == 취소상세번호가 같을때 동작
 						if (withdrawVo.getOrdDtlNo().equals(vo.getOrdDtlNo())) {
 							vo.setRegNo(userNo);
@@ -3081,19 +3086,59 @@ public class TscOrderService {
 							
 							// 원주문 주문상세이력 등록
 							orderDao.createOrderDetailHst(vo);
+
+							// 2021.11.19 card007 적립예정포인트 차감 후 신규 로우 생성
+							int savePntAmt = vo.getSavePntAmt();
+							if (savePntAmt > 0) {
+								vo.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT.value());
+								vo.setFirstOrdDtlNo(vo.getOrdDtlNo());
+
+								for (Order point : orderChangeDao.getCustPointHst(vo)) {
+									point.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT_CANCEL.value());
+									point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_EXPECT.value());
+									point.setOccurDtlDesc("예정포인트적립취소");
+									point.setPntAmt(savePntAmt * -1);
+									point.setRegNo(userNo);
+									point.setUpdNo(userNo);
+
+									// 적립예정포인트 차감
+									orderChangeDao.createCustPointHstRollback(point);
+
+									custNo = point.getCustNo();
+								}
+							}
 							
 							// 원주문 주문상세단품 데이타 등록
 							insertOrderDetailItem(vo, userNo, ordChgSq);
 							
 							// 교환주문 주문상세정보 등록
 							// 교환주문 상세 수정
+							Integer exchangeOrdDtlNo = withdrawVo.getExchangeOrdDtlNo();
 							vo.setOrdDtlStat(OrderDetailStat.PAYMENT_COMPLETE.value()); // 교환주문상세 결제완료
-							vo.setOrdDtlNo(withdrawVo.getExchangeOrdDtlNo());
+							vo.setOrdDtlNo(exchangeOrdDtlNo);
 							vo.setWdBfSendYn("N");
 							orderChangeDao.updateChgOrderDetailTemp(vo);
 							
 							// 교환주문 주문상세이력 등록
 							orderDao.createOrderDetailHst(vo);
+
+							// 2021.11.19 card007 적립예정포인트 차감 후 신규 로우 생성
+							if (custNo > 0 && savePntAmt > 0 && exchangeOrdDtlNo > 0) {
+								// 적립예정포인트 신규 로우 생성
+								Point point = new Point();
+								point.setCustNo(custNo);
+								point.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT.value());
+								point.setOccurDtlDesc("예정포인트적립");
+								point.setPntAmt(savePntAmt);
+								point.setCustPntSq(0);
+								point.setOrdNo(ordNo);
+								point.setOrdDtlNo(exchangeOrdDtlNo);
+								point.setReviewSq(0);
+								point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_EXPECT.value());
+								point.setRegNo(userNo);
+								point.setUpdNo(userNo);
+								pointDao.createCustomerPointHst(point);
+							}
 							
 							// 교환주문 주문상세단품 데이타 등록
 							insertOrderDetailItem(vo, userNo, ordChgSq);

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

@@ -18,6 +18,7 @@ public class CustAccount extends TscBaseDomain {
 	private Integer custNo;				// 고객번호
 	private Integer ordNo;				// 주문번호
 	private String bankCd;				// 은행코드(공통코드G940)
+	private String bankNm;				// 은행명
 	private String accountNo;			// 계좌번호
 	private String encodedAccountNo;	// 계좌번호 암호화
 	private String accountNm;			// 예금주명
@@ -25,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/domain/Order.java

@@ -54,6 +54,7 @@ public class Order extends TscBaseDomain {
 	private String ordExchGb;						// 결제, 교환 구분 (O, E)
 	private String ordDtlStat;						// 주문상세상태
 	private int orgOrdDtlNo;						// 실제주문상세번호(교환)
+	private int firstOrdDtlNo;						// 최초주문상세번호
 	private String supplyCompCd;					// 공급업체코드
 	private String goodsCd;							// 상품코드
 	private String formalGb;						// 정상,이월구분

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

@@ -36,6 +36,7 @@ public class OrderChange extends TscBaseDomain {
 	private String delvFeeCd;
 	private String delvFeeCdGrp;
 	private Integer delvAddrSq;
+	private int firstOrdDtlNo;
 	
 	private Integer ordChgSq;
 	private String chgGb;

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

@@ -164,58 +164,65 @@
 		     , SECEDE_DT
 		     , RM_DORMANT_DT
 		     , BIRTH_MM
+		     -- , BANK_CD
+		     -- , ACCOUNT_NO
+		     -- , ACCOUNT_NM
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
 		     , UPD_DT
 		)
-		SELECT CUST_NO
-		     , CUST_ID
-		     , CUST_NM
-		     , PASSWD
-		     , BIRTH_YMD
-		     , SEX_GB
-		     , CELL_PHNNO
-		     , APP_AGREE_YN
-		     , APP_AGREE_DT
-		     , SMS_AGREE_YN
-		     , SMS_AGREE_DT
-		     , EMAIL
-		     , EMAIL_AGREE_YN
-		     , EMAIL_AGREE_DT
-		     , MK_AGREE_YN
-		     , MK_AGREE_DT
-		     , HOME_ZIPCODE
-		     , HOME_BASE_ADDR
-		     , HOME_DTL_ADDR
-		     , SITE_CD
-		     , FRONT_GB
-		     , AF_LINK_CD
-		     , CUST_GB
-		     , CUST_GRADE
-		     , JOIN_DT
-		     , FOREIGNER_YN
-		     , CUST_STAT
-		     , PASSWD_CHG_DT
-		     , TEMP_PASSWD_YN
-		     , LOGIN_LDT
-		     , CI
-		     , AUTH_DT
-		     , SNS_TYPE
-		     , MANAGED_RSN
-		     , MANAGED_DTL_RSN
-		     , MANAGED_DT
-		     , SECEDE_RSN
-		     , SECEDE_DTL_RSN
-		     , SECEDE_DT
-		     , RM_DORMANT_DT
-		     , BIRTH_MM
+		SELECT C.CUST_NO
+		     , C.CUST_ID
+		     , C.CUST_NM
+		     , C.PASSWD
+		     , C.BIRTH_YMD
+		     , C.SEX_GB
+		     , C.CELL_PHNNO
+		     , C.APP_AGREE_YN
+		     , C.APP_AGREE_DT
+		     , C.SMS_AGREE_YN
+		     , C.SMS_AGREE_DT
+		     , C.EMAIL
+		     , C.EMAIL_AGREE_YN
+		     , C.EMAIL_AGREE_DT
+		     , C.MK_AGREE_YN
+		     , C.MK_AGREE_DT
+		     , C.HOME_ZIPCODE
+		     , C.HOME_BASE_ADDR
+		     , C.HOME_DTL_ADDR
+		     , C.SITE_CD
+		     , C.FRONT_GB
+		     , C.AF_LINK_CD
+		     , C.CUST_GB
+		     , C.CUST_GRADE
+		     , C.JOIN_DT
+		     , C.FOREIGNER_YN
+		     , C.CUST_STAT
+		     , C.PASSWD_CHG_DT
+		     , C.TEMP_PASSWD_YN
+		     , C.LOGIN_LDT
+		     , C.CI
+		     , C.AUTH_DT
+		     , C.SNS_TYPE
+		     , C.MANAGED_RSN
+		     , C.MANAGED_DTL_RSN
+		     , C.MANAGED_DT
+		     , C.SECEDE_RSN
+		     , C.SECEDE_DTL_RSN
+		     , C.SECEDE_DT
+		     , C.RM_DORMANT_DT
+		     , C.BIRTH_MM
+		     -- , CA.BANK_CD
+		     -- , CA.ACCOUNT_NO
+		     -- , CA.ACCOUNT_NM
 		     , #{regNo}   AS REG_NO
 		     , NOW()      AS REG_DT
-		     , UPD_NO
-		     , UPD_DT
-		FROM   TB_CUSTOMER
-		WHERE  CUST_NO = #{custNo}
+		     , C.UPD_NO
+		     , C.UPD_DT
+		FROM   TB_CUSTOMER C
+		-- LEFT OUTER JOIN TB_CUST_ACCOUNT CA ON C.CUST_NO = CA.CUST_NO
+		WHERE  C.CUST_NO = #{custNo}
 	</insert>
 
 	<!-- 회원 비밀번호 수정(임시비밀번호)-->
@@ -477,15 +484,25 @@
 	<!--고객계좌정보-->
 	<select id="getCustomerAccuontInfo" parameterType="CustAccount" resultType="CustAccount">
 		/* TscCustomer.getCustomerAccuontInfo */
-		SELECT  CUST_ACCOUNT_SQ
-		      , CUST_NO
-		      , BANK_CD
-		      , ACCOUNT_NO
-		      , ACCOUNT_NM
-		      , DEFAULT_YN
-		      , DEL_YN
-		FROM   TB_CUST_ACCOUNT
-		WHERE  CUST_NO = #{custNo}
+		SELECT CA.CUST_ACCOUNT_SQ
+		     , CA.CUST_NO
+		     , CA.BANK_CD
+		     , FN_GET_CODE_NM('G940',CA.BANK_CD)          AS BANK_NM
+		     , CA.ACCOUNT_NO
+		     , CA.ACCOUNT_NM
+		     , CA.DEFAULT_YN
+		     , 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
+		                 )
+		       END                                        AS REG_NM
+		     , DATE_FORMAT(CA.REG_DT,'%Y-%m-%d %H:%i:%S') AS REG_DT
+		FROM   TB_CUST_ACCOUNT CA
+		     , TB_CUSTOMER C
+		WHERE  CA.CUST_NO = C.CUST_NO
+		AND    CA.CUST_NO = #{custNo}
 	</select>
 
 	<!--고객계좌 번호 업데이트 전 초기화-->

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

@@ -37,10 +37,11 @@
 	<update id="updateNpayOrdDtlNo" parameterType="Order">
 		/* TsbNaverPay.updateNpayOrdDtlNo : 네이버페이 상품주문번호(주문상세번호) 등록 */
 		UPDATE TB_ORDER_DETAIL SET
-		       NPAY_ORD_DTL_NO = #{npayOrdDtlNo}
-		     , ORD_DTL_STAT    = #{ordDtlStat}
-		     , UPD_NO          = 0
-		     , UPD_DT          = NOW()
+		       NPAY_ORD_DTL_NO  = #{npayOrdDtlNo}
+		     , FIRST_ORD_DTL_NO = ORD_DTL_NO
+		     , ORD_DTL_STAT     = #{ordDtlStat}
+		     , UPD_NO           = 0
+		     , UPD_DT           = NOW()
 		WHERE  ORD_DTL_NO = #{ordDtlNo}
 		AND    IFNULL(NPAY_ORD_DTL_NO, 0) = 0
 	</update>

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

@@ -4167,6 +4167,7 @@
 	<update id="updateOrderDetail" parameterType="Order">
 		UPDATE TB_ORDER_DETAIL
 		SET    ORD_DTL_STAT = #{ordDtlStat}
+		     , FIRST_ORD_DTL_NO = ORD_DTL_NO
 		     , UPD_NO = #{custNo}
 		     , UPD_DT = NOW()
 		WHERE  1=1

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 */
@@ -1455,6 +1462,7 @@
 		     , ORD_EXCH_GB
 		     , ORD_DTL_STAT
 		     , ORG_ORD_DTL_NO
+		     , FIRST_ORD_DTL_NO
 		     , SUPPLY_COMP_CD
 		     , GOODS_CD
 		     , FORMAL_GB
@@ -1527,6 +1535,7 @@
 		     , 'E'
 		     , #{ordDtlStat}
 		     , ORD_DTL_NO
+		     , FIRST_ORD_DTL_NO
 		     , SUPPLY_COMP_CD
 		     , GOODS_CD
 		     , FORMAL_GB
@@ -2548,8 +2557,8 @@
 		     , UPD_DT
 		  FROM TB_CUST_POINT_HST
 		 WHERE ORD_NO = #{ordNo}
-		<if test="ordDtlNo != null and ordDtlNo != ''">
-		   AND ORD_DTL_NO = #{ordDtlNo}
+		<if test="firstOrdDtlNo != null and firstOrdDtlNo != ''">
+		   AND ORD_DTL_NO = #{firstOrdDtlNo}
 		</if>
 		   AND OCCUR_GB = #{occurGb}
 		 ORDER BY CUST_PNT_SQ
@@ -2583,9 +2592,25 @@
 		     , CPH.ORD_NO
 		     , CPH.ORD_DTL_NO
 		     , CPH.REVIEW_SQ
-		     , NOW()
+		     ,
+		<choose>
+			<when test="occurGb == 'G069_13'">
+		       NULL
+			</when>
+			<otherwise>
+		       NOW()
+			</otherwise>
+		</choose>
 		     , #{pntUploadStat}
-		     , NOW()
+		     ,
+		<choose>
+			<when test="occurGb == 'G069_13'">
+		       NULL
+			</when>
+			<otherwise>
+		       NOW()
+			</otherwise>
+		</choose>
 		     , #{regNo}
 		     , NOW()
 		     , #{updNo}
@@ -2621,8 +2646,8 @@
 		     , CC.UPD_NO = #{updNo}
 		     , CC.UPD_DT = NOW()
 		 WHERE OD.ORD_NO = #{ordNo}
-		<if test="ordDtlNo != null and ordDtlNo != ''">
-		   AND OD.ORD_DTL_NO = #{ordDtlNo}
+		<if test="firstOrdDtlNo != null and firstOrdDtlNo != ''">
+		   AND OD.ORD_DTL_NO = #{firstOrdDtlNo}
 		</if>
 	</update>
 
@@ -2678,8 +2703,8 @@
 		     , UPD_DT
 		  FROM TB_CUST_GIFTCARD_HST
 		 WHERE ORD_NO = #{ordNo}
-		<if test="ordDtlNo != null and ordDtlNo != ''">
-		   AND ORD_DTL_NO = #{ordDtlNo}
+		<if test="firstOrdDtlNo != null and firstOrdDtlNo != ''">
+		   AND ORD_DTL_NO = #{firstOrdDtlNo}
 		</if>
 		   AND OCCUR_GB = 'G074_12'
 		   AND IFNULL(DELV_FEE_SQ, 0) = 0
@@ -5240,7 +5265,24 @@
 		 WHERE 1 = 1
 		   AND ORD_CHG_SQ = #{ordChgSq}
 	</update>
+
+	<!-- 최초 주문상세 번호 조회 -->
+	<select id="getFirstOrdDtlNo" parameterType="Order" resultType="int">
+		/* TscOrderChange.getFirstOrdDtlNo */
+		SELECT CASE WHEN FIRST_ORD_DTL_NO > 0 THEN FIRST_ORD_DTL_NO
+		            ELSE ORD_DTL_NO
+		        END AS FIRST_ORD_DTL_NO
+		  FROM TB_ORDER_DETAIL
+		 WHERE ORD_DTL_NO = #{ordDtlNo}
+	</select>
 	
+	<!-- 최초주문상세번호 기준 상품쿠폰 할인액 조회 -->
+	<select id="getGoodsCpnDcAmt" parameterType="Order" resultType="int">
+		/* TscOrderChange.getGoodsCpnDcAmt */
+		SELECT SUM(GOODS_CPN_DC_AMT) AS GOODS_CPN_DC_AMT
+		  FROM TB_ORDER_DETAIL
+		 WHERE FIRST_ORD_DTL_NO = #{firstOrdDtlNo}
+	</select>
 </mapper>
 
 

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

@@ -1655,4 +1655,11 @@
 		)
 	</insert>
 
+	<!-- 주문상세 최초주문상세번호 수정 -->
+	<update id="updateOrderDetail" parameterType="ExtmallOrder">
+		/* TscOrderOcm.updateOrderDetail */
+		UPDATE TB_ORDER_DETAIL
+		   SET FIRST_ORD_DTL_NO = ORD_DTL_NO
+		 WHERE ORD_DTL_NO = #{ordDtlNo}
+	</update>
 </mapper>