From 3db398d2f10bbc48f26fd4af551ab3aa46dc80c3 Mon Sep 17 00:00:00 2001 From: hyunho Date: Wed, 24 Mar 2021 05:34:38 +0000 Subject: [PATCH] --- BO/Controllers/croomController.cs | 1 + BO/Views/croom/pay.cshtml | 6 +- BO/Views/croom/payview.cshtml | 278 ++++++++++++++++++------------ Base/Controller/ACommonCRoom.cs | 7 + Dao/MyBatis/Maps/CRoom.xml | 14 +- 5 files changed, 189 insertions(+), 117 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 2860990..50399c5 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -699,6 +699,7 @@ namespace NP.BO.Controllers } return View(vm); } + public ActionResult payrefund(VMPay vm) { vm.Pay = Dao.Get("cr.pay.forrfd", vm.payno).First(); diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml index 23f30e6..121de7c 100644 --- a/BO/Views/croom/pay.cshtml +++ b/BO/Views/croom/pay.cshtml @@ -76,9 +76,9 @@ @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품구분;0:강좌;1:패키지;2:교재;3:시험;4:자격증강좌" }, { "name", "stringval11" }, { "selected", Model.stringval11 } })*@ @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;0:온라인;1:오프라인;2:혼합" }, { "name", "stringval12" }, { "selected", Model.stringval12 } }) @Html.Partial("./Partial/Select", Model.CGs, new ViewDataDictionary { { "name", "stringval13" }, { "selected", Model.stringval13 }, { "df", ":-과정분류" } })   - @*   +       -   *@ + @*  *@ @@ -127,7 +127,7 @@ @*@d.ptypename*@ @Html.Raw(d.ptype == 0 || d.ptype == 1 || d.ptype == 4 ? string.Format(" {0}", d.cshapename) : "") - @*@Html.Raw(d.isrebate == 1 && (d.ptype == 0 || d.ptype == 1 || d.ptype == 4) ? " 환급" : "")*@ + @Html.Raw(d.isrebate == 1 && (d.ptype == 0 || d.ptype == 1 || d.ptype == 4) ? " 환급" : "")  @d.itemname@(d.ccount > 1 ? string.Format(" 외 {0} 건", d.ccount - 1) : "") diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index d0281be..fdecaae 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -1,5 +1,5 @@ @model NP.Model.VMPay -@{ +@{ Layout = "~/Views/Shared/_PopupLayout.cshtml"; var p = Model.Pay; var pi = Model.PayItems; @@ -14,18 +14,26 @@ - - - + + + + + + - - - + + + + + + - - + + + +
결제번호@p.payno주문날짜@p.cdtymdhms주문자명@p.username결제번호@p.payno주문날짜@p.cdtymdhms주문자명@p.username
생년월일@(p.userpno == null || p.userpno.Length < 6?"" : p.userpno.Substring(0, 6))일반전화@p.telno휴대폰@p.mobile생년월일@(p.userpno == null || p.userpno.Length < 6 ? "" : p.userpno.Substring(0, 6))일반전화@p.telno휴대폰@p.mobile
주소@p.post @p.address1 @p.address2이메일@p.email주소@p.post @p.address1 @p.address2이메일@p.email
@@ -34,7 +42,8 @@ - + + @@ -103,95 +112,116 @@
상품내역
결제금액@(p.pstatus == 1 ? p.payamt.ToString("#,0") : "0")원결제금액@(p.pstatus == 1 ? p.payamt.ToString("#,0") : "0")원 결제방식 @if (isexamready) @@ -43,7 +52,7 @@ } else if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0) { - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:신용카드2:계좌이체;3:가상계좌;4:무통장입금;6:무료" }, { "name", "ptype2" }, { "style", "width:100%;" },{ "selected", Model.Pay.ptype} }) + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:신용카드2:계좌이체;3:가상계좌;4:무통장입금;6:무료" }, { "name", "ptype2" }, { "style", "width:100%;" }, { "selected", Model.Pay.ptype } }) } else { @@ -60,24 +69,24 @@ { @:@p.pstatusname2 @*@(p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 && p.paylimit.Value > DateTime.Now?string.Format("(만료일: {0})", p.paylimit.Value.ToString("yyyy-MM-dd")):"")*@ } - @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0 @*&& p.paylimit.Value < DateTime.Now*@) - { - 미수처리 - 결제완료처리 - } - else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1) - { - @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) - 미수입금처리 - } - else if (p.isunpay == 2) - { - @:(미수입금) - } - else if (p.isunpay == 3) - { - @:(결제변경) - } + @if (p.ptype == 3 && p.pstatus == 22 && p.ispg == 1 && p.isunpay == 0@*&& p.paylimit.Value < DateTime.Now*@) +{ +미수처리 +결제완료처리 +} +else if (p.ptype == 3 && p.pstatus == 1 && p.ispg == 1 && p.isunpay == 1) +{ +@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "payoktime" } }) +미수입금처리 +} +else if (p.isunpay == 2) +{ +@:(미수입금) +} +else if (p.isunpay == 3) +{ +@:(결제변경) +}
-@foreach (var d in pi) -{ - - - - - - - - - -} -@if (p.isdvr == 1) -{ - -} - -
상품코드상품유형과정분류상품명판매가수량합계금액
@d.itemno@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)@d.cgname@d.itemname@((d.payamt / d.pcnt).ToString("#,0"))@d.pcnt@d.payamt.ToString("#,0")
- 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0")+" 원") : "직접수령")
- 최종합계: @p.payamt.ToString("#,0") 원
-@if (isexamready) -{ -
저장
-} - -@if (p.isgroup == 1 && pi.Where(w=>w.ptype==0).Count() > 1) -{ -
-
오프라인강의(단과) 단체수강 교육생정보
- - - - - @foreach (var d in pi.Where(w=>w.ptype == 0)) + @foreach (var d in pi) { - - - - - - - + + + + + + + } + @if (p.isdvr == 1) + { + + } +
이름(ID)회사사업장과의관계부서/직위회사전화번호휴대전화번호공정거래업무경력
@string.Format("{0}({1})", d.username, d.userid)@d.asname@(d.isassignuser==1 ?"자사근로자":"타사근로자")@d.depart / @d.ccpositionname@d.telno2@d.mobile2@(d.kfcfyear > 0 ? d.kfcfyear.ToString() : "-")년@d.itemno@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)@d.cgname@d.itemname@((d.payamt / d.pcnt).ToString("#,0"))@d.pcnt@d.payamt.ToString("#,0")
- 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")
- 최종합계: @p.payamt.ToString("#,0") 원
+ @if (isexamready) + { +
저장
+ }
+ +@if (pi.FirstOrDefault().isrebate == 1 ) +{ +
+
환급내역
+ + + + + + + + + +
은행명계좌번호예금주
+
+ 환급정보 저장
+
+
+} +@if (p.isgroup == 1 && pi.Where(w => w.ptype == 0).Count() > 1) +{ +
+
오프라인강의(단과) 단체수강 교육생정보
+ + + + + @foreach (var d in pi.Where(w => w.ptype == 0)) + { + + + + + + + + + + } +
이름(ID)회사사업장과의관계부서/직위회사전화번호휴대전화번호공정거래업무경력
@string.Format("{0}({1})", d.username, d.userid)@d.asname@(d.isassignuser == 1 ? "자사근로자" : "타사근로자")@d.depart / @d.ccpositionname@d.telno2@d.mobile2@(d.kfcfyear > 0 ? d.kfcfyear.ToString() : "-")년
+
} @if (p.isdvr == 1) { -
-
배송지정보
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
송장번호/수령정보조회수령인일반전화
우편번호 - @Html.TextBox("post", p.post2, new { @readonly = "readonly", @style = "width: 70px; background-color: #ddd;", @class = "postno form-control disp-init" }) 주소찾기(클릭 후 상단검색) - 휴대폰
주소 - @Html.TextBox("address1", p.address12, new { @readonly = "readonly", @style = "background-color: #ddd; width: 40%;", @class = "postadr form-control disp-init", @placeholder = "주소" }) - @Html.TextBox("address2", p.address22, new { @class = "postadrsub form-control disp-init", @placeholder = "상세주소", @style = "width: 50%;" }) - 배송방법@(p.isdvr2 == 1 ? "택배":"방문수령")
메모배송시작일@(p.codetime==null?"":p.codetime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
- -
-
저장
-
+
+
배송지정보
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
송장번호/수령정보조회수령인일반전화
우편번호 + @Html.TextBox("post", p.post2, new { @readonly = "readonly", @style = "width: 70px; background-color: #ddd;", @class = "postno form-control disp-init" }) 주소찾기(클릭 후 상단검색) + 휴대폰
주소 + @Html.TextBox("address1", p.address12, new { @readonly = "readonly", @style = "background-color: #ddd; width: 40%;", @class = "postadr form-control disp-init", @placeholder = "주소" }) + @Html.TextBox("address2", p.address22, new { @class = "postadrsub form-control disp-init", @placeholder = "상세주소", @style = "width: 50%;" }) + 배송방법@(p.isdvr2 == 1 ? "택배" : "방문수령")
메모배송시작일@(p.codetime == null ? "" : p.codetime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+ + +
+
저장
+
}


@@ -199,9 +229,18 @@
@section styles{ } @section scriptsHeader{ @@ -211,7 +250,7 @@ @section scripts{ } diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index bc2cae4..1027157 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -757,6 +757,13 @@ namespace NP.Base.Controllers return JsonOK(0); } [HttpPost] + public JsonResult PayRefundInfoSave(PayItem d) + { + d.uno = SUserInfo.UserNo; d.uip = GetUserIP(); + + return JsonOK(Dao.Save("cr.payrefundinfo.up", d)); + } + [HttpPost] public JsonResult PayTaxSave(PayTax d) { d.uno = SUserInfo.UserNo; d.uip = GetUserIP(); diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index 6e7d873..ad13dd8 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -921,7 +921,7 @@ where p.payno=#payno# + + + update payitem + set + ,rbank = #rbank# + ,rbankaccnum = HEX(AES_ENCRYPT(#rbankaccnum#, )) + ,tbankuser = #tbankuser# + where + payno = #payno# + +