diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index 4964d24..732b99a 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -659,7 +659,7 @@ a.payno=#payno# a.rstatus=#rstatus# - a.rstatus<>#withoutrstatus# + a.rstatus not in($withoutrstatus$) @@ -762,6 +762,8 @@ order by d.rfdno,b.rstatus,ispast,b.pino + delete from payrfditem where rfdno=#rfdno#; + delete from payrfd where payno=#payno# and rfdno=#rfdno#; insert into payrfd(payno,rtext,bankname,bankno,bankowner,isowner,rstatus,ruser,rphone,rreason,fgnor,fgnob,) select distinct #payno#,#rtext#,#bankname# ,HEX(AES_ENCRYPT(#bankno#, )) @@ -796,6 +798,7 @@ set rstatus=#rstatus#,udt=now(),uno=#uno#,uip=#uip# where rfdno=#rfdno# and payno=#payno# + update examuser a inner join pay b on b.payno=a.payno and b.pstatus=22 and b.ptype=3 and b.ispg=1 and b.isunpay is null and b.userno=a.userno diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index 8af24b6..cd1085d 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -244,11 +244,11 @@ 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}*/, { "withoutrstatus" , 4} }).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.PayRfd = Dao.Get("pay.mypayrfdinfo", new System.Collections.Hashtable() {{ "payno", vm.payno }, { "withoutrstatus", "4" } }).FirstOrDefault(); if (vm.PayRfd != null) { vm.FileList = new List() { }; diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml index 4bbb736..f993a29 100644 --- a/FO/Views/My/PayInfo.cshtml +++ b/FO/Views/My/PayInfo.cshtml @@ -1,8 +1,12 @@ @model NP.Model.VMPay @{ - bool isRfd = Model.intval3 > 0 ? true : false; + bool isRfd = (Model.intval3 > 0) ? true : false; } - +

주문상품 정보

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

@@ -35,13 +39,20 @@ } - @if (Convert.ToDateTime(Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) >= Convert.ToDateTime(Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) + @if (Model.Pay.paylimit != null && Model.PayItem.retime != null) { - + if (Convert.ToDateTime(Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) >= Convert.ToDateTime(Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) + { + + } + else + { + + } } else { - + } @@ -85,36 +96,40 @@
주문접수일@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "")@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "")@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "")@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "")@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm")
} -
    -
  • 결제현황 이동
  • - @if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1) - { - if (Convert.ToDateTime(Convert.ToDateTime(Model.Pay.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-10"))) +
      +
    • 결제현황 이동
    • + @if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1) { -
    • 계산서요청
    • + if (Convert.ToDateTime(Convert.ToDateTime(Model.Pay.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-10"))) + { +
    • 계산서요청
    • + } + else + { +
    • 계산서요청
    • + } } - else + @if (Model.Pay.pstatus == 1 && Model.Pay.rstatus != 2 && Model.PayItems.Where(w => w.rstatus == 0).Count() > 0) { -
    • 계산서요청
    • - } - } - @if (Model.Pay.pstatus == 1 && Model.Pay.rstatus != 2 && Model.PayItems.Where(w => w.rstatus == 0).Count() > 0) - { - if (Model.intval3 > 0 && Model.PayRfd != null && (Model.PayRfd.rstatus == 0 || Model.PayRfd.rstatus == 2)) - { -
    • - } - else - { -
    • 환불요청
    • - } + if (Model.intval3 > 0 && Model.PayRfd != null && (Model.PayRfd.rstatus == 0 || Model.PayRfd.rstatus == 2)) + { +
    • + } + else if (Model.intval3 > 0 && Model.PayRfd != null && Model.PayRfd.rstatus == 1) + { +
    • 환불요청
    • + } + else + { +
    • 환불요청
    • + } - } - @if (Model.Pay.rstatus < 2 && Model.Pay.pstatus == 22) - { -
    • 결제취소
    • - } -
    + } + @if (Model.Pay.rstatus < 2 && Model.Pay.pstatus == 22) + { +
  • 결제취소
  • + } +
@@ -399,7 +481,7 @@ @Html.Partial("./Partial/filescript") } @section scripts{ - + function saveReject() { + if ('@(Model.Pay.ptype)' != '1' && check("banknameR", null, "환불은행명을 입력해주세요.")) { } + else if ('@(Model.Pay.ptype)' != '1' && check("bankownerR", null, "예금주를 입력해주세요.")) { } + else if ('@(Model.Pay.ptype)' != '1' && check("banknoR", null, "환불계좌번호를 입력해주세요.")) { } + else if ('@(Model.Pay.ptype)' != '1' && $("input[name='isownersR']:checked").length < 1) { msg("개인계좌여부를 선택해주세요."); } + else if (check("ruserR", null, "담당자를 입력해주세요.")) { } + else if (check("rphoneR", null, "담당자연락처를 입력해주세요.")) { } + else if (check("rtextR", null, "메모를 입력해주세요.")) { } + else if ($("#chkrefundR:checked").length < 1) { msg("환불규정에 동의 후 요청해주세요."); } + else { + setv("isownerR", $("#isowner1R").prop("checked") ? 1 : 0); + confirmtoggle(true, "환불요청하시겠습니까?", "confirmReject()"); + } + } + function confirmReject() { + $.when( + $("#bankname").val($("#banknameR").val()), + $("#bankowner").val($("#bankownerR").val()), + $("#bankno").val($("#banknoR").val()), + $("#isowner").val($("#isownerR").val()), + $("#ruser").val($("#ruserR").val()), + $("#rphone").val($("#rphoneR").val()), + $("#rreason").val($("#rreasonR").val()), + $("#rtext").val($("#rtextR").val()), + $("#chkrefund").val($("#chkrefundR").val()), + ).done(function () { + gogo2(); + }); + } + } \ No newline at end of file