Base/Controller/FCommonPay.cs

@@ -382,6 +382,18 @@ namespace NP.Base.Controllers
             return JsonOK(Dao.Save("pay.paycart.flag", new Hashtable() { { "pcno" + (pcnos.Contains(",") ? "s" : ""), pcnos }, { "userno", SUserInfo.UserNo }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }));
         }
         [HttpPost]
+        public JsonResult PayItemGet(Int64 payno)
+        {
+            Pay pay = Dao.Get<Pay>("pay.mypay", new Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", payno } }).FirstOrDefault();
+            PayItem payitem = Dao.Get<PayItem>("pay.mypayitem", new Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", payno } }).FirstOrDefault();
+            PayItem result = new PayItem() { payamt = pay.payamt, payoktime = pay.payoktime, ptype = pay.ptype, ispg = pay.ispg, itemname = payitem.itemname, payamt2 = payitem.payamt, pino = payitem.pino, payno = pay.payno };
+            if(payitem != null)
+            {
+                return JsonBack(new JsonRtn() {code = 1000,obj= result});
+            }
+            return JsonOK(0);
+        }
+        [HttpPost]
         public JsonResult PayTaxGet(Int64 payno)
         {
             var rtn = new Hashtable() { };

Dao/MyBatis/Maps/Lect.xml

@@ -1310,9 +1310,10 @@
             ,b.rstime,b.retime
             ,b.sstime,b.setime
             ,c.tyear,c.tseq
-            ,e.pstatus,e.payamt
+            ,e.pstatus,e.payamt,e.ptype,e.ispg
             ,f.estart,f.eend
             ,cc.cname studyplacename
+            ,pt.taxno,pt.taxdate
             ,row_number() over(order by a.cdt desc) rno
             ,count(a.lectno) over() pagetotalcount
           from lect a
@@ -1321,6 +1322,7 @@
           inner join pay e on e.payno = a.payno
           left outer join cminningscd f on f.cmisno = a.cmisno 
           left outer join comcode cc on cc.ccode = b.studyplace 
+          left outer join paytax pt on pt.payno = e.payno and ifnull(pt.iscancel,0) =0
           where a.userno = #userno# and a.status=1 and a.ischanged=0
         ) a
         <include refid="sql.pagedynamic"></include>

FO/Views/My/PayInfo.cshtml

@@ -98,7 +98,7 @@
 
     <ul class="bskBtn col1">
         <li><a href="/My/Paies" class="bk">결제현황 이동</a></li>
-        @if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1)
+        @if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1 && Model.Pay.ptype != 6)
         {
             if (Convert.ToDateTime(Convert.ToDateTime(Model.Pay.payoktime).ToString("yyyy-MM-dd")) <= Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-10")))
             {

Model/CM.cs

@@ -897,6 +897,7 @@ namespace NP.Model
         public String telno { get; set; }
 
         public int ptype { get; set; }
+        public int ispg { get; set; }
         public String ptypename { get; set; }
         public int? pcno { get; set; }
         public String pcno2 { get; set; }
@@ -1054,6 +1055,8 @@ namespace NP.Model
         public int ispassat { get; set; }
         public DateTime? completetime { get; set; }
         public String studyplacename { get; set; }
+        public int taxno { get; set; }
+        public DateTime taxdate { get; set; }
     }
     /// <summary>
     /// 자격검정시험  

Model/Pay.cs

@@ -465,6 +465,7 @@ namespace NP.Model
         public String tbankuser{ get; set; }
         public int? infee { get; set; }
         public int? outfee { get; set; }
+        public int ispg { get; set; }
     }
 
     /// <summary>