diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index 9dcefca..e852794 100644 Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index f63be76..6c90c8a 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -681,11 +681,11 @@ namespace NP.Base.Controllers else { //2)API 요청 실패 화면처리 - /* - Response.Write("결제 부분취소요청이 실패하였습니다.
"); - Response.Write("TX Response_code = " + xpay.m_szResCode + "
"); - Response.Write("TX Response_msg = " + xpay.m_szResMsg + "

"); - */ + + //Response.Write("결제 부분취소요청이 실패하였습니다.
"); + //Response.Write("TX Response_code = " + xpay.m_szResCode + "
"); + //Response.Write("TX Response_msg = " + xpay.m_szResMsg + "

"); + return JsonOK(0); } } diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs index 1e5951a..ea4da47 100644 --- a/Base/Controller/BasePartialController.cs +++ b/Base/Controller/BasePartialController.cs @@ -1240,6 +1240,8 @@ namespace NP.Base var us = m.Users.Where(w => w.isok == 1).ToList(); if (us.Count() > 0) { + m.mcontents = us.FirstOrDefault().mcontents; + Dao.Insert("common.sms.in", m); System.Text.StringBuilder sb = new System.Text.StringBuilder(""); for (var i = 0; i < us.Count(); i++) { @@ -1272,6 +1274,7 @@ namespace NP.Base { m.uno = SUserInfo.UserNo; m.uip = GetUserIP(); + m.mcontents = us.FirstOrDefault().mcontents; Dao.Insert("common.sms.in", m); System.Text.StringBuilder sbm = new System.Text.StringBuilder(""); System.Text.StringBuilder sbs = new System.Text.StringBuilder(""); diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index 06a0759..ed983f3 100644 Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 7f5b48b..288683d 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -992,8 +992,19 @@ inner join cm c on c.cmno=a.itemno and c.rstime < and c.retime > inner join lect l on l.cmno=c.cmno and (l.status < 5 or l.status = 6) and l.ischanged=0 and l.userno=b.userno inner join term d on d.tmno=c.tmno + left outer join ( + select l.lectno + ,count(li.cmino) cnt + from payitem a + inner join pay b on b.payno= a.payno and b.pstatus in (1,21,22,51,55) and b.rstatus < 2 + inner join cm c on c.cmno = a.itemno and c.rstime < and c.retime > + inner join lect l on l.cmno = c.cmno and (l.status < 5 or l.status = 6) and l.ischanged =0 and l.userno = b.userno + left outer join lectinning li on li.lectno = l.lectno and li.istatus is not null + where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (1,21,22,51,55) and a.rstatus =0 + group by l.lectno + )li on li.lectno = l.lectno left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0 - where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (1,21,22,51,55) and a.rstatus=0 + where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (1,21,22,51,55) and a.rstatus=0 and li.cnt = 0 order by rno ) a union all diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index 46d26b5..8afe29e 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 8614bd2..3026935 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -908,6 +908,7 @@ namespace NP.FO.Controllers var pay = new Pay() { pplno = vm.pplno, + ispg = 1, ptype = 0, userno = SUserInfo.UserNo, pstatus = 55,