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

This commit is contained in:
hyunho 2021-01-07 05:04:52 +00:00
parent a03902d69f
commit 60a78a4444
12 changed files with 86 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Base/Controller/FCommon.cs
View File

@ -283,6 +283,8 @@ namespace NP.Base.Controllers
ppllog.rbankacc = Request["rbankacc"].ToString();
if (!string.IsNullOrEmpty(Request["rbankowner"]))
ppllog.rbankowner = Request["rbankowner"].ToString();
if (!string.IsNullOrEmpty(Request["isaccommodation"]))
ppllog.isaccommodation = Convert.ToInt32(Request["isaccommodation"].ToString());
ppllog.asname = vm.Assign.asname;
ppllog.brno = vm.Assign.brno.IndexOf("-") > 0 ? vm.Assign.brno.Replace("-", "") : vm.Assign.brno;

14
Base/Controller/FCommonPay.cs
View File

@ -180,8 +180,8 @@ namespace NP.Base.Controllers
uip = GetUserIP(),
ispg = 1,
userno = SUserInfo.UserNo,
orgamt = vm.PPLog.infee,
payamt = vm.PPLog.infee,
orgamt = vm.PPLog.isaccommodation == 1 ? vm.PPLog.infee + vm.PPLog.accommofee : vm.PPLog.infee,
payamt = vm.PPLog.isaccommodation == 1 ? vm.PPLog.infee + vm.PPLog.accommofee : vm.PPLog.infee,
iscashrct = vm.ptype == 1 ? 0 : vm.iscashrct,
cashrcthp = vm.ptype == 1 ? null : vm.cashrcthp,
pplno = vm.pplno,
@ -194,8 +194,8 @@ namespace NP.Base.Controllers
itemno = vm.cmno,
pcnt = 1,
userno = SUserInfo.UserNo,
orgamt = vm.PPLog.infee,
payamt = vm.PPLog.infee,
orgamt = vm.PPLog.isaccommodation == 1 ? vm.PPLog.infee + vm.PPLog.accommofee : vm.PPLog.infee,
payamt = vm.PPLog.isaccommodation == 1 ? vm.PPLog.infee + vm.PPLog.accommofee : vm.PPLog.infee,
isrebate = vm.PPLog.isrebate??0,
rbank = vm.PPLog.rbankname,
rbankaccnum = vm.PPLog.rbankacc,
@ -282,9 +282,9 @@ namespace NP.Base.Controllers
{
pi.rstime = lects.Where(w => w.cmno == pi.itemno).First().rstime;
pi.retime = lects.Where(w => w.cmno == pi.itemno).First().retime;
pi.orgamt = lects.Where(w => w.cmno == pi.itemno).First().infee;
pi.discamt = lects.Where(w => w.cmno == pi.itemno).First().infee - lects.Where(w => w.cmno == pi.itemno).First().payamt;
pi.payamt = lects.Where(w => w.cmno == pi.itemno).First().payamt;
pi.orgamt = vm.PPLog.isaccommodation == 1 ? lects.Where(w => w.cmno == pi.itemno).First().infee + lects.Where(w => w.cmno == pi.itemno).First().accommofee : lects.Where(w => w.cmno == pi.itemno).First().infee;
pi.payamt = vm.PPLog.isaccommodation == 1 ? lects.Where(w => w.cmno == pi.itemno).First().payamt + lects.Where(w => w.cmno == pi.itemno).First().accommofee : lects.Where(w => w.cmno == pi.itemno).First().payamt;
pi.discamt = pi.orgamt - pi.payamt; // lects.Where(w => w.cmno == pi.itemno).First().infee - lects.Where(w => w.cmno == pi.itemno).First().payamt;
}
}
}

3
Dao/DB/DB1.Scheme.txt
View File

@ -724,7 +724,8 @@ create table pplog (
,uaddress2 varchar (200)
,isassignuser tinyint not null default 1
,uduty varchar (20)
,slevel tinyint
,slevel tinyint
,isaccommodation tinyint
,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL
,primary key(pplno));

6
Dao/MyBatis/Maps/CM.xml
View File

