KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2021-07-16 06:06:28 +00:00
parent 1272c56e1d
commit 4da3724a67
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dao/MyBatis/Maps/Pay.xml
View File

@ -940,6 +940,7 @@
<dynamic prepend="where"> <dynamic prepend="where">
<isNotNull property="pplno" prepend="and">a.pplno=#pplno#</isNotNull> <isNotNull property="pplno" prepend="and">a.pplno=#pplno#</isNotNull>
<isNotNull property="userno" prepend="and">a.userno=#userno#</isNotNull> <isNotNull property="userno" prepend="and">a.userno=#userno#</isNotNull>
<isNotNull property="istax" prepend="and">b.pstatus &gt; 0</isNotNull>
</dynamic> </dynamic>
</select> </select>
<select id="pay.payresult" parameterClass="hashtable" resultClass="payitem"> <select id="pay.payresult" parameterClass="hashtable" resultClass="payitem">

2
FO/Controllers/FOBaseController.cs
View File

@ -657,7 +657,7 @@ namespace NP.FO.Controllers
if (vm.Pay.ptype == 3) { if (vm.Pay.ptype == 3) {
try try
{ {
vm.PPLog = Dao.Get<PPLog>("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo } }).FirstOrDefault(); vm.PPLog = Dao.Get<PPLog>("pay.pplogs", new Hashtable() { { "pplno", vm.pplno }, { "userno", SUserInfo.UserNo },{"istax",1 } }).FirstOrDefault();
if (payno > 0 && vm.PPLog != null && vm.PPLog.pstatus == 22 && vm.PPLog.isbill == 1) if (payno > 0 && vm.PPLog != null && vm.PPLog.pstatus == 22 && vm.PPLog.isbill == 1)
{ {
PayTax payTax = new PayTax(); PayTax payTax = new PayTax();

2
FO/Views/Account/SNSLinkCallback.cshtml
View File

@ -94,7 +94,7 @@
} }
else if(capResult.code == -99){ else if(capResult.code == -99){
alert("이미 연동된 SNS 계정입니다. SNS 계정을 다시 확인해주세요."); alert("이미 연동된 SNS 계정입니다. SNS 계정을 다시 확인해주세요.");
return; goRefresh();
} }
else { else {
alert("SNS 연동에 실패하였습니다. \r\n관리자에게 문의하세요."); alert("SNS 연동에 실패하였습니다. \r\n관리자에게 문의하세요.");

18
FO/Views/My/Document.cshtml
View File

@ -172,15 +172,15 @@
} }
else else
{ {
if (item.payoktime < Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-11"))) /*입금확인후 익월 10일 이내까지 요청가능*/ //if (item.payoktime < Convert.ToDateTime(DateTime.Now.AddMonths(1).ToString("yyyy-MM-11"))) /*입금확인후 익월 10일 이내까지 요청가능*/
{ //{
@*<a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>*@ <a href="#" onclick="calltax(@(item.payno),'@(string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", item.payamt.ToString("#,0") + "원", item.payoktime.ToString("yy-MM-dd"), item.ptypename2, item.ispg == 1 ? "PG" : "현장결제", item.itemname, item.pipayamt.ToString("#,0") + "원", item.pino))')">[요청]</a>
<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a> @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
} //}
else //else
{ //{
<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a> @*<a href="#" onclick="viewtax('@(item.pgkey)', '@(Helpers.MD5Hash(ViewBag.mid + item.pgkey + ViewBag.mertkey))')">[인쇄]</a>*@
} //}
} }
} }
} }