From 27464be01a6c3f25ef251f82cfa31d2c95369f2a Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Mon, 28 Jun 2021 04:56:25 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D,=EC=83=81=EC=84=B8:=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=ED=99=98=EB=B6=88/=EC=A0=84=EC=B2=B4=ED=99=98=EB=B6=88=20?=
 =?UTF-8?q?=EB=AA=A8=EB=91=90=20=EA=B7=B8=EB=83=A5=20'=ED=99=98=EB=B6=88'?=
 =?UTF-8?q?=20=EB=A1=9C=20=ED=91=9C=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

결제현황 상세 : 학습기간이 0001-01-01 ~ 0001-01-01 로 표기되는 문제 (상시 결제대기시 학습날짜로 표시)
---
 Dao/MyBatis/Maps/Pay.xml   |  3 +++
 FO/Views/My/PayInfo.cshtml | 11 ++++++++++-
 Model/Pay.cs               |  8 ++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index e651c0d..2544008 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -704,6 +704,9 @@
                 ,u.kfcfyear,u.edus,u.depart
                 ,rs.rsno,t.lectno
                 ,a2.taxno
+                ,case when t.sdate is null then c0.sstime else t.sdate end as sdate
+                ,case when t.edate is null then c0.setime else t.edate end as edate
+                ,c0.studydays
             from payitem a
             left outer join paytax a3 on a3.payno = a.payno and (a3.iscancel is null or a3.iscancel &lt;&gt; 1)
             left outer join paytaxitem a2 on a2.pino=a.pino and a3.taxno = a2.taxno
diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml
index 7719b5e..0073167 100644
--- a/FO/Views/My/PayInfo.cshtml
+++ b/FO/Views/My/PayInfo.cshtml
@@ -19,9 +19,18 @@
                     @Html.Raw(Model.PayItem.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
                     <b style="color:@(Model.PayItem.pstatus == 22 ? "red" : "")">@Model.PayItem.itemname</b>
                 </h5>
+                @if (Model.PayItem.sdate != null && Model.PayItem.edate != null)
+                {
                 <dl>
-                    <dd>학습기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.sstime).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.setime).ToShortDateString())</span></dd>
+                    <dd>학습기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.sdate).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.edate).ToShortDateString())</span></dd>
                 </dl>
+                }
+                else
+                {
+                <dl>
+                    <dd>학습기간 : <span class="red">@(Model.PayItem.studydays)일</span></dd>
+                </dl>
+                }
                 <dl>
                     <dd>가격 : <span class="red">@Model.PayItem.payamt.ToString("#,0")</span>원</dd>
                 </dl>
diff --git a/Model/Pay.cs b/Model/Pay.cs
index 3bc9980..2648b51 100644
--- a/Model/Pay.cs
+++ b/Model/Pay.cs
@@ -76,7 +76,7 @@ namespace NP.Model
         {
             get
             {
-                return rstatus == 2 ? "전액환불" : rstatus == 1 ? "부분환불" : pstatus == 1 ? "결제완료" : pstatus == 22 ? "입금대기" : "결제취소";
+                return rstatus == 2 ? "환불" : rstatus == 1 ? "환불" : pstatus == 1 ? "결제완료" : pstatus == 22 ? "입금대기" : "결제취소";
             }
         }
         public String pstatusname2
@@ -304,7 +304,7 @@ namespace NP.Model
             {
                 return rstatus == 1 && payamt <= refundamt ? "전액환불" : (pstatusname+(isunpay == 1 ? "(미수)":isunpay == 2 ? "(미수입금)":""));
             }
-        }
+        } 
         public int isunpay { get; set; }
         /// <summary>
         /// 환불상태    0:정상,1:부분환불,2:전체환불
@@ -569,6 +569,10 @@ namespace NP.Model
         /// 교육일정학습장소명(온라인혼합)
         /// </summary>
         public String cmistudyplacename { get; set; }
+        /// <summary>
+        /// 학습기간(상시:일)
+        /// </summary>
+        public int studydays { get; set; }
     }
 
     /// <summary>