Merge remote-tracking branch 'origin/order' into xodud1202

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

@@ -788,7 +788,6 @@ public class TscOrderService {
 	public Collection<Order> getCartCpnApplyList(Collection<Order> tmtbGoodsApplyList, Collection<Order> cartCpnAllList) {
 		Collection<Order> cartApplyCpnList = new ArrayList<Order>();
 		
-		
 		// 1. 쿠폰대상이 있는 상품만 정리
 		for (Order cartCpn : cartCpnAllList) {
 			int[] cartCpnCartSqArr 	= new int[tmtbGoodsApplyList.size()];

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

@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
 
@@ -519,4 +520,32 @@ public class Order extends TscBaseDomain {
 	private int cancelCount;
 	private int exchangeCount;
 	private int returnCount;
+
+	// 암호화 대상 복호화 처리
+	public String getCustNm() {
+		this.custNm = CryptoUtils.decryptAES(this.custNm);
+		return this.custNm;
+	}
+	
+	public String getEmail() {
+		this.email = CryptoUtils.decryptAES(this.email);
+		return this.email;
+	}
+	
+	public String getCellPhnno() {
+		this.cellPhnno = CryptoUtils.decryptAES(this.cellPhnno);
+		return this.cellPhnno;
+	}
+	
+	public String getRecipBaseAddr() {
+		this.recipBaseAddr = CryptoUtils.decryptAES(this.recipBaseAddr);
+		return this.recipBaseAddr;
+	}
+
+	public String getRecipDtlAddr() {
+		this.recipDtlAddr = CryptoUtils.decryptAES(this.recipDtlAddr);
+		return this.recipDtlAddr;
+	}
+	
+	
 }

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

@@ -138,6 +138,12 @@
 			<foreach collection="ordDtlStatArr" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
+		</if>
+		<if test="ordDtlNoArr != null and ordDtlNoArr != ''">
+			   AND OD. ORD_DTL_NO IN
+			<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
+				#{item}
+			</foreach>
 		</if>
 			   AND OD.ORD_NO = #{ordNo}
 		) Z