|
|
@@ -1,8 +1,7 @@
|
|
|
package com.style24.front.biz.web;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collection;
|
|
|
-import java.util.List;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -287,7 +286,8 @@ public class TsfMypageController extends TsfBaseController {
|
|
|
mav.addObject("canChgAddr", orderList.iterator().next().get("canChgAddr"));
|
|
|
|
|
|
// 주문정보 조회
|
|
|
- mav.addObject("orderInfo", coreOrderService.getOrderInfoList(order).iterator().next());
|
|
|
+ Order orderInfo = coreOrderService.getOrderInfoList(order).iterator().next();
|
|
|
+ mav.addObject("orderInfo", orderInfo);
|
|
|
|
|
|
// 주문 금액정보 조회
|
|
|
mav.addObject("orderAmtInfo", orderService.getOrderAmtForMypage(order));
|
|
|
@@ -304,6 +304,22 @@ public class TsfMypageController extends TsfBaseController {
|
|
|
// KCP 전표 경로 설정
|
|
|
mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
|
|
|
|
|
|
+ // 주문일 경과 일
|
|
|
+ try {
|
|
|
+ Calendar eddt = Calendar.getInstance();
|
|
|
+ eddt.setTime(new Date());
|
|
|
+
|
|
|
+ Date stdt = new SimpleDateFormat("yyyy.MM.dd").parse(orderInfo.getOrdDt());
|
|
|
+ Calendar cmpDate = Calendar.getInstance();
|
|
|
+ cmpDate.setTime(stdt);
|
|
|
+
|
|
|
+ long diffSec = (eddt.getTimeInMillis() - cmpDate.getTimeInMillis()) / 1000;
|
|
|
+ long diffDays = diffSec / (24 * 60 * 60); // 일수
|
|
|
+ log.info("diffDays >>>> {}", diffDays);
|
|
|
+ mav.addObject("diffDays", diffDays);
|
|
|
+ } catch (Exception e) {
|
|
|
+
|
|
|
+ }
|
|
|
mav.setViewName(super.getDeviceViewName("mypage/MypageOrderDetailForm"));
|
|
|
|
|
|
return mav;
|
yujung