Merge remote-tracking branch 'origin/develop' into jsh77b

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/core/biz/thirdparty/NetpathyMailSender.java

@@ -118,6 +118,10 @@ public class NetpathyMailSender {
 	public void send(Integer mailtSq, String toAddress, GagaMap replaceInfo, String custId) {
 		// 메일템플릿 조회
 		MailTemplate mailTemplate = this.getMailTemplate(mailtSq, replaceInfo);
+		StringBuilder contentBuilder = new StringBuilder();
+		contentBuilder.append(mailTemplate.getMailhContent());
+		contentBuilder.append(mailTemplate.getMailContent());
+		contentBuilder.append(mailTemplate.getMailfContent());
 
 		Netpathy netpathy = new Netpathy();
 		netpathy.setLegacyid(custId);
@@ -125,7 +129,7 @@ public class NetpathyMailSender {
 		netpathy.setEmail(toAddress);
 //		netpathy.setName(name);
 		netpathy.setTitle(mailTemplate.getMailtNm());
-		netpathy.setContent(mailTemplate.getMailContent());
+		netpathy.setContent(contentBuilder.toString());
 
 		// 메일 생성
 		netpathyDao.createMail(netpathy);

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;