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 <> 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 ? "환급" : "")
@Model.PayItem.itemname
+ @if (Model.PayItem.sdate != null && Model.PayItem.edate != null)
+ {
- - 학습기간 : @(Convert.ToDateTime(Model.PayItem.sstime).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.setime).ToShortDateString())
+ - 학습기간 : @(Convert.ToDateTime(Model.PayItem.sdate).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.edate).ToShortDateString())
+ }
+ else
+ {
+
+ - 학습기간 : @(Model.PayItem.studydays)일
+
+ }
- 가격 : @Model.PayItem.payamt.ToString("#,0")원
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; }
///
/// 환불상태 0:정상,1:부분환불,2:전체환불
@@ -569,6 +569,10 @@ namespace NP.Model
/// 교육일정학습장소명(온라인혼합)
///
public String cmistudyplacename { get; set; }
+ ///
+ /// 학습기간(상시:일)
+ ///
+ public int studydays { get; set; }
}
///