Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -1545,7 +1545,7 @@ public class TscOrderChangeService {
 				int spanRefundAmt 			= spanRealCnclRtnAmt;
 
 				// 고객사유 : 환불금액계산 = 취소금액 - 추가배송비
-				if ("true".equals(isCustomer)) {
+				if ("true".equals(isCustomer) && "W".equals(wdGb)) {
 					int refundAmt = spanRealCnclRtnAmt - addDelvFee;
 					if (refundAmt < 0) {
 						chgStat = TscConstants.OrderChangeStat.RETURN_WAIT.value();			// 추가배송비 처리 상태값 설정
@@ -1841,7 +1841,7 @@ public class TscOrderChangeService {
 				deliveryFee.setUpdNo(updNo);
 
 				// 반품, 교환 배송비 설정
-				if ("true".equals(excReq.getIsCustomer())) {
+				if (excReq.getIsCustomer()) {
 					rtnDelvFee = order.getRtnDelvFee();
 					excDelvFee = order.getExcDelvFee() - rtnDelvFee;
 					
@@ -1955,7 +1955,7 @@ public class TscOrderChangeService {
 			if (!delvFeeCdList.contains(delvFeeCd)) {
 				int delvFee = 0;
 
-				if ("true".equals(orderChange.getIsCustomer())) {
+				if (orderChange.getIsCustomer()) {
 					delvFee = "W".equals(wdGb) ? order.getExcDelvFee() : order.getRtnDelvFee();
 				}