반품TO반품 임시 커밋

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

@@ -858,4 +858,24 @@ public interface TscOrderChangeDao {
 	 * @since 2021. 06. 21
 	 */
 	int createAddDeliveryFeeCancelPart(OrderChange orderChange);
+
+	/**
+	 * 마이페이지 회수지 수정
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 04. 13
+	 */
+	int updateChgerAddr(OrderChange orderChange);
+
+	/**
+	 * 마이페이지 반품메모 수정
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 04. 13
+	 */
+	int updateChgerRtnMemo(OrderChange orderChange);
 }

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

@@ -1030,7 +1030,7 @@ public class TscOrderChangeService {
 				log.info("############# exchangeOrdDtlNo >>> {} ##############", exchangeOrdDtlNo);
 
 				// 6. TB_ORDER_DETAIL_HST 등록
-				//orderChangeDao.createOrderDetailHstForExchange(ordDtl);
+				orderChangeDao.createOrderDetailHstForExchange(ordDtl);
 
 				// 7. TB_ORDER_CHANGE_DETAIL 등록
 				OrderChange orderChangeDetail = new OrderChange();
@@ -1060,7 +1060,7 @@ public class TscOrderChangeService {
 			orderChangeDao.createOrderDetailItemForExchange(ordDtlItem);
 
 			// 9. TB_ORDER_DETAIL_ITEM_HST 등록
-			orderChangeDao.createOrderDetailItemHstForExchange(ordDtlItem);
+			// orderChangeDao.createOrderDetailItemHstForExchange(ordDtlItem);
 		}
 
 		// 10. TB_SELL_QTY 등록
@@ -1138,10 +1138,10 @@ public class TscOrderChangeService {
 		orderChangeDao.createOrderDtlHstCancel(exchangeCancel);
 
 		// 3-3. TB_ORDER_DETAIL_ITEM 상태값 변경
-		// orderChangeDao.updateOrderDetailItemForExchangeCancel(exchangeCancel);
+		orderChangeDao.updateOrderDetailItemForExchangeCancel(exchangeCancel);
 
 		// 3-4. TB_ORDER_DETAIL_ITEM_HST 생성
-		orderChangeDao.createOrderDetailItemHstForExchangeCancel(exchangeCancel);
+		// orderChangeDao.createOrderDetailItemHstForExchangeCancel(exchangeCancel);
 
 		// 3-5. TB_ORDER_CHANGE_DETAIL 상태값 변경 및 DEL_YN Y로 업데이트
 		orderChangeDao.updateOrderChangeDtlCancel(exchangeCancel);
@@ -3944,4 +3944,28 @@ public class TscOrderChangeService {
 	public Payment getPaymentInfo(Payment param) {
 		return orderChangeDao.getPaymentInfo(param);
 	}
+
+	/**
+	 * 마이페이지 회수지 수정
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 04. 13
+	 */
+	public int updateChgerAddr(OrderChange orderChange) {
+		return orderChangeDao.updateChgerAddr(orderChange);
+	}
+
+	/**
+	 * 마이페이지 반품메모 수정
+	 *
+	 * @param OrderChange
+	 * @return int
+	 * @author card007
+	 * @since 2021. 04. 13
+	 */
+	public int updateChgerRtnMemo(OrderChange orderChange) {
+		return orderChangeDao.updateChgerRtnMemo(orderChange);
+	}
 }

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

@@ -599,6 +599,7 @@ public class Order extends TscBaseDomain {
 	private int returnCount;
 	private int confirmCount;
 	private String reviewableYn;
+	private String chgOrdDtlStat;
 
 	// 카카오페이 & 네이버페이
 	private int ordGoodsQty;
@@ -730,6 +731,14 @@ public class Order extends TscBaseDomain {
 	private int dtlItemOrdAmt;
 	
 	private String ordChgGb;
+	private String chgRecipNm;				// 교환상품 수령자명
+	private String chgRecipEmail;			// 교환상품 수령자이메일
+	private String chgRecipZipcode;			// 교환상품 수령자우편번호
+	private String chgRecipBaseAddr;		// 교환상품 수령자기본주소
+	private String chgRecipDtlAddr;			// 교환상품 수령자상세주소
+	private String chgRecipPhnno;			// 교환상품 수령자핸드폰번호
+	private String chgRecipTelno;			// 교환상품 수령자전화번호
+	private String chgDelvMemo;				// 교환상품 배송메모
 
 	// 네이버페이 주문형
 	private String stdt;

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

@@ -212,6 +212,14 @@ public class OrderChange extends TscBaseDomain {
 	private String chgOptCd1;						// 교환상품옵션1
 	private String cardNm;							// 카드명
 	private String cardMips;						// 카드할부
+	private String chgRecipNm;						// 교환상품 수령자명
+	private String chgRecipEmail;					// 교환상품 수령자이메일
+	private String chgRecipZipcode;					// 교환상품 수령자우편번호
+	private String chgRecipBaseAddr;				// 교환상품 수령자기본주소
+	private String chgRecipDtlAddr;					// 교환상품 수령자상세주소
+	private String chgRecipPhnno;					// 교환상품 수령자핸드폰번호
+	private String chgRecipTelno;					// 교환상품 수령자전화번호
+	private String chgDelvMemo;						// 교환상품 배송메모
 
 	private String batchYn;							// 배치여부
 	

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

@@ -1882,6 +1882,8 @@
 		     , OC.CHG_GB
 		     , OCD.CHG_QTY
 		     , OD.ORD_DTL_NO
+		     , OD.ORD_DTL_STAT
+		     , OD.DELV_ADDR_SQ
 		     , ODI.ITEM_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
@@ -1909,9 +1911,9 @@
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
 		 INNER JOIN TB_ORDER_DETAIL OD
-		    ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+		    ON OCD.CHG_ORD_DTL_NO = OD.ORD_DTL_NO
 		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		    ON OCD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		    ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		 INNER JOIN TB_DELIVERY_ADDR DA
 		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
 		 WHERE OC.ORD_CHG_SQ = #{ordChgSq}
@@ -4310,7 +4312,31 @@
 		   AND P.PAY_GB = 'D'
 		 WHERE DF.ORD_CHG_SQ = #{ordChgSq}
 	</insert>
-	
+
+	<!-- 마이페이지 회수지 수정 -->
+	<update id="updateChgerAddr" parameterType="OrderChange">
+		/* TscOrderChange.updateChgerAddr */
+		UPDATE TB_ORDER_CHANGE
+		   SET CHGER_NM = #{chgerNm}
+			 , CHGER_PHNNO = #{chgerPhnno}
+			 , CHGER_ZIPCODE = #{chgerZipcode}
+			 , CHGER_BASE_ADDR = #{chgerBaseAddr}
+			 , CHGER_DTL_ADDR = #{chgerDtlAddr}
+			 , CHGER_RTN_MEMO = #{chgerRtnMemo}
+			 , UPD_NO = #{updNo}
+			 , UPD_DT = NOW()
+		 WHERE ORD_CHG_SQ = #{ordChgSq}
+	</update>
+
+	<!-- 마이페이지 반품메모 수정 -->
+	<update id="updateChgerRtnMemo" parameterType="OrderChange">
+		/* TscOrderChange.updateChgerRtnMemo */
+		UPDATE TB_ORDER_CHANGE
+		   SET CHGER_RTN_MEMO = #{chgerRtnMemo}
+			 , UPD_NO = #{updNo}
+			 , UPD_DT = NOW()
+		 WHERE ORD_CHG_SQ = #{ordChgSq}
+	</update>
 </mapper>