This commit is contained in:
hyunho 2020-11-18 01:48:42 +00:00
parent 9694c617e4
commit b2ca78503b
5 changed files with 51 additions and 71 deletions

View File

@ -659,6 +659,7 @@
<dynamic prepend="where">
<isNotNull property="payno" prepend="and">a.payno=#payno#</isNotNull>
<isNotNull property="rstatus" prepend="and">a.rstatus=#rstatus#</isNotNull>
<isNotNull property="withoutrstatus" prepend="and">a.rstatus&lt;&gt;#withoutrstatus#</isNotNull>
</dynamic>
</select>
<select id="pay.mypayrfdinfo" parameterClass="long" resultClass="payrfd">
@ -670,7 +671,7 @@
from payrfd a
<dynamic prepend="where">
<isNotNull property="payno" prepend="and">a.payno=#payno#</isNotNull>
<isNotNull property="rstatus" prepend="and">a.rstatus&gt;&lt;#rstatus#</isNotNull>
<isNotNull property="rstatus" prepend="and">a.rstatus&lt;&gt;#rstatus#</isNotNull>
</dynamic>
order by a.cdt desc
</select>

View File

@ -244,11 +244,13 @@ namespace NP.FO.Controllers
}
vm.PayItems = Dao.Get<PayItem>("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } });
vm.PayItem = Dao.Get<PayItem>("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }).FirstOrDefault();
vm.intval3 = Dao.Get<PayRfd>("pay.mypayrfd", new System.Collections.Hashtable() { { "payno", vm.Pay.payno },{ "rstatus", 0} }).Count();
vm.intval3 = Dao.Get<PayRfd>("pay.mypayrfd", new System.Collections.Hashtable() { { "payno", vm.Pay.payno }/*,{ "rstatus", 0}*/, { "withoutrstatus" , 4} }).Count();
vm.PayRfd = null;
if (vm.intval3 > 0)
{
vm.PayRfd = Dao.Get<PayRfd>("pay.mypayrfdinfo", new System.Collections.Hashtable() {{ "payno", vm.payno }, { "rstatus", 4 } }).FirstOrDefault();
if (vm.PayRfd != null)
{
vm.FileList = new List<File>() { };
if (vm.PayRfd.fgnor != null)
{
@ -267,6 +269,7 @@ namespace NP.FO.Controllers
}
}
}
}
return View(vm);
}

View File

