diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index 0359c89..2071ad4 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -156,9 +156,17 @@ } - 입금계좌 + 계산서확인 + @p.ischeckname + + + + + 입금계좌 + + @p.vactbankname | @p.vactnum | @p.vactname @@ -167,11 +175,12 @@
상품내역
- + < @foreach (var d in pi) { + diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index a903f7c..8a47951 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -928,6 +928,7 @@ ,CAST(AES_DECRYPT(UNHEX(pd.mobile), ) AS char) mobile2 ,tax.iscancel, tax.taxdate, tax.taxno ,paydata.vactbankname,CAST(AES_DECRYPT(UNHEX(paydata.vactnum), ) AS char) vactnum,paydata.vactname + ,(select ischeck from paytax where payno = p.payno limit 1) ischeck from pay p inner join users u on u.userno=p.userno left outer join payitem pi on pi.payno=p.payno and pi.ptype in (3,4) @@ -956,6 +957,7 @@ ,cm.cshape ,cg.cgname ,pcg.cgname pcgname + ,(select attrate from lect where payno = pi.payno limit 1) attrate ,pi.rbank , CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), ) AS char) rbankaccnum, pi.tbankuser from payitem pi inner join pay p on p.payno=pi.payno diff --git a/Model/Pay.cs b/Model/Pay.cs index 265121c..499f191 100644 --- a/Model/Pay.cs +++ b/Model/Pay.cs @@ -39,6 +39,16 @@ namespace NP.Model return ptype == 1 ? "신용카드" : ptype == 2 ? "계좌이체" : ptype == 3 ? "가상계좌" : ptype == 4 ? "현금" : ptype == 5 ? "복합" : ptype == 6 ? "무료" : ptype == 9 ? "위탁" : "-"; } } + + public Int32 ischeck { get; set; } + public String ischeckname + { + get + { + return ischeck == 1 ? "확인" : "미확인"; + } + } + public int piptype { get; set; } public String itemname { get; set; } public int cshape { get; set; } @@ -614,7 +624,11 @@ namespace NP.Model return iscomplete == null ? "미수료" : iscomplete == 0 ? "미수료" : "수료"; } } + /// + /// 진도율 + /// public int attrate { get; set; } + public String userpno { get; set; } }
상품코드상품유형과정분류상품명판매가수량합계금액
상품코드진도율상품유형과정분류상품명판매가수량합계금액
@d.itemno@d.attrate % @(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname) @d.cgname @d.itemname