마이페이지 모바일 수정

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

@@ -369,7 +369,7 @@ public class TscOrderChangeService {
 						// 3-2-7. 상품권 현금영수증 PG 취소 정보 설정
 						GiftCard giftCardCashReceipts = orderDao.getGiftCardReceiptInfo(ordNo);
 
-						if (StringUtils.isNotBlank(giftCardCashReceipts.getTradeNo())) {
+						if (giftCardCashReceipts != null && StringUtils.isNotBlank(giftCardCashReceipts.getTradeNo())) {
 							giftCardCashReceipts.setModType("STPC");
 							giftCardCashReceipts.setUsGfcdAmt(vo.getGfcdUseAmt());
 							
@@ -2209,7 +2209,6 @@ public class TscOrderChangeService {
 		}
 
 		// 1. 주문변경 및 변경상세 정보 설정
-		List<GiftCard> cashReceiptsList = new ArrayList<>();
 		OrderChange orderChangeDetail = new OrderChange();
 		orderChangeDetail.setOrdNo(ordNo);
 		orderChangeDetail.setChgGb(chgGb);

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

@@ -47,7 +47,8 @@ public class OrderChange extends TscBaseDomain {
 	private String wdStdt;
 	private String wdEddt;
 	private String shipCompCd;
-	
+	private String shipCompNm;
+
 	private int chgQty;
 	private String chgStat;
 	private String chgStatNm;

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

@@ -1866,6 +1866,7 @@
 		/* TscOrderChange.updateOrderDetailForAllCancel */
 		UPDATE TB_ORDER_DETAIL
 		   SET ORD_DTL_STAT = #{ordDtlStat}
+			 , CNCL_RTN_QTY = ORD_QTY
 			 , CNCL_RTN_AMT = ORD_AMT
 			 , CPN1_DC_AMT = 0
 			 , TMTB1_DC_AMT = 0