|
|
@@ -1,8 +1,10 @@
|
|
|
package com.style24.front.biz.web;
|
|
|
|
|
|
import java.text.DecimalFormat;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -1160,7 +1162,7 @@ public class TsfOrderController extends TsfBaseController {
|
|
|
|
|
|
int count = customerService.getGiftKakaoSendInfo(custContactHst);
|
|
|
|
|
|
- if (count < 1) {
|
|
|
+ if (count < 30) {
|
|
|
// 2021.05.31 알림톡전송 주문완료정보
|
|
|
if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
|
|
|
Integer userNo = orderInfo.getCustNo();
|
|
|
@@ -1205,7 +1207,11 @@ public class TsfOrderController extends TsfBaseController {
|
|
|
replaceInfo.set("orderFreegiftInfo" , resultMap.get("orderFreegiftInfo"));
|
|
|
|
|
|
replaceInfo.set("vaBankNm" , orderInfo.getCardNm());
|
|
|
- replaceInfo.set("vaDeadline" , orderInfo.getVaDeadline());
|
|
|
+
|
|
|
+ // 2021.07.29
|
|
|
+ Date deadline = new SimpleDateFormat("yyyy-MM-dd").parse(orderInfo.getVaDeadline().substring(0, 10));
|
|
|
+
|
|
|
+ replaceInfo.set("vaDeadline" , new SimpleDateFormat("yyyy.MM.dd").format(deadline));
|
|
|
replaceInfo.set("vaNo" , orderInfo.getVaNo());
|
|
|
|
|
|
// 2021.06.15
|
bin2107