From d630de88f0db6aba10634139c121839f10537374 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Mon, 12 Jul 2021 09:04:06 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=9A=B4=EC=98=81>=EA=B2=B0?=
 =?UTF-8?q?=EC=A0=9C=EB=82=B4=EC=97=AD>=EA=B2=B0=EC=A0=9C=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC(=EA=B8=B0=EB=B3=B8=EC=A0=95=EB=B3=B4)=20:=20"?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20:=20=EC=9E=85=EA=B8=88=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EC=9A=94=EC=B2=AD=20:=20=EC=B7=A8?=
 =?UTF-8?q?=EC=86=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=20-=20=EB=AF=B8=EC=88=98=EC=B2=98=EB=A6=AC/?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=99=84=EB=A3=8C=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EB=92=A4=EC=97=90=20'=EC=B7=A8=EC=86=8C'=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20=20-=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EC=B7=A8=EC=86=8C=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=20-=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EA=B2=B0=EC=A0=9C=EB=B2=88=ED=98=B8=20550?=
 =?UTF-8?q?=20=EA=B3=BC=20=EA=B0=99=EC=9D=80=20=EC=83=81=ED=83=9C=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=20=20=20(=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9E=85=EA=B8=88=EC=A0=84=20=EC=B7=A8?=
 =?UTF-8?q?=EC=86=8C=20=ED=96=88=EC=9D=84=20=EB=95=8C=EC=99=80=20=EB=8F=99?=
 =?UTF-8?q?=EC=9D=BC=20=EC=83=81=ED=83=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 현재 입금대기 상태일 경우 사용자에서는 신청 취소가 되나 관리자에서는 취소가 불가능"
---
 BO/Views/croom/payview.cshtml   | 47 ++++++++++++++++++++-------------
 Base/Controller/ACommonCRoom.cs |  5 ++++
 Dao/MyBatis/Maps/CRoom.xml      |  2 +-
 3 files changed, 35 insertions(+), 19 deletions(-)

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*@)
-{
-<a href="#" class="btn btn-primary" onclick="unpay(@p.payno)">미수처리</a>
-<a href="#" class="btn btn-primary" onclick="abspay(@p.payno)">결제완료처리</a>
-}
-else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1)
-{
-@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } })
-<a href="#" class="btn btn-primary" onclick="unpaymoney(@p.payno)">미수입금처리</a>
-}
-else if (p.isunpay == 2)
-{
-@:(미수입금)
-}
-else if (p.isunpay == 3)
-{
-@:(결제변경)
-}
+                {
+                    <a href="#" class="btn btn-primary" onclick="unpay(@p.payno)">미수처리</a>
+                    <a href="#" class="btn btn-primary" onclick="abspay(@p.payno)">결제완료처리</a>
+                    <a href="#" class="btn btn-primary" onclick="cancelpay(@p.payno, @p.userno)">취소</a>
+                }
+                else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1)
+                {
+                    @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } })
+                    <a href="#" class="btn btn-primary" onclick="unpaymoney(@p.payno)">미수입금처리</a>
+                }
+                else if (p.isunpay == 2)
+                {
+                    @:(미수입금)
+                }
+                else if (p.isunpay == 3)
+                {
+                    @:(결제변경)
+                }
             </td>
         </tr>
         <tr>
@@ -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 @@
         </select>
         <select id="cr.pay1" parameterClass="long" resultClass="pay">
             select p.payno,p.cdt,p.payamt,p.ptype,p.refundamt,p.ispg,p.isgroup,p.isexam,p.pstatus,p.rstatus,p.payoktime,p.pgkey,p.isdvr,p.deliamt,p.isunpay,p.paylimit
-            ,u.username,u.post,u.address1,u.address2
+            ,u.userno,u.username,u.post,u.address1,u.address2
             ,CAST(AES_DECRYPT(UNHEX(u.userpno), <include refid="sql.digest"></include>) AS char) userpno
             ,CAST(AES_DECRYPT(UNHEX(u.telno), <include refid="sql.digest"></include>) AS char) telno
             ,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) mobile