Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1059,7 +1059,7 @@ public class TsfOrderController extends TsfBaseController {
 
 		int count = customerService.getGiftKakaoSendInfo(custContactHst);
 		
-		if (count < 30) {
+		if (count < 1) {
 			// 2021.05.31 알림톡전송 주문완료정보		
 			if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
 				Integer userNo = orderInfo.getCustNo();
@@ -1102,10 +1102,21 @@ public class TsfOrderController extends TsfBaseController {
 					replaceInfo.set("orderListInfo"		, resultMap.get("orderListInfo"));
 					replaceInfo.set("orderFreegiftInfo"	, resultMap.get("orderFreegiftInfo"));
 					
+					replaceInfo.set("vaBankNm"			, orderInfo.getCardNm());
+					replaceInfo.set("vaDeadline"		, orderInfo.getVaDeadline());
+					replaceInfo.set("vaNo"				, orderInfo.getVaNo());
+					
 					// 2021.06.15
 					// 주문완료 안내 메일 보내기
 					if (StringUtils.isNotBlank(orderInfo.getOrdEmail())) {
+						
+						// 결제완료
 						mailService.sendOrderComplete(replaceInfo, userNo);
+						
+						// 입금요청
+						if ("G014_20".equals(orderInfo.getPayMeans())) {
+							mailService.sendVaDepositRequest(replaceInfo, userNo);
+						}
 					}
 				} catch (Exception e) {
 					// TODO Auto-generated catch block

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

@@ -745,6 +745,8 @@
 		         WHERE CONTACT_TYPE = #{contactType}
 		           AND CONTACT_METHOD = #{contactMethod}
 		           AND CONTACT_MEMO = #{contactMemo}) Z
+		 <if test="contactType == 'G054_308'">
 		 WHERE RESEND_CAN_YN = 'Y'
+		 </if>
 	</select>
 </mapper>