Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.core into develop

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

@@ -57,13 +57,21 @@ public class TscKakaoPayService {
 		String paymentReadyUrl = env.getProperty("kakao.paymentReadyUrl");
 
 		// Redirect URL 설정
-		String approvalUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
-		String failUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
-		String cancelUrl = "http://" + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+		String hasSsl = env.getProperty("has-ssl");
+		String protocol;
+		
+		if ("true".equals(hasSsl)) {
+			protocol = "https:";
+		} else {
+			protocol = "http:";
+		}
+		String approvalUrl = protocol + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+		String failUrl = protocol + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
+		String cancelUrl = protocol + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
 
 		if (TscConstants.FrontGb.MOB.value().equals(order.getFrontGb())) {
-			failUrl = "http://" + env.getProperty("domain.front") + "/order/payment/fail";
-			cancelUrl = "http://" + env.getProperty("domain.front") + "/order/payment/fail";
+			failUrl = protocol + env.getProperty("domain.front") + "/order/payment/fail";
+			cancelUrl = protocol + env.getProperty("domain.front") + "/order/payment/fail";
 		}
 
 		// API 파라메터 설정

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

@@ -57,7 +57,15 @@ public class TscNaverPayService {
 		String paymentReadyUrl = env.getProperty("naverPay.apiUrl") + env.getProperty("naverPay.partnerId") + env.getProperty("naverPay.paymentReadyUrl");
 
 		// Redirect URL 설정
-		String redirectUrl = "http:" + env.getProperty("domain.front") + env.getProperty("naverPay.paymentRedirectUrl");
+		String hasSsl = env.getProperty("has-ssl");
+		String protocol;
+
+		if ("true".equals(hasSsl)) {
+			protocol = "https:";
+		} else {
+			protocol = "http:";
+		}
+		String redirectUrl = protocol + env.getProperty("domain.front") + env.getProperty("naverPay.paymentRedirectUrl");
 
 		// API 파라메터 설정
 		NaverPay naverPay = new NaverPay();

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

@@ -1589,6 +1589,7 @@ public class TscOrderChangeService {
 				orderChange.setChgerBaseAddr(chgerBaseAddr);
 				orderChange.setChgerDtlAddr(chgerDtlAddr);
 				orderChange.setWdGb(wdGb);
+				orderChange.setWdTargetYn("D".equals(wdGb) ? "N" : "Y");
 				orderChange.setWdInvoiceNo(wdInvoiceNo);
 				orderChange.setAddPayCost(addDelvFee);
 				orderChange.setAddPayAmt(0);
@@ -1817,6 +1818,7 @@ public class TscOrderChangeService {
 				orderChange.setChgReason(excReq.getChgReason());
 				orderChange.setChgMemo(excReq.getChgMemo());
 				orderChange.setWdGb(wdGb);
+				orderChange.setWdTargetYn("D".equals(wdGb) ? "N" : "Y");
 				orderChange.setWdInvoiceNo(wdInvoiceNo);
 				orderChange.setChgerNm(excReq.getChgerNm());
 				orderChange.setChgerPhnno(excReq.getChgerPhnno());

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

@@ -76,6 +76,7 @@ public class OrderChange extends TscBaseDomain {
 	private List<Integer> cnclRtnReqQtyList = new ArrayList<>();
 	
 	private String wdGb;
+	private String wdTargetYn;
 	private String recipNm;
 	private String recipEmail;
 	private String recipZipcode;

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

@@ -3912,6 +3912,7 @@
 		    ON     BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		    WHERE  1=1
 		    AND    OD.ORD_NO = #{ordNo}
+		    AND    OD.ORD_DTL_STAT = 'G013_20'
 		    AND    OD.ORD_QTY > OD.CNCL_RTN_QTY
 		) Z
 		GROUP  BY Z.ORD_NO

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

@@ -105,6 +105,7 @@
 		AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
 		AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 		</if>
+		AND    OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 	</select>
 
 	<!-- 입점업체 엑셀다운용 임시테이블 삭제-->
@@ -163,36 +164,36 @@
 	<select id="getSellerUnorderList" parameterType="Order" resultType="Order">
 		/* tscScm.getSellerUnorderList */
 		SELECT (SELECT SC.SUPPLY_COMP_NM
-		        FROM   TB_SUPPLY_COMPANY SC
-		        WHERE  SC.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
-		     , (SELECT B.BRAND_KNM
-		        FROM   TB_BRAND B
-		        WHERE  B.BRAND_CD = G.BRAND_CD) AS BRAND_KNM
-		     , OD.ORD_NO
-		     , OD.ORD_DTL_NO
-		     , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT ) AS ORD_DTL_STAT_NM
-		     , O.ORD_NM
-		     , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
-		     , FN_GET_CODE_NM('G014', P.PAY_MEANS  ) AS PAY_MEANS_NM
-		     , O.ORD_PHNNO
-		     , DA.RECIP_NM
-		     , DA.RECIP_PHNNO
-		     , DA.RECIP_ZIPCODE
-		     , DA.RECIP_BASE_ADDR
-		     , DA.RECIP_DTL_ADDR
-		     , G.SUPPLY_GOODS_CD
-		     , G.GOODS_CD
-		     , G.GOODS_NM
-		     , ODI.OPT_CD1
-		     , ODI.OPT_CD2
-		     , CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
-		     , OD.ORD_QTY
-		     , OD.CNCL_RTN_QTY
-		     , OD.ORD_AMT
-		     , OD.CNCL_RTN_AMT
-		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
-		     , OD.REAL_ORD_AMT
-		     , OD.INVOICE_NO
+		FROM   TB_SUPPLY_COMPANY SC
+		WHERE  SC.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		, (SELECT B.BRAND_KNM
+		FROM   TB_BRAND B
+		WHERE  B.BRAND_CD = G.BRAND_CD) AS BRAND_KNM
+		, OD.ORD_NO
+		, OD.ORD_DTL_NO
+		, FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT ) AS ORD_DTL_STAT_NM
+		, O.ORD_NM
+		, DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
+		, FN_GET_CODE_NM('G014', P.PAY_MEANS  ) AS PAY_MEANS_NM
+		, O.ORD_PHNNO
+		, DA.RECIP_NM
+		, DA.RECIP_PHNNO
+		, DA.RECIP_ZIPCODE
+		, DA.RECIP_BASE_ADDR
+		, DA.RECIP_DTL_ADDR
+		, G.SUPPLY_GOODS_CD
+		, G.GOODS_CD
+		, G.GOODS_NM
+		, ODI.OPT_CD1
+		, ODI.OPT_CD2
+		, CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
+		, OD.ORD_QTY
+		, OD.CNCL_RTN_QTY
+		, OD.ORD_AMT
+		, OD.CNCL_RTN_AMT
+		, OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
+		, OD.REAL_ORD_AMT
+		, OD.INVOICE_NO
 		FROM   TB_ORDER O
 		INNER  JOIN TB_ORDER_DETAIL OD
 		ON     O.ORD_NO = OD.ORD_NO
@@ -213,7 +214,7 @@
 		WHERE  1=1
 		AND    DA.RECIP_BASE_ADDR IS NOT NULL
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
-		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
+			AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="ordDtlNoArr != null and ordDtlNoArr.length > 0">
 			AND	OD.ORD_DTL_NO IN