diff --git a/Base/Controller/FCommonPay.cs b/Base/Controller/FCommonPay.cs index 422a591..8208f42 100644 --- a/Base/Controller/FCommonPay.cs +++ b/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.mypay", new Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", payno } }).FirstOrDefault(); + PayItem payitem = Dao.Get("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() { }; diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 1907c84..a0a02eb 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/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 diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml index f993a29..6a1f48e 100644 --- a/FO/Views/My/PayInfo.cshtml +++ b/FO/Views/My/PayInfo.cshtml @@ -98,7 +98,7 @@