From e60c707fb1672ec700d7d7ddf5763f3acbe0f00c Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Wed, 18 Nov 2020 04:33:37 +0000
Subject: [PATCH]

---
 Dao/MyBatis/Maps/Pay.xml   |  2 +-
 FO/Views/My/PayInfo.cshtml | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index cdb99f1..4964d24 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -630,7 +630,7 @@
             where a.payno=#payno# and a.userno=#userno# and a.pstatus in (1,22,41,42,43)
         </select>
         <select id="pay.mypayitem" parameterClass="hashtable" resultClass="payitem">
-            select a.ptype,c0.cshape,a.isrebate,a.payamt,a.pcnt,a.rstatus,a.userno,a.pstatus,a.pino,c0.infee,c0.outfee
+            select a.ptype,c0.cshape,a.isrebate,a.payamt,a.pcnt,a.rstatus,a.userno,a.pstatus,a.pino,c0.infee,c0.outfee,c0.rstime,c0.retime
                 ,case a.ptype when 0 then c0.cname when 2 then c2.bkname when 4 then c0.cname when 3 then c3.exname else '-' end itemname
                 ,c0.sstime,c0.setime,datediff(c0.setime, c0.sstime)+1 days
                 ,u.username,uc.cname ccpositionname,u.isassignuser
diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml
index b631bf7..4bbb736 100644
--- a/FO/Views/My/PayInfo.cshtml
+++ b/FO/Views/My/PayInfo.cshtml
@@ -33,10 +33,17 @@
     {
         <tr><th>입금계좌</th><td><span>@Model.Pay.vactbankname | @Model.Pay.vactnum | @Model.Pay.vactname</span></td></tr>
     }
-    <tr>
-        <th>주문접수일</th>
-        <td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.ispg == 0 ? "-" : Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "")</td>
-    </tr>
+        <tr>
+            <th>주문접수일</th>
+            @if (Convert.ToDateTime(Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) >= Convert.ToDateTime(Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm")))
+            {
+                <td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "")</td>
+            }
+            else
+            {
+                <td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "")</td>
+            }
+        </tr>
     <tr>
         <th>주문상태</th>
         <td><b>@Model.Pay.pstatusname</b> @Html.Raw(Model.Pay.ispg == 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype == 1 ? "<a href=\"#\" onclick=\"viewtax()\" class=\"odrRcpt\" style=\"color:white\">영수증 출력</a>" : "")</td>
@@ -346,6 +353,9 @@
                                 }
                                 else if (Model.PayRfd == null)
                                 {
+                                    <p class="odrpDesc" style="color:red">
+                                        ※ 위 신청서를 작성한 이후, 신청서를 날인/스캔하여 통장사본과 같이 업로드를 해주셔야 합니다.
+                                    </p>
                                     <h4 class="bskTitle">환불규정</h4>
                                     <div>평생교육법 제28조 제4항에 따른 학습비의 반환사유가 발생할 때에는 평생교육시행령 23조의 별표 3의 반환기준에 따라 학습 비 등을 반환사유가 발생한 날부터 5일 이내에 반환하여야 한다.</div>
                                     <br />