06.07

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

@@ -3506,6 +3506,7 @@ public class TscOrderChangeService {
 				pg.setPgTid(pgTid);
 				pg.setPayMeans(payMeans);
 				pg.setPartCancelAmt(spanRefundAmt);
+				pg.setOrdChgSq(ordChgSq);
 				// pg.setLeftAmt(orderChangeDao.getLeftAmt(ordNo));
 				pg.setLeftAmt(payAmt);
 				pg.setRegNo(userNo);
@@ -3896,6 +3897,7 @@ public class TscOrderChangeService {
 		pg.setRegNo(regNo);
 		pg.setUpdNo(updNo);
 		pg.setPayStat(TscConstants.PaymentStat.PAYMENT_CANCEL.value());
+		pg.setOrdChgSq(ordChgSq);
 
 		// 상품권으로만 결제 시 PG점프
 		if("G011_10".equals(mallGb)) { // 자사몰일경우

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

@@ -69,7 +69,7 @@ public class TscWmsService {
 			chk1 = "Y";
 		}
 		
-		if(!"".equals(erpRtnList) && erpRtnList != null) {
+		if(erpRtnList != null) {
 			for(ErpStock data : erpRtnList) {
 				WmsDelivery tmp = new WmsDelivery();
 				tmp.setStockLoc(data.getStockLoc());