@ -1597,7 +1597,7 @@
</isNotEmpty>
</select>
<select id="cm.cms.forpay" parameterClass="hashtable" resultClass="cm">
select c.cmno,case when b.isjoin=1 then c.infee else c.infee end fee,b.isjoin,d.lectno lectnocheck
select c.cmno,case when b.isjoin=1 then c.infee else c.infee end fee, c.accommofee, b.isjoin,d.lectno lectnocheck
from users a
left outer join assign b on b.asno=a.asno
inner join cm c on c.cmno=#cmno#
@ -1861,7 +1861,7 @@
insert into pplog (
userno,cmno,isready,cgcode,cshape,typeman,typeedu,typegrade,typejob,cgno,cmisno,isrebate,rbankname,rbankacc,rbankowner,asname,brno,ceoname,post,address1,address2,btype,bkind,eino,mname
,mphone,taxemail,userpno,mobile,email,upost,uaddress1,uaddress2,isassignuser,uduty,slevel,<include refid="sql.inc"></include>)
,mphone,taxemail,userpno,mobile,email,upost,uaddress1,uaddress2,isassignuser,uduty,slevel,isaccommodation,<include refid="sql.inc"></include>)
values (
#userno#,#cmno#,#isready#,#cgcode#,#cshape#,#typeman#,#typeedu#,#typegrade#,#typejob#,#cgno#,#cmisno#,#isrebate#,#rbankname#,#rbankacc#,#rbankowner#,#asname#,#brno#,#ceoname#,#post#,#address1#
,#address2#,#btype#,#bkind#,#eino#,#mname#
@ -1870,7 +1870,7 @@
,HEX(AES_ENCRYPT(#userpno#, <include refid="sql.digest"></include>))
,HEX(AES_ENCRYPT(#mobile#, <include refid="sql.digest"></include>))
,HEX(AES_ENCRYPT(#email#, <include refid="sql.digest"></include>))
,#upost#,#uaddress1#,#uaddress2#,#isassignuser#,#uduty#,#slevel#,<include refid="sql.inv"></include>)
,#upost#,#uaddress1#,#uaddress2#,#isassignuser#,#uduty#,#slevel#,#isaccommodation#,<include refid="sql.inv"></include>)
<selectKey type="post" property="pplno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey>
</insert>

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

@ -27,10 +27,10 @@
<statements>
<insert id="pay.pay.in" parameterClass="pay">
insert into pay(ptype,ispg,isgroup,userno,isexam,pstatus,rstatus,refunding,paylimit,payoktime,pgkey
,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,pplno,<include refid="sql.inc"></include>)
values (#ptype#,#ispg#,#isgroup#,#userno#,0,#pstatus#,#rstatus#,#refunding#,#paylimit#,case when #isinmoney# is not null then <include refid="sql.now"></include> else #payoktime# end,#pgkey#
,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#pplno#,<include refid="sql.inv"></include>);
insert into pay(ptype,ispg,isgroup,userno,username,isexam,pstatus,rstatus,refunding,paylimit,payoktime,pgkey
,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,pplno,isbill,<include refid="sql.inc"></include>)
values (#ptype#,#ispg#,#isgroup#,#userno#,#username#,0,#pstatus#,#rstatus#,#refunding#,#paylimit#,case when #isinmoney# is not null then <include refid="sql.now"></include> else #payoktime# end,#pgkey#
,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#pplno#,#isbill#,<include refid="sql.inv"></include>);
<selectKey type="post" property="payno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey>
</insert>
<insert id="pay.payitem.in" parameterClass="payitem">
@ -221,7 +221,7 @@
<select id="pay.cmcheck.forpay" parameterClass="hashtable" resultClass="lect">
select a.cmno,a.cname,a.quota,a.rstime,a.retime
,b.status
,a.infee,a.outfee,case when ua.isjoin=1 then a.infee else a.infee end payamt
,a.infee,a.outfee,case when ua.isjoin=1 then a.infee else a.infee end payamt ,a.accommofee
,count(d.userno) countlect
from cm a
inner join users u on u.userno=#userno#
@ -284,7 +284,7 @@
<update id="pay.paycert.paystart" parameterClass="pay">
update pay a
inner join users b on b.userno=a.userno
set a.ptype=#ptype#,a.paylimit=#paylimit#,a.orgamt=#orgamt#,a.payamt=#payamt#
set a.ptype=#ptype#,a.paylimit=#paylimit#,a.orgamt=#orgamt#,a.payamt=#payamt#,a.isbill=#isbill#
where a.payno=#payno# and a.userno=#userno# and a.pstatus=21;
update payitem a
@ -294,7 +294,7 @@
</update>
<select id="pay.pay" parameterClass="hashtable" resultClass="pay">
select a.payno,a.ptype,a.isgroup,a.isexam,a.userno,a.pstatus,a.payamt,a.rstatus,a.refundamt,a.ispg,a.paylimit
,b.isready
,b.isready,b.isaccommodation
from pay a
left outer join pplog b on b.pplno=a.pplno
<dynamic prepend="where">
@ -866,9 +866,9 @@
where payno=#payno# and isunpay=1;
</update>
<select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog">
select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner
select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation
,b.payno,b.pstatus
,a2.infee
,a2.infee,a2.accommofee
from pplog a
inner join cm a2 on a2.cmno=a.cmno
left outer join pay b on b.pplno=a.pplno
@ -890,7 +890,7 @@
where a.cmno=#cmno# and a.isready=1 and a.status=6
</select>
<select id="pay.pplogs.bypay" parameterClass="hashtable" resultClass="pplog">
select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner
select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,a.rbankacc,a.rbankowner,a.isaccommodation
,b.payno,b.pstatus
from pay b
inner join pplog a on a.pplno=b.pplno

7
FO/Controllers/CourseController.cs
View File

@ -904,19 +904,20 @@ namespace NP.FO.Controllers
return RedirectPermanent("/?isalreadyreq=1");
}
var pi = payitems.First();
pi.orgamt = cms.Where(w => w.cmno == pi.itemno).First().fee;
pi.orgamt = vm.PPLog.isaccommodation == 1 ? cms.Where(w => w.cmno == pi.itemno).First().fee + cms.Where(w => w.cmno == pi.itemno).First().accommofee : cms.Where(w => w.cmno == pi.itemno).First().fee;
var pay = new Pay()
{
pplno = vm.pplno,
ispg = 1,
ptype = 0,
userno = SUserInfo.UserNo,
username = SUserInfo.UserName,
pstatus = 55,
rstatus = 0,
refunding = 0,
orgamt = cms.Sum(s => s.fee),
orgamt = vm.PPLog.isaccommodation == 1? cms.Sum(s => s.fee) + cms.Sum(s=>s.accommofee) : cms.Sum(s=>s.fee),
//isinmoney = 1,
payamt = payitems.Sum(s => s.payamt),
payamt = payitems.Sum(s => s.payamt),//어차피 0 아닌지..?
PIs = payitems,
cmnos = string.Join(",", payitems.Select(s => s.itemno)),
uno = SUserInfo.UserNo,

13
FO/Views/Course/ApplyComplete.cshtml
View File

@ -44,12 +44,19 @@ else
</li>
</ul>
<div class="apyCost">
총 결제@(Model.Pay.isready==1 && Model.Pay.pstatus != 1 && Model.Pay.pstatus != 22 ?"예상":"")금액 : <span class="red">@Model.CM.infee.ToString("#,0")</span> 원
@if (Model.Pay.isaccommodation == 1)
{
<span>총 결제@(Model.Pay.isready == 1 && Model.Pay.pstatus != 1 && Model.Pay.pstatus != 22 ? "예상" : "")금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span> 원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
}
else
{
<span>총 결제@(Model.Pay.isready == 1 && Model.Pay.pstatus != 1 && Model.Pay.pstatus != 22 ? "예상" : "")금액:<span class="red">@Model.CM.infee.ToString("#,0")</span>원</span>
}
</div>
</li>
</ul>
if (Model.Pay.isready == 0 || Model.Pay.pstatus == 1 || Model.Pay.pstatus == 22)
{
{
<h4 class="clsTitle">결제정보</h4>
<table class="clsTable">
<tbody>
@ -62,7 +69,7 @@ else
<td>@Model.Pay.ptypename</td>
</tr>
@if (Model.Pay.ptype == 3)
{
{
<tr>
<th>입금계좌</th>
<td>

33
FO/Views/Course/ApplyEdu.cshtml
View File

@ -10,6 +10,7 @@
<input type="hidden" name="cmisno" id="cmisno" />
<input type="hidden" name="isrebate" id="isrebate" />
<input type="hidden" name="applicableCM" id="applicableCM" />
<input type="hidden" name="isaccommodation" id="isaccommodation" />
<h4 class="clsTitle">신청강좌</h4>
<ul class="smtList mt0">
<li>
@ -56,6 +57,21 @@
<span>&nbsp;&nbsp;&nbsp;※지정하신 일자가 수료일자가 됩니다.</span>
<br /><br />
<ul id="ulScd"></ul>
}
@if (Model.CM.cshape != 0)
{
<h4 class="clsTitle">합숙여부</h4>
<ul class="bakRadio">
<li>
<input type="radio" name="rdoAccommo" id="rdoAccommo1" value="1" /><label for="rdoAccommo1"> 예 (<span id="spnaccommofee"></span>원 추가)</label>
</li>
<li>
<input type="radio" name="rdoAccommo" id="rdoAccommo2" value="2" checked /><label for="rdoAccommo2"> 아니오</label>
</li>
</ul>
}
@if (Model.CM.cshape == 1)
@ -311,11 +327,26 @@
refundAccountShowHide();
});
$("input[name='rdoAccommo']").change(function () {
var total;
if ($("input[name='rdoAccommo']:checked").val() == "1") {
total = @Model.CM.infee + @Model.CM.accommofee;
}
else {
total = @Model.CM.infee;
}
$("#spninfeecost").html(bindComma(total));
});
});
function initControl() {
$("#spninfee").html(bindComma(@Model.CM.infee));
$("#spninfeecost").html(bindComma(@Model.CM.infee));
$("#spnaccommofee").html(bindComma(@Model.CM.accommofee));
setTimeout(function () {
if (@Model.CM.cshape == 2) {
setScd();
@ -387,6 +418,8 @@
if (@ViewBag.SSUserNo > 0) {
$("#cmisno").val($("input:radio[name=rdoScds]:checked").val());
$("#isrebate").val($("input:radio[name=rdoRefund]:checked").val());
$("#isaccommodation").val($("input:radio[name=rdoAccommo]:checked").val());
$("#applicableCM").val("@Model.CM.applicableCM");
capfileform('/fcommon/savePPLog', 'applyEduForm', 'saveResult');

9
FO/Views/Course/ApplyPay.cshtml
View File

@ -31,7 +31,14 @@
</li>
</ul>
<div class="apyCost">
결제금액 : <span class="red">@Model.CM.infee.ToString("#,0")</span> 원
@if (Model.PPLog.isaccommodation != 1)
{
<span>결제금액:<span class="red">@Model.CM.infee.ToString("#,0")</span>원</span>
}
else
{
<span>결제금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span>원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
}
</div>
</li>
</ul>

4
Model/CM.cs
View File

@ -1027,6 +1027,10 @@ namespace NP.Model
/// 비회원수강료
/// </summary>
public int outfee { get; set; }
/// <summary>
/// 합숙비용
/// </summary>
public int accommofee { get; set; }
public DateTime? rstime { get; set; }
public DateTime? retime { get; set; }
public int kfcfyear { get; set; }

2
Model/PPLog.cs
View File

@ -54,5 +54,7 @@ namespace NP.Model
public Int64 payno { get; set; }
public int pstatus { get; set; }
public int infee { get; set; }
public int accommofee { get; set; }
public int? isaccommodation { get; set; }
}
}

1
Model/Pay.cs
View File

@ -219,6 +219,7 @@ namespace NP.Model
/// 계산서발행여부
/// </summary>
public int isbill { get; set; }
public int? isaccommodation { get; set; }
//public Xpay xpay { get; set; }
public String mid { get; set; }