정산구분값추가

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

@@ -461,20 +461,13 @@ public class TscOrderChangeService {
 					orderChangeDao.createSellQty(orderChange);
 				}
 
-				// 3-4. PG 결제 취소 정보 설정 (상품권으로만 결제 시 PG점프)
-				
-				log.info("obj.getRealOrdAmt() ::: {}", obj.getRealOrdAmt());
-				log.info("obj.getDelvFee() ::: {}", obj.getDelvFee());
-				log.info("obj.getAddDelvFee() ::: {}", obj.getAddDelvFee());
-				
+				// 3-4. PG 결제 취소 정보 설정 (상품권으로만 결제 시 PG점프)				
 				int spanRealCnclRtnAmt = obj.getRealOrdAmt();			// 취소금액합계
 				int sumDeliveryFee = obj.getDelvFee();					// 배송비합계
 				int spanDelvCpnDcAmt = obj.getDelvCpnDcAmt();			// 배송비쿠폰금액
 				int spanTotDeliveryFee = obj.getAddDelvFee();			// 추가배송비합계
 				int spanRefundAmt = spanRealCnclRtnAmt;
 				int addDelvFee = 0;
-				
-				log.info("obj.getLastCanYn() ::: {}", obj.getLastCanYn());
 
 				// 마지막 취소일때 배송비 추가
 				if ("Y".equals(obj.getLastCanYn())) {
@@ -1596,9 +1589,13 @@ public class TscOrderChangeService {
 		orderChangeDao.createOrderDetailHstForAllCancel(orderDetail);
 
 		// 주문상세단품정보 수정 및 이력 등록
-		orderChangeDao.updateOrderDetailItemForAllCancel(orderDetail);
+		// 2021.06.25 전체취소 (취소완료) (정산구분값추가)
+		orderDetail.setOrdChgSq(ordChgSq);
+		orderDetail.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_RETURN_CANCEL.value());
 		orderChangeDao.createOrderDetailItemHstForAllCancel(orderDetail);
 		
+		orderChangeDao.updateOrderDetailItemForAllCancel(orderDetail);
+		
 		// 10. WMS 취소 처리
 		List<Order> wmsList = new ArrayList<>();
 		if(orderChange.getOrdDtlNoArr() != null && orderChange.getOrdDtlNoArr().length > 0) {

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

@@ -426,12 +426,12 @@ public class Order extends TscBaseDomain {
 	private String bankNm;
 
 	public String getAccountNo() {
-		this.accountNo = CryptoUtils.decryptAES(this.accountNo);
+		this.accountNo = CryptoUtils.decryptYes24AES(this.accountNo);
 		return this.accountNo;
 	}
 
 	public void encryptData () {
-		this.encodedAccountNo = CryptoUtils.encryptAES(this.accountNo);
+		this.encodedAccountNo = CryptoUtils.encryptYes24AES(this.accountNo);
 	}
 
 	private int realDelvAmt;
@@ -606,27 +606,27 @@ public class Order extends TscBaseDomain {
 
 	// 암호화 대상 복호화 처리
 	public String getCustNm() {
-		this.custNm = CryptoUtils.decryptAES(this.custNm);
+		this.custNm = CryptoUtils.decryptYes24AES(this.custNm);
 		return this.custNm;
 	}
 
 	public String getEmail() {
-		this.email = CryptoUtils.decryptAES(this.email);
+		this.email = CryptoUtils.decryptYes24AES(this.email);
 		return this.email;
 	}
 
 	public String getCellPhnno() {
-		this.cellPhnno = CryptoUtils.decryptAES(this.cellPhnno);
+		this.cellPhnno = CryptoUtils.decryptYes24AES(this.cellPhnno);
 		return this.cellPhnno;
 	}
 
 	public String getRecipBaseAddr() {
-		this.recipBaseAddr = CryptoUtils.decryptAES(this.recipBaseAddr);
+		this.recipBaseAddr = CryptoUtils.decryptYes24AES(this.recipBaseAddr);
 		return this.recipBaseAddr;
 	}
 
 	public String getRecipDtlAddr() {
-		this.recipDtlAddr = CryptoUtils.decryptAES(this.recipDtlAddr);
+		this.recipDtlAddr = CryptoUtils.decryptYes24AES(this.recipDtlAddr);
 		return this.recipDtlAddr;
 	}
 
@@ -685,12 +685,12 @@ public class Order extends TscBaseDomain {
 	private String birthGen;			// 보증보험(생년월일 + 성별)
 
 	public String getBirthYmd() {
-		this.birthYmd = CryptoUtils.decryptAES(this.birthYmd);
+		this.birthYmd = CryptoUtils.decryptYes24AES(this.birthYmd);
 		return this.birthYmd;
 	}
 
 	public String getSexGb() {
-		this.sexGb = CryptoUtils.decryptAES(this.sexGb);
+		this.sexGb = CryptoUtils.decryptYes24AES(this.sexGb);
 		return this.sexGb;
 	}
 

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

@@ -2388,6 +2388,7 @@
 		     , SAVE_PNT_AMT
 		     , REAL_ORD_AMT
 		     , GFCD_USE_AMT
+		     , ORD_CHG_SQ
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -2396,7 +2397,7 @@
 		SELECT ODI.ORD_DTL_ITEM_SQ
 		     , ODI.ORD_DTL_NO
 		     , ODI.ORD_NO
-		     , 'G720_30'
+		     , #{ordDtlStat}
 		     , ODI.ITEM_CD
 		     , ODI.OPT_CD
 		     , ODI.OPT_CD1
@@ -2410,7 +2411,7 @@
 		     , ODI.DISP_ORD
 		     , ODI.ORD_AMT
 		     , OD.ORD_QTY
-		     , ODI.CNCL_RTN_AMT
+		     , ODI.ORD_AMT
 		     , OD.CNCL_RTN_QTY
 		     , ODI.CPN1_DC_AMT
 		     , ODI.TMTB1_DC_AMT
@@ -2422,6 +2423,7 @@
 		     , ODI.SAVE_PNT_AMT
 		     , ODI.REAL_ORD_AMT
 		     , ODI.GFCD_USE_AMT
+		     , #{ordChgSq}
 		     , #{regNo}
 		     , NOW()
 		     , #{updNo}