This commit is contained in:
parent
c01434b700
commit
1c908209a5
Binary file not shown.
|
|
@ -681,11 +681,11 @@ namespace NP.Base.Controllers
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//2)API 요청 실패 화면처리
|
//2)API 요청 실패 화면처리
|
||||||
/*
|
|
||||||
Response.Write("결제 부분취소요청이 실패하였습니다. <br>");
|
//Response.Write("결제 부분취소요청이 실패하였습니다. <br>");
|
||||||
Response.Write("TX Response_code = " + xpay.m_szResCode + "<br>");
|
//Response.Write("TX Response_code = " + xpay.m_szResCode + "<br>");
|
||||||
Response.Write("TX Response_msg = " + xpay.m_szResMsg + "<p>");
|
//Response.Write("TX Response_msg = " + xpay.m_szResMsg + "<p>");
|
||||||
*/
|
|
||||||
return JsonOK(0);
|
return JsonOK(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1240,6 +1240,8 @@ namespace NP.Base
|
||||||
var us = m.Users.Where(w => w.isok == 1).ToList();
|
var us = m.Users.Where(w => w.isok == 1).ToList();
|
||||||
if (us.Count() > 0)
|
if (us.Count() > 0)
|
||||||
{
|
{
|
||||||
|
m.mcontents = us.FirstOrDefault().mcontents;
|
||||||
|
Dao.Insert("common.sms.in", m);
|
||||||
System.Text.StringBuilder sb = new System.Text.StringBuilder("");
|
System.Text.StringBuilder sb = new System.Text.StringBuilder("");
|
||||||
for (var i = 0; i < us.Count(); i++)
|
for (var i = 0; i < us.Count(); i++)
|
||||||
{
|
{
|
||||||
|
|
@ -1272,6 +1274,7 @@ namespace NP.Base
|
||||||
{
|
{
|
||||||
m.uno = SUserInfo.UserNo;
|
m.uno = SUserInfo.UserNo;
|
||||||
m.uip = GetUserIP();
|
m.uip = GetUserIP();
|
||||||
|
m.mcontents = us.FirstOrDefault().mcontents;
|
||||||
Dao.Insert("common.sms.in", m);
|
Dao.Insert("common.sms.in", m);
|
||||||
System.Text.StringBuilder sbm = new System.Text.StringBuilder("");
|
System.Text.StringBuilder sbm = new System.Text.StringBuilder("");
|
||||||
System.Text.StringBuilder sbs = new System.Text.StringBuilder("");
|
System.Text.StringBuilder sbs = new System.Text.StringBuilder("");
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -992,8 +992,19 @@
|
||||||
inner join cm c on c.cmno=a.itemno and c.rstime < <include refid="sql.now"></include> and c.retime > <include refid="sql.now"></include>
|
inner join cm c on c.cmno=a.itemno and c.rstime < <include refid="sql.now"></include> and c.retime > <include refid="sql.now"></include>
|
||||||
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 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
|
inner join term d on d.tmno=c.tmno
|
||||||
left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0
|
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 < <include refid="sql.now"></include> and c.retime > <include refid="sql.now"></include>
|
||||||
|
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
|
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 and li.cnt = 0
|
||||||
order by rno
|
order by rno
|
||||||
) a
|
) a
|
||||||
union all
|
union all
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -908,6 +908,7 @@ namespace NP.FO.Controllers
|
||||||
var pay = new Pay()
|
var pay = new Pay()
|
||||||
{
|
{
|
||||||
pplno = vm.pplno,
|
pplno = vm.pplno,
|
||||||
|
ispg = 1,
|
||||||
ptype = 0,
|
ptype = 0,
|
||||||
userno = SUserInfo.UserNo,
|
userno = SUserInfo.UserNo,
|
||||||
pstatus = 55,
|
pstatus = 55,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue