결제현황 목록,상세:부분환불/전체환불 모두 그냥 '환불' 로 표기

결제현황 상세 : 학습기간이 0001-01-01 ~ 0001-01-01 로 표기되는 문제 (상시 결제대기시 학습날짜로 표시)
This commit is contained in:
lch 2021-06-28 04:56:25 +00:00
parent a53e84be11
commit 27464be01a
3 changed files with 19 additions and 3 deletions

View File

@ -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

View File

@ -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>

View File

@ -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
@ -569,6 +569,10 @@ namespace NP.Model
/// 교육일정학습장소명(온라인혼합)
/// </summary>
public String cmistudyplacename { get; set; }
/// <summary>
/// 학습기간(상시:일)
/// </summary>
public int studydays { get; set; }
}
/// <summary>