@ -1,12 +1,8 @@
@model NP.Model.VMPay
@{
bool isRfd = Model.intval3 > 0 ? true : false;
}
<style>
.confirmokbutton {
color: white;
}
</style>
<h4 class="bskTitle">주문상품 정보</h4>
<p class="odrNum">결제번호 : @(Model.Pay.payno < 1000000 ? Model.Pay.payno.ToString("000000") : Model.Pay.payno.ToString())</p>
<table class="bskList">
@ -47,7 +43,7 @@
</tr>
</table>
@if (Model.intval3 > 0)
@if (Model.intval3 > 0 && Model.PayRfd != null)
{
<h4 class="bskTitle">환불 정보</h4>
<table class="odrTable">
@ -97,7 +93,7 @@
}
@if (Model.Pay.pstatus == 1 && Model.Pay.rstatus != 2 && Model.PayItems.Where(w => w.rstatus == 0).Count() > 0)
{
if (Model.intval3 > 0 && (Model.PayRfd.rstatus == 0 || Model.PayRfd.rstatus == 1))
if (Model.intval3 > 0 && Model.PayRfd != null && (Model.PayRfd.rstatus == 0 || Model.PayRfd.rstatus == 2))
{
<li><a href="#" onclick="refund()" class="bk" style="display:none">환불요청</a></li>
}
@ -127,7 +123,6 @@
<tr>
<th>신청강좌</th>
<td>
@*<ul class="odrChk" id="pibox"></ul>*@
@Model.PayItem.itemname
</td>
</tr>
@ -234,55 +229,55 @@
<table class="odrTable th150">
<tr class="pd5" style="@(Model.Pay.ptype == 1 ? "display:none;" : "")">
<th>환불은행</th>
<td><input type="text" name="bankname" id="bankname" maxlength="30" value="" /></td>
<td><input type="text" name="bankname" id="bankname" maxlength="30" value="@(isRfd? Model.PayRfd.bankname : "")" @(isRfd? "readonly":"") /></td>
</tr>
<tr class="pd5" style="@(Model.Pay.ptype == 1 ? "display:none;" : "")">
<th>예금주</th>
<td><input type="text" name="bankowner" id="bankowner" maxlength="30" /></td>
<td><input type="text" name="bankowner" id="bankowner" maxlength="30" value="@(isRfd? Model.PayRfd.bankowner : "")" @(isRfd? "readonly":"")/></td>
</tr>
<tr class="pd5" style="@(Model.Pay.ptype == 1 ? "display:none;" : "")">
<th>환불계좌</th>
<td><input type="text" name="bankno" id="bankno" maxlength="30" value="" /></td>
<td><input type="text" name="bankno" id="bankno" maxlength="30" value="@(isRfd? Model.PayRfd.bankno : "")" @(isRfd? "readonly":"")/></td>
</tr>
<tr style="@(Model.Pay.ptype == 1 ? "display:none;" : "")">
<th>개인계좌여부</th>
<td>
<input type="hidden" name="isowner" id="isowner" />
<ul class="bakRadio">
<li><input type="radio" name="isowners" id="isowner1" checked /><label for="isowner1">예</label></li>
<li><input type="radio" name="isowners" id="isowner0" /><label for="isowner0">아니오</label></li>
<li><input type="radio" name="isowners" id="isowner1" @(isRfd? Model.PayRfd.isowner == 1? "checked" : "" : "checked") value="1" onclick="@(isRfd? "return(false);":"")"/><label for="isowner1">예</label></li>
<li><input type="radio" name="isowners" id="isowner0" @(isRfd? Model.PayRfd.isowner == 0? "checked" : "" : "") value="0" onclick="@(isRfd? "return(false);":"")"/><label for="isowner0">아니오</label></li>
</ul>
</td>
</tr>
<tr class="pd5">
<th>담당자</th>
<td><input type="text" name="ruser" id="ruser" value="" /></td>
<td><input type="text" name="ruser" id="ruser" value="@(isRfd? Model.PayRfd.ruser : "")" @(isRfd? "readonly":"")/></td>
</tr>
<tr class="pd5">
<th>담당자연락처</th>
<td><input type="text" name="rphone" id="rphone" value="" /></td>
<td><input type="text" name="rphone" id="rphone" value="@(isRfd? Model.PayRfd.rphone : "")" @(isRfd? "readonly":"")/></td>
</tr>
<tr>
<th>환불요청사유</th>
<td>
<ul class="bakRadio">
<li><input type="radio" name="rreason" id="rreason1" checked="checked" value="0" /><label for="rreason1">교육취소</label></li>
<li><input type="radio" name="rreason" id="rreason2" value="1" /><label for="rreason2">과정변경</label></li>
<li><input type="radio" name="rreason" id="rreason3" value="2" /><label for="rreason3">과입금</label></li>
<li><input type="radio" name="rreason" id="rreason4" value="9" /><label for="rreason4">기타</label></li>
<li><input type="radio" name="rreason" id="rreason1" @(isRfd? Model.PayRfd.rreason == 0? "checked" : "" : "checked") value="0" onclick="@(isRfd? "return(false);":"")"/><label for="rreason1">교육취소</label></li>
<li><input type="radio" name="rreason" id="rreason2" @(isRfd? Model.PayRfd.rreason == 1? "checked" : "" : "") value="1" onclick="@(isRfd? "return(false);":"")"/><label for="rreason2">과정변경</label></li>
<li><input type="radio" name="rreason" id="rreason3" @(isRfd? Model.PayRfd.rreason == 2? "checked" : "" : "") value="2" onclick="@(isRfd? "return(false);":"")"/><label for="rreason3">과입금</label></li>
<li><input type="radio" name="rreason" id="rreason4" @(isRfd? Model.PayRfd.rreason == 9? "checked" : "" : "") value="9" onclick="@(isRfd? "return(false);":"")"/><label for="rreason4">기타</label></li>
</ul>
</td>
</tr>
<tr class="pd5">
<th>메모</th>
<td>
<textarea name="rtext" id="rtext" rows="4" style="border:1px solid #cbcbcb; width:100%"></textarea>
<textarea name="rtext" id="rtext" rows="4" style="border:1px solid #cbcbcb; width:100%; @(isRfd?"background-color:#f5f5f5;": "")" @(isRfd? "readonly":"")>@(isRfd? Model.PayRfd.rtext : "")</textarea>
</td>
</tr>
</table>
@if (Model.intval3 > 0 && Model.PayRfd.rstatus == 0)
@if (Model.intval3 > 0)
{
if (Model.PayRfd.fgnob == null || Model.PayRfd.fgnor == null)
{
@ -301,10 +296,7 @@
</tr>
</table>
}
}
else if (Model.intval3 > 0 && Model.PayRfd.rstatus == 0)
{
if (Model.PayRfd.fgnob != null || Model.PayRfd.fgnor != null)
else if (Model.PayRfd.fgnob != null && Model.PayRfd.fgnor != null)
{
<h4 class="bskTitle">첨부서류</h4>
<table class="odrTable th150">
@ -323,14 +315,20 @@
<th>검토상태</th>
<td>@Model.PayRfd.rstatusname</td>
</tr>
@if (Model.PayRfd.rstatus == 1)
{
<tr class="pd5">
<th>검토의견</th>
<td>@Model.PayRfd.rback</td>
<td>
<label>@Model.PayRfd.rback</label>
</td>
</tr>
}
</table>
}
}
@if (Model.intval3 > 0 && Model.PayRfd.rstatus == 0 && (Model.PayRfd.fgnob == null || Model.PayRfd.fgnor == null))
@if ((Model.intval3 > 0 && (Model.PayRfd.fgnob == null || Model.PayRfd.fgnor == null)) || Model.intval3 <= 0)
{
<p class="odrpDesc" style="color:red">
※ 위 신청서를 작성한 이후, 신청서를 날인/스캔하여 통장사본과 같이 업로드를 해주셔야 합니다.
@ -453,30 +451,7 @@
$("#pop2").fadeIn("fast", function () {
$(".pop1box").scrollTop(0);
});
if (@Model.intval3 > 0) {
@*if (@Model.PayRfd != null) {
$("#bankname").val("@Model.PayRfd.bankname").attr("readonly", true);
$("#bankowner").val("@Model.PayRfd.bankowner").attr("readonly", true);
$("#bankno").val("@Model.PayRfd.bankno").attr("readonly", true);
if (@Model.PayRfd.isowner == 0) {
$("input:radio[name=isowners]:radio[value=0]").prop('checked', true);
}
else {
$("input:radio[name=isowners]:radio[value=1]").prop('checked', true);
}
if (@Model.PayRfd.rreason == 0) { $("input:radio[name=rreason]:radio[value=0]").prop('checked', true); }
else if (@Model.PayRfd.rreason == 1) { $("input:radio[name=rreason]:radio[value=0]").prop('checked', true); }
else if (@Model.PayRfd.rreason == 2) { $("input:radio[name=rreason]:radio[value=0]").prop('checked', true); }
else if (@Model.PayRfd.rreason == 9) { $("input:radio[name=rreason]:radio[value=0]").prop('checked', true); }
$("#ruser").val("@Model.PayRfd.ruser").attr("readonly", true);
$("#rphone").val("@Model.PayRfd.rphone").attr("readonly", true);
$("#rtext").val("@Model.PayRfd.rtext").attr("readonly", true).css("background-color", "#f5f5f5");
$("input:radio[name=isowners]").attr('disabled', true);
$("input:radio[name=rreason]").attr('disabled', true);
}*@
}
@*if ('@(Model.Pay.rstatus < 2 && Model.Pay.pstatus == 1?1:0)' == '1') {
capp("/fcommon/payrefundget", { payno: @Model.Pay.payno}, "cbpayrefundget");
} else {

View File

@ -43,7 +43,7 @@
<div id="bglayer" style="display:none;"></div>
<div id="layermessage"><div></div><a href="#" class="mainokbutton" onclick="javascript:hidelayermsg();">확인</a></div>
<div id="bgprogress">...</div>
<div id="confirmbox"><div id="confirmboxmsg">dddd</div><div class="confirmbtnbox"><a href="#" class="btn btn1 confirmokbutton" onclick="confirmok();">예</a><a href="#" class="btn btn0 confirmokbutton" onclick="confirmtoggle();">아니오</a></div></div>
<div id="confirmbox"><div id="confirmboxmsg">dddd</div><div class="confirmbtnbox"><a href="#" class="btn btn1 confirmokbutton" onclick="confirmok();" style="color:white !important">예</a><a href="#" class="btn btn0 confirmokbutton" onclick="confirmtoggle();" style="color:white !important">아니오</a></div></div>
<script>
var _ismain = 1;
$("li.topsubmenu@(ViewBag.MenuPage.m1)").addClass("current");

View File

@ -920,11 +920,12 @@ namespace NP.Model
/// 상태 0:요청(접수),1:반려,2:완료
/// </summary>
public int rstatus { get; set; }
public int withoutrstatus { get; set; }
public String rstatusname
{
get
{
return rstatus == 0 ? "접수" : rstatus == 1 ? "반려" : rstatus == 2 ? "완료" : "?";
return rstatus == 0 ? "검토중" : rstatus == 1 ? "환불거절" : rstatus == 2 ? "환불완료" : "?";
}
}
/// <summary>