diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index d861120..eea665d 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -659,6 +659,7 @@ a.payno=#payno# a.rstatus=#rstatus# + a.rstatus<>#withoutrstatus# diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index 83d8789..8af24b6 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -244,26 +244,29 @@ namespace NP.FO.Controllers } vm.PayItems = Dao.Get("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }); vm.PayItem = Dao.Get("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }).FirstOrDefault(); - vm.intval3 = Dao.Get("pay.mypayrfd", new System.Collections.Hashtable() { { "payno", vm.Pay.payno },{ "rstatus", 0} }).Count(); + vm.intval3 = Dao.Get("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("pay.mypayrfdinfo", new System.Collections.Hashtable() {{ "payno", vm.payno }, { "rstatus", 4 } }).FirstOrDefault(); - vm.FileList = new List() { }; - if (vm.PayRfd.fgnor != null) + if (vm.PayRfd != null) { - var fgnos = ""; + vm.FileList = new List() { }; if (vm.PayRfd.fgnor != null) { - fgnos += "," + vm.PayRfd.fgnor; - } - if (vm.PayRfd.fgnob != null) - { - fgnos += "," + vm.PayRfd.fgnob; - } - if (fgnos != "") - { - vm.FileList = GetFiles(fgnos.Substring(1)); + var fgnos = ""; + if (vm.PayRfd.fgnor != null) + { + fgnos += "," + vm.PayRfd.fgnor; + } + if (vm.PayRfd.fgnob != null) + { + fgnos += "," + vm.PayRfd.fgnob; + } + if (fgnos != "") + { + vm.FileList = GetFiles(fgnos.Substring(1)); + } } } } diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml index ff66aef..7e3d390 100644 --- a/FO/Views/My/PayInfo.cshtml +++ b/FO/Views/My/PayInfo.cshtml @@ -1,12 +1,8 @@ @model NP.Model.VMPay @{ - + bool isRfd = Model.intval3 > 0 ? true : false; } - +

주문상품 정보

결제번호 : @(Model.Pay.payno < 1000000 ? Model.Pay.payno.ToString("000000") : Model.Pay.payno.ToString())

@@ -47,7 +43,7 @@
-@if (Model.intval3 > 0) +@if (Model.intval3 > 0 && Model.PayRfd != null) {

환불 정보

@@ -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)) {
    • } @@ -127,7 +123,6 @@ @@ -234,55 +229,55 @@
    신청강좌 - @*
      *@ @Model.PayItem.itemname
      - + - + - + - + - +
      환불은행
      예금주
      환불계좌
      개인계좌여부
        -
        • -
        • +
        • +
      담당자
      담당자연락처
      환불요청사유
        -
        • -
        • -
        • -
        • +
        • +
        • +
        • +
      메모 - +
      - @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 @@ } - } - 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) {

      첨부서류

      @@ -323,14 +315,20 @@ - - - - + @if (Model.PayRfd.rstatus == 1) + { + + + + + } +
      검토상태 @Model.PayRfd.rstatusname
      검토의견@Model.PayRfd.rback
      검토의견 + +
      } } - @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) {

      ※ 위 신청서를 작성한 이후, 신청서를 날인/스캔하여 통장사본과 같이 업로드를 해주셔야 합니다. @@ -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 { diff --git a/FO/Views/Shared/_Layout.cshtml b/FO/Views/Shared/_Layout.cshtml index e8d52f1..903aa79 100644 --- a/FO/Views/Shared/_Layout.cshtml +++ b/FO/Views/Shared/_Layout.cshtml @@ -43,7 +43,7 @@

      ...
      - +