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

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/TscKakaotalkService.java

@@ -412,7 +412,6 @@ public class TscKakaotalkService {
 		}
 
 	}
-	
 
 	/**
 	 *  포인트 기간만료 알림톡(30일)
@@ -522,6 +521,8 @@ public class TscKakaotalkService {
 		SimpleDateFormat sd = new SimpleDateFormat("yyyy년 MM월 dd일");
 		String todayDate = sd.format(System.currentTimeMillis());
 		
+		int kakaoAnswerSq = 0;
+		
 		// KCP
 		if ("KCP".equals(order.getPgGb())) {
 			// 무통장입금
@@ -534,22 +535,27 @@ public class TscKakaotalkService {
 				replaceInfo.setString("vaDeadline"		, new SimpleDateFormat("yyyy년 MM월 dd일").format(deadline));
 				replaceInfo.setString("deadlineH"		, "17");
 				
-				//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_ORDER_COMPLETE.value(), dm, replaceInfo);
+				kakaoAnswerSq = SsgKakaoSender.KakaoAnswerSq.VA_ORDER_COMPLETE.value();
 			} 
 			// 실시간계좌이체
 			else if (TscConstants.PayMeans.ACCOUNT_TRANSFER.value().equals(order.getPayMeans())) {
 				replaceInfo.setString("ordDt"			, todayDate);
 				replaceInfo.setString("vaNm"			, order.getCardNm());
 				
-				//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.AT_ORDER_COMPLETE.value(), dm, replaceInfo);
+				kakaoAnswerSq = SsgKakaoSender.KakaoAnswerSq.AT_ORDER_COMPLETE.value();
 			}
 			// 신용카드, 휴대폰결제
 			else {
-				//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
+				kakaoAnswerSq = SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value();
 			}
 		}
 		else  {
-			//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
+			kakaoAnswerSq = SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value();
+		}
+		
+		// 테스트중
+		if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
+			kakaoSender.send(kakaoAnswerSq, dm, replaceInfo);
 		}
 		
 		try {
@@ -594,8 +600,11 @@ public class TscKakaotalkService {
 		replaceInfo.setString("vaNm"			, order.getVaNm());
 		replaceInfo.setString("vaNo"			, order.getVaNo());
 		
-		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_DEPOSIT_CONFIRM.value(), dm, replaceInfo);
-
+		// 테스트중
+		if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
+			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_DEPOSIT_CONFIRM.value(), dm, replaceInfo);
+		}
+		
 		try {
 			CustContactHst custContactHst = new CustContactHst();
 			// 고객접촉이력 정보
@@ -641,7 +650,10 @@ public class TscKakaotalkService {
 		Date giftPackCloseDt = new SimpleDateFormat("yyyy-MM-dd").parse(order.getGiftPackCloseDt().substring(0, 10));
 		replaceInfo.setString("giftPackCloseDt"		, new SimpleDateFormat("yyyy년 MM월 dd일").format(giftPackCloseDt));
 		
-		//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.GIFT_ARRIVED.value(), dm, replaceInfo);
+		// 테스트중
+		if ("전석훈".equals(order.getOrdNm()) || "이태영".equals(order.getOrdNm()) || "김지철".equals(order.getOrdNm()) || "신주승".equals(order.getOrdNm())) {
+			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.GIFT_ARRIVED.value(), dm, replaceInfo);
+		}
 		
 		try {
 			// 고객접촉이력 정보

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

@@ -155,7 +155,9 @@ public class SsgKakaoSender {
 		// kkoresendtype(재발송유형)이 "SMS"일 때만 kkoresendmsg(재발송메시지)에 값 설정
 		// "LMS"일 때는 fmessage(메시지본문) 값으로 발송되며 kkoresendmsg(재발송메시지)에는 값을 넣으면 안 된다.
 		if (dm.getFkkoresendtype().equals("SMS")) {
-			dm.setFkkoresendmsg(ansPhase.getAnsContent());
+			if (StringUtils.isBlank(dm.getFkkoresendmsg())) {
+				dm.setFkkoresendmsg(ansPhase.getAnsContent());
+			}
 		}
 
 		dm.setFcallback(callbackTelNo);

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -69,24 +69,24 @@ public class TscConstants {
 		CERT_NO_SEND("G054_202"),				// 회원/마케팅 -휴대전화인증
 		TEMP_PASSWD("G054_203"), 				// 회원/마케팅 -고객비밀번호발송
 		ONE_TO_ONE_ANSWER("G054_204"),			// 회원/마케팅 -1:1문의답변
-		SECESSION_INFO("G054_205"),				// 회원/마케팅 -가입탈퇴안내
+		SECEDE_CUST("G054_205"),					// 회원/마케팅 -가입탈퇴안내
 		BASIC_LMS("G054_206"),					// 회원/마케팅 -기본LMS안내발송
 		DORMANT_EXPECTED("G054_207"),			// 회원/마케팅 -휴면계정전환예정
 		PRIVACY_POLICY("G054_208"),				// 회원/마케팅 -개인정보 이용내역
-		MARKETING_AGREE("G054_209"),			// 회원/마케팅 -마케팅 정보 수신동의 내역
-		BIRTH_COUPON_NOTICE("G054_210"),		// 회원/마케팅 -생일쿠폰다운로드안내
+		MARKETING_AGREE("G054_209"),				// 회원/마케팅 -마케팅 정보 수신동의 내역
+		BIRTH_COUPON_NOTICE("G054_210"),			// 회원/마케팅 -생일쿠폰다운로드안내
 		GRADE_NOTICE("G054_211"),				// 회원/마케팅 -이달의 등급 혜택 안내
 		DORMANT_EXPECT_COMBACK("G054_212"),		// 회원/마케팅 -휴면/미접속자 방어쿠폰
 		GIFTCARD_EXTNC_EXPECT("G054_213"),		// 회원/마케팅 - 상품권 소멸 예정 안내
-		COUPON_EXTNC_EXPECT("G054_214"),		// 회원/마케팅 - 쿠폰 소멸 예정안내
+		COUPON_EXTNC_EXPECT("G054_214"),			// 회원/마케팅 - 쿠폰 소멸 예정안내
 		POINT_EXTNC_EXPECT("G054_215"),			// 회원/마케팅 - 포인트 소멸 예정안내
 		ORDER_INFO("G054_301"),					// 주문-주문안내
 		BANK_DEPOSIT_INFO("G054_302"),			// 주문-무통장입금안내
 		SOLDOUT_EXPECTED_INFO("G054_303"),		// 주문-결품예정안내
 		SOLDOUT_INFO("G054_304"),				// 주문-결품안내
-		CANCEL_INFO("G054_305"),				// 주문-취소안내
+		CANCEL_INFO("G054_305"),					// 주문-취소안내
 		REPAYMENT_INFO("G054_306"),				// 주문-재결제안내
-		BUY_CONFIRM("G054_307"),				// 주문-구매확정
+		BUY_CONFIRM("G054_307"),					// 주문-구매확정
 		SHIPPING_INFO("G054_401"),				// 배송-주문상품배송안내
 		EXCHANGE_SHIPPING_INFO("G054_402"),		// 배송-교환상품배송안내
 		RETURN_RECEIPT("G054_501"),				// 반품-반품접수완료

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

@@ -88,13 +88,14 @@ public class Customer extends TscBaseDomain {
 	private String content;			// 내용
 	private String certNo;			// 인증번호
 	private String mm;				// 월
+	private String fewDt;
 
 	// 나이스 인증
 	private String encData;
 	private String authMethod;		// 인증방법(고객정보, 휴대폰인증, 아이핀 인증)
 
-	// 비밀번호 변경일자
 	private int pwdChangeDay;		// 비밀번호 캠페인 화면 - ?일간 보지않기
+	private int rejoinRejectDay;	// 탈퇴후재가입불가기간
 
 	private String bankCd;			// 은행코드(공통코드G940)
 	private String accountNo;		// 계좌번호

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