diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index 537644e..c539f0e 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -70,23 +70,24 @@ @:@p.pstatusname2 @*@(p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 && p.paylimit.Value > DateTime.Now?string.Format("(만료일: {0})", p.paylimit.Value.ToString("yyyy-MM-dd")):"")*@ } @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0@*&& p.paylimit.Value < DateTime.Now*@) -{ -미수처리 -결제완료처리 -} -else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1) -{ -@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) -미수입금처리 -} -else if (p.isunpay == 2) -{ -@:(미수입금) -} -else if (p.isunpay == 3) -{ -@:(결제변경) -} + { + 미수처리 + 결제완료처리 + 취소 + } + else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1) + { + @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) + 미수입금처리 + } + else if (p.isunpay == 2) + { + @:(미수입금) + } + else if (p.isunpay == 3) + { + @:(결제변경) + } @@ -505,7 +506,17 @@ else if (p.isunpay == 3) opener.searchthis(); } } - + function cancelpay(payno, userno) { + if (confirm("상품을 결제취소처리하시겠습니까?")) { + capp("/acommon/paycancelpay", { payno: payno, userno: userno }, "cbcancelpay"); + } + } + function cbcancelpay() { + if (capResult.code == 1000) { + msg("결제최소처리되었습니다.", null, null, null, null, "location.href='/croom/payview?payno=@p.payno'"); + opener.searchthis(); + } + } function rfdinfosave() { if (confirm("환급정보를 저장하시겠습니까?")) { capp("/acommon/PayRefundInfoSave", { payno: @p.payno, rbank: $("#rbank").val(), rbankaccnum: $("#rbankaccnum").val(), tbankuser: $("#tbankuser").val() }, "rfdsave"); diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index d5c48a1..c7b3ebd 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1288,6 +1288,11 @@ namespace NP.Base.Controllers return JsonOK(Dao.Save("pay.abspay", new Hashtable() { { "payno", payno }, { "ptype", ptype}, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); } [HttpPost] + public JsonResult PayCancelPay(Int64 payno, int userno) + { + return JsonOK(Dao.Save("pay.paycancel", new Hashtable() { { "payno", payno }, { "userno", userno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); + } + [HttpPost] public JsonResult PayUnPayMoney(Int64 payno, DateTime payoktime) { return JsonOK(Dao.Save("pay.unpaymoney", new Hashtable() { { "payno", payno },{ "payoktime", payoktime}, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index 0451333..32a000e 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -916,7 +916,7 @@