From 487fc0c786b05565ec1eb9d53854c755488be48b Mon Sep 17 00:00:00 2001 From: shjang Date: Wed, 10 Aug 2022 04:09:18 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91=EC=97=85?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20:=20=EA=B2=B0=EC=A0=9C=EC=99=84=EB=A3=8C?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=20=20=20=20/FO/Controllers/CourseController.cs=20?= =?UTF-8?q?=20=20=20=20/FO/Controllers/FOBaseController.cs=20=20=20=20=20/?= =?UTF-8?q?FO/Views/Course/ApplyComplete.cshtml=20=20=20=20=20/Model/VMPay?= =?UTF-8?q?.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FO/Controllers/CourseController.cs | 41 ++++++++++++++++ FO/Controllers/FOBaseController.cs | 43 ++++++++++++++++ FO/Views/Course/ApplyComplete.cshtml | 73 +++++++--------------------- Model/VMPay.cs | 5 ++ 4 files changed, 107 insertions(+), 55 deletions(-) diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 748b057..2ca2e73 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -1219,6 +1219,11 @@ namespace NP.FO.Controllers { return Redirect("/"); } + //20220802 추가 + long?[] lngTmp = new long?[2]; + lngTmp[0] = vm.CM.cmino; + lngTmp[1] = vm.CM.cmisno; + vm.PayItem = Dao.Get("pay.payresult", new Hashtable() { { "payno", vm.payno }, { "userno", SUserInfo.UserNo } }).First(); vm.CM = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PayItem.itemno } }).FirstOrDefault(); vm.Pay = Dao.Get("pay.pay", new System.Collections.Hashtable() { { "payno", vm.payno }, { "userno", SUserInfo.UserNo } }).FirstOrDefault(); @@ -1227,7 +1232,43 @@ namespace NP.FO.Controllers vm.Pay.ccount = Dao.Get("pay.lectready", vm.CM.cmno).FirstOrDefault() ?? 1; } vm.Pay.payresult = "1:결제완료"; + + //20220802 추가 + vm.CM.cmino = lngTmp[0]; + vm.CM.cmisno = lngTmp[1]; + + #region 20220801 선택한 교육장 정보 + Hashtable hsData = new Hashtable(); + hsData.Add("cmno", vm.cmno); + var cmInningscdTmp = Dao.Get("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]); + + foreach (var item in cmInningscdTmp) + { + vm.SelectCMInningscd = item; + if (item.studyplace != null) + { + item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); + } + else + { + item.scdInfoSummary = string.Format("{0} ~ {1}", DateTime.Now.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); + } + + if (item.eend != null) + { + item.eend2 = item.eend.ToString("yyyy년 MM월 dd일"); + } + + //vm.SelectCMInningscd.scdInfoSummary = string.Format("{0}", vm.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일까지")); + if (vm.SelectCMInningscd.estart < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"))) + { + vm.SelectCMInningscd.isEnd = true; + } + } + #endregion + return View(vm); + } public ActionResult XpayREQ(VMPay vm) { diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs index 893488a..07ad682 100644 --- a/FO/Controllers/FOBaseController.cs +++ b/FO/Controllers/FOBaseController.cs @@ -489,6 +489,11 @@ namespace NP.FO.Controllers //} protected ActionResult PayReturn(VMPay vm) { + //20220802 추가 + long?[] lngTmp = new long?[2]; + lngTmp[0] = vm.CM.cmino; + lngTmp[1] = vm.CM.cmisno; + if (vm.payno > 0 && (vm.absptype == 6 || vm.absptype == 7)) { //0원강좌 결제 @@ -496,6 +501,9 @@ namespace NP.FO.Controllers vm.Pay.payresult = "1:무료결제완료"; vm.PayItemResults = Dao.Get("pay.payitems", vm.Pay.payno); vm.CM = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PayItemResults.First().itemno } }).FirstOrDefault(); + //20220802 추가 + vm.CM.cmino = lngTmp[0]; + vm.CM.cmisno = lngTmp[1]; } else { @@ -776,6 +784,41 @@ namespace NP.FO.Controllers vm.Pay.cancelresult = xpay.m_szResMsg; } } + + //20220802 추가 + vm.CM.cmino = lngTmp[0]; + vm.CM.cmisno = lngTmp[1]; + + #region 20220801 선택한 교육장 정보 + Hashtable hsData = new Hashtable(); + hsData.Add("cmno", vm.cmno); + var cmInningscdTmp = Dao.Get("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]); + + foreach (var item in cmInningscdTmp) + { + vm.SelectCMInningscd = item; + if (item.studyplace != null) + { + item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); + } + else + { + item.scdInfoSummary = string.Format("{0} ~ {1}", DateTime.Now.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); + } + + if (item.eend != null) + { + item.eend2 = item.eend.ToString("yyyy년 MM월 dd일"); + } + + //vm.SelectCMInningscd.scdInfoSummary = string.Format("{0}", vm.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일까지")); + if (vm.SelectCMInningscd.estart < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"))) + { + vm.SelectCMInningscd.isEnd = true; + } + } + #endregion + return View("ApplyComplete", vm); } } diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml index 5865c36..b5f05b4 100644 --- a/FO/Views/Course/ApplyComplete.cshtml +++ b/FO/Views/Course/ApplyComplete.cshtml @@ -23,63 +23,26 @@ else
    • - @*@if (Model.CM.cshape == 0) - { -

      - } - else if (Model.CM.cshape == 1) - { -

      - } - else if (Model.CM.cshape == 2) - { -

      - }*@ + + @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") + + @{ + string strStudyPlaceTmp = ""; + if (Model.SelectCMInningscd.studyplace != null) + { + strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname); + } + else + { + strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); + } - @if (Model.CM.cshape == 0) - { - if (!isallday) - { -

      - } - else - { -

      - } + //Model.SelectCMInningscd.eend2 교육종료일 + string strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정 | 교육비 {4}원", + Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); } - else if (Model.CM.cshape == 1) - { - if (!isallday) - { -

      - } - else - { -

      - } - } - else if (Model.CM.cshape == 2) - { - if (!isallday) - { - @*

      *@ -

      - } - else - { - @*

      *@ -

      - } - } - - @*@if (Model.CM.applicableCM == "정상접수") - { - 정상접수 - } - else - { - 대기접수 - }*@ + +

    diff --git a/Model/VMPay.cs b/Model/VMPay.cs index cfaed56..d8990fa 100644 --- a/Model/VMPay.cs +++ b/Model/VMPay.cs @@ -70,5 +70,10 @@ namespace NP.Model /// 계산서날짜 /// public DateTime? taxdatereq { get; set; } + /// + /// 선택한 교육일정 정보 + /// 20220801 + /// + public CMinningscd SelectCMInningscd { get; set; } } }