Merge branch 'style' into jmh

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

@@ -519,21 +519,24 @@ public class TscOrderChangeService {
 					}
 
 					// 원주문 배송비 취소 처리
-					Order cancelDelvFee = new Order();
-					cancelDelvFee.setOrdNo(ordNo);
-					cancelDelvFee.setDelvFeeGb(TscConstants.DeliveryFeeGb.ORIGIN_DELIVERY_FEE.value());
-					cancelDelvFee.setDelvFeeCd(obj.getDelvFeeCd());
-					cancelDelvFee.setDelvFee(sumDeliveryFee * -1);
-					cancelDelvFee.setDelvCpnSq(0);
-					cancelDelvFee.setDelvCpnDcAmt(spanDelvCpnDcAmt);
-					cancelDelvFee.setDelvGfcdUseAmt(spanDelvGfcdUseAmt * -1);
-					cancelDelvFee.setRealDelvAmt((delvFee - spanDelvGfcdUseAmt) * -1);
-					cancelDelvFee.setOrdChgSq(orderChange.getOrdChgSq());
-					cancelDelvFee.setSupplyCompCd(obj.getSupplyCompCd());
-					cancelDelvFee.setRegNo(userNo);
-					cancelDelvFee.setUpdNo(userNo);
-
-					orderChangeDao.createDeliveryFee(cancelDelvFee);
+					// 2021.11.16 card007 출고 이력 존재 시 원주문 배송비 환불처리 X
+					if ("N".equals(obj.getDelvYn())) {
+						Order cancelDelvFee = new Order();
+						cancelDelvFee.setOrdNo(ordNo);
+						cancelDelvFee.setDelvFeeGb(TscConstants.DeliveryFeeGb.ORIGIN_DELIVERY_FEE.value());
+						cancelDelvFee.setDelvFeeCd(obj.getDelvFeeCd());
+						cancelDelvFee.setDelvFee(sumDeliveryFee * -1);
+						cancelDelvFee.setDelvCpnSq(0);
+						cancelDelvFee.setDelvCpnDcAmt(spanDelvCpnDcAmt);
+						cancelDelvFee.setDelvGfcdUseAmt(spanDelvGfcdUseAmt * -1);
+						cancelDelvFee.setRealDelvAmt((delvFee - spanDelvGfcdUseAmt) * -1);
+						cancelDelvFee.setOrdChgSq(orderChange.getOrdChgSq());
+						cancelDelvFee.setSupplyCompCd(obj.getSupplyCompCd());
+						cancelDelvFee.setRegNo(userNo);
+						cancelDelvFee.setUpdNo(userNo);
+
+						orderChangeDao.createDeliveryFee(cancelDelvFee);
+					}
 				}
 				// 5-4-2. 추가배송비 처리 (배송비허들무너짐)
 				else {
@@ -625,10 +628,14 @@ public class TscOrderChangeService {
 				pg.setPgTid(pgTid);
 				pg.setPayMeans(payMeans);
 				pg.setPartCancelAmt(refundAmt);
-				pg.setLeftAmt(payAmt);
+				// pg.setLeftAmt(payAmt);
 				pg.setRegNo(userNo);
 				pg.setUpdNo(userNo);
 
+				// 2021.07.07 payAmt 금액 TB_PAYMENT.PAY_AMT 수정
+				int leftAmt = orderChangeDao.getPaymentPayamt(pg);
+				pg.setLeftAmt(leftAmt);
+
 				log.info("pg.getPartCancelAmt() ::: {}", pg.getPartCancelAmt());
 				log.info("pg.getLeftAmt() ::: {}", pg.getLeftAmt());
 

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

@@ -273,7 +273,8 @@ public class TscOrderRefundService {
 						
 						// 전체취소시 배송비 환불
 						if (leftOrdAmt == 0) {
-							if ("Y".equals(obj.getLastCanYn())) {
+							// 2021.11.16 card007 출고 이력 존재 시 원주문 배송비 환불처리 X
+							if ("Y".equals(obj.getLastCanYn()) && "N".equals(obj.getDelvYn())) {
 								sumDeliveryFee += obj.getDelvFee();				// 전체취소 시 배송금액도 같이 환불
 								spanRefundDelvCpnAmt += obj.getDelvCpnDcAmt();	// 전체취소 시 배송비쿠폰 금액 제외하고 환불
 								spanDelvGfcdUseAmt += obj.getDelvGfcdUseAmt();	// 전체취소 시 사용 배송비 상품권 금액 환불

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

@@ -1,5 +1,6 @@
 package com.style24.persistence.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.core.support.session.TscSession;
 import com.style24.core.support.util.CryptoUtils;
 import com.style24.core.support.util.MaskingUtils;
@@ -117,4 +118,30 @@ public class Counsel extends TscBaseDomain {
 	private int pageSize = 50;
 	private int pageUnit = 10;
 
+	private String file1OrgFileNm;	// 원본파일명1(등록시 사용)
+	private String file1SysFileNm;	// 시스템파일명1(등록시 사용)
+	private String file2OrgFileNm;	// 원본파일명2(등록시 사용)
+	private String file2SysFileNm;	// 시스템파일명2(등록시 사용)
+	private int selfGb;				// 내문의 1: , 그외 0
+	private String sysFileNm;		// 이미지 공통 변수
+	private int rnum;
+
+	private String goodsType; 		// 상품타입
+
+	// 1:1문의(총, 답변완료, 처리중) 건수
+	private int totCnt;		// 총건수
+	private int ansCnt;		// 답변완료건수
+	private int ingCnt;		// 처리중건수
+
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] orgFileNmArr;
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] sysFileNmArr;
+
+	private Integer assignerNo;		// 할당자번호
+	private String assignerNm;		// 할당자명
+	private String assignedDt;		// 할당일시
+
+	private int cnt;
+
 }

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

@@ -1690,6 +1690,7 @@
 		     , FN_GET_CODE_NM('G680', OC.CHG_GB)       AS CHG_GB_NM
 		     , OD.GOODS_CD
 		     , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
+		     , ODI.OPT_CD
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
 		     , OCD.CHG_STAT

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

@@ -135,7 +135,8 @@
 		               WHERE OCD.DEL_YN = 'N'
 		                 AND OCD.ORD_CHG_SQ = #{ordChgSq}
 		          ) X
-		            ON OD.ORD_DTL_NO = X.ORD_DTL_NO
+		            ON ODI.ORD_DTL_NO = X.ORD_DTL_NO
+		           AND ODI.OPT_CD = X.OPT_CD
 		         WHERE 1 = 1
 		<if test="ordDtlStatArr != null and ordDtlStatArr != ''">
 		           AND OD. ORD_DTL_STAT IN
@@ -3046,8 +3047,8 @@
 		         , P.PAY_MEANS
 		         , P.PAY_STAT
 		         , P.CASH_AUTH_NO
-		         , CASE WHEN NULLIF(OD.INVOICE_NO, '') IS NULL THEN 'N'
-		                ELSE 'Y'
+		         , CASE WHEN (SELECT COUNT(1) FROM TB_ORDER_DETAIL_HST WHERE ORD_DTL_NO = OD.ORD_DTL_NO AND ORD_DTL_STAT = 'G013_50') > 0 THEN 'Y'
+		                ELSE 'N'
 		            END AS DELV_YN
 		      FROM TB_ORDER O
 		     INNER JOIN TB_ORDER_DETAIL OD
@@ -3091,7 +3092,7 @@
 				<if test="ordNo != null and ordNo != ''">
 		       AND O.ORD_NO = #{ordNo}
 				</if>
-		       AND O.DISP_YN = 'Y'
+		--       AND O.DISP_YN = 'Y'
 			</where>
 		) Z
 		WHERE 1=1
@@ -3850,7 +3851,7 @@
 		         AND P.PAY_STAT IN ('G016_10', 'G016_30')
 		         AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		       WHERE OCD.DEL_YN = 'N'
-		         AND O.DISP_YN = 'Y'
+		--         AND O.DISP_YN = 'Y'
 		<choose>
 			<when test="custNo > 0">
 		         AND O.CUST_NO = #{custNo}
@@ -4048,7 +4049,7 @@
 		           AND P.PAY_GB = 'O'
 		           AND P.PAY_STAT = 'G016_30'
 		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
-		         WHERE O.DISP_YN = 'Y'
+		--         WHERE O.DISP_YN = 'Y'
 		<choose>
 			<when test="custNo > 0">
 		           AND O.CUST_NO = #{custNo}
@@ -4260,7 +4261,7 @@
 		            ON P.ORD_CHG_SQ = OC.ORD_CHG_SQ
 		           AND P.PAY_GB = 'D'
 		           AND P.PAY_STAT = 'G016_30'
-		         WHERE O.DISP_YN = 'Y'
+		--         WHERE O.DISP_YN = 'Y'
 		<choose>
 			<when test="custNo > 0">
 		           AND O.CUST_NO = #{custNo}