Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-497(입점클레임반품배송비)

pom.xml

@@ -183,8 +183,20 @@
 			<scope>system</scope>
 			<systemPath>${basedir}/lib/xalan.jar</systemPath>
 		</dependency>
-
 		<!-- \\\ WEB-INF lib -->
+
+		<!-- /// logback 취약점 대응 -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.9</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.9</version>
+		</dependency>
+		<!-- \\\ logback 취약점 대응 -->
 	</dependencies>
 	
 	<build>

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

@@ -2326,13 +2326,16 @@ public class TscOrderChangeService {
 		orderChangeDao.createOrderDetailHstForAllCancel(orderDetail);
 
 		// 주문상세단품정보 수정 및 이력 등록
-		// 2021.06.25 전체취소 (취소완료) (정산구분값추가)
-		orderDetail.setOrdChgSq(ordChgSq);
-		orderDetail.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_RETURN_CANCEL.value());
-		orderChangeDao.createOrderDetailItemHstForAllCancel(orderDetail);
-		
 		orderChangeDao.updateOrderDetailItemForAllCancel(orderDetail);
-		
+
+		// 2021.06.25 전체취소 (취소완료) (정산구분값추가)
+		// 2021.12.20 card007 결제전주문취소 정산처리 제외
+		if (!TscConstants.OrderChangeStat.PAYMENT_BEFORE_CANCEL.value().equals(chgStat)) {
+			orderDetail.setOrdChgSq(ordChgSq);
+			orderDetail.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_RETURN_CANCEL.value());
+			orderChangeDao.createOrderDetailItemHstForAllCancel(orderDetail);
+		}
+
 		// 10. 배송비 취소 처리
 		OrderChange deliveryFee = new OrderChange();
 		deliveryFee.setOrdNo(ordNo);

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

@@ -15,6 +15,7 @@ import lombok.Data;
 public class ShoplinkerGoods extends TscBaseDomain {
 
 	// 공통
+	private Long logSq;
 	private String customerId; 					// 고객사 코드(샵링커 가입코드)
 	private String partnerProductId;			// 자사 상품코드 (상품관리코드)
 	private String attributeTitleCode;			// 그룹 속성 코드