From 41ce3f796b051d35ab1c32ab74b2c40257a58419 Mon Sep 17 00:00:00 2001 From: hyunho Date: Thu, 24 Dec 2020 05:37:26 +0000 Subject: [PATCH] --- Base/Controller/FCommonPay.cs | 6 ++++-- Dao/MyBatis/Maps/Pay.xml | 4 ++-- FO/Views/Course/ApplyPay.cshtml | 15 +++++++++++++-- Model/Pay.cs | 4 ++++ Model/VMPay.cs | 1 + 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Base/Controller/FCommonPay.cs b/Base/Controller/FCommonPay.cs index 105e1db..12ec30e 100644 --- a/Base/Controller/FCommonPay.cs +++ b/Base/Controller/FCommonPay.cs @@ -185,7 +185,8 @@ namespace NP.Base.Controllers iscashrct = vm.ptype == 1 ? 0 : vm.iscashrct, cashrcthp = vm.ptype == 1 ? null : vm.cashrcthp, pplno = vm.pplno, - PIs = vm.PayItems + PIs = vm.PayItems, + isbill = vm.isbill }; vm.PayItems.Add(new PayItem() { @@ -405,7 +406,8 @@ namespace NP.Base.Controllers iscashrct = vm.ptype == 1 ? 0 : vm.iscashrct, cashrcthp = vm.ptype == 1 ? null : vm.cashrcthp, pplno = vm.pplno, - PIs = vm.PayItems + PIs = vm.PayItems, + isbill = vm.isbill }; if (vm.Pay.isdvr == 1) { diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index 2fe6ef8..6c9ba50 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -238,9 +238,9 @@ insert into pay(ptype,ispg,isgroup,isexam,userno,username,pstatus,rstatus - ,refunding,paylimit,payoktime,pgkey,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,isdvr,iscashrct,cashrcthp,pplno,) + ,refunding,paylimit,payoktime,pgkey,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,isdvr,iscashrct,cashrcthp,pplno,isbill,) select #ptype#,#ispg#,#isgroup#,#isexam#,a.userno,a.username,case when #ptype# = 6 then 1 else 0 end,0 - ,#refunding#,#paylimit#,case when #ptype# = 6 then now() else #payoktime# end,#pgkey#,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#isdvr#,#iscashrct#,HEX(AES_ENCRYPT(#cashrcthp#, )),#pplno#, + ,#refunding#,#paylimit#,case when #ptype# = 6 then now() else #payoktime# end,#pgkey#,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#isdvr#,#iscashrct#,HEX(AES_ENCRYPT(#cashrcthp#, )),#pplno#,#isbill#, from users a where a.userno=#userno# SELECT LAST_INSERT_ID() diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 240fc48..be55846 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -49,7 +49,7 @@ }