From fb136e3c039e5fcb9cd787610625a6b3c4e1c79e Mon Sep 17 00:00:00 2001 From: zxcxz2002 Date: Mon, 13 Mar 2023 05:32:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=A8=EA=B0=90=EA=B8=B0=EB=8A=A5,=20?= =?UTF-8?q?=EC=9C=A0=EC=84=A0=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/website/biz/dto/SellInfoDto.java | 4 +- .../mobile/website/biz/entity/SellInfo.java | 1 + .../biz/model/sell/SellAddInfoParameter.java | 1 + .../biz/service/impl/SellInfoServiceImpl.java | 1 + .../static/res/front/js/biz/sell/add.js | 111 ++++++++++++++---- src/main/webapp/WEB-INF/view/sell/add.jsp | 30 ++++- .../webapp/WEB-INF/view/sell/excel/info.jsp | 6 +- 7 files changed, 127 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java b/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java index 4d1bca5..6b6e35c 100644 --- a/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java +++ b/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java @@ -40,6 +40,7 @@ public class SellInfoDto extends BaseDto{ String payBackNumber; String etc; String guestKinds; + long deduction; long installment; long phoneId; @@ -82,7 +83,8 @@ public class SellInfoDto extends BaseDto{ .installment(sellInfo.getInstallment()) .phoneId(sellInfo.getPhoneId()) .usim(sellInfo.getUsim()) - .faceValueRebate(sellInfo.getFaceValueRebate()) + .faceValueRebate(sellInfo.getFaceValueRebate()) + .deduction(sellInfo.getDeduction()) .guestMoney(sellInfo.getGuestMoney()) .introductionPay(sellInfo.getIntroductionPay()) .payBack(sellInfo.getPayBack()) diff --git a/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java b/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java index a5245b7..5ac214c 100644 --- a/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java +++ b/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java @@ -48,6 +48,7 @@ public class SellInfo extends BaseEntity{ private long disclosureSubsidy; private long addRebate; private long cashRebate; + private long deduction; private boolean payBackYn; private boolean disclosureSubsidyYn; diff --git a/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java index 9d724d8..71b29d9 100644 --- a/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java +++ b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java @@ -33,6 +33,7 @@ public class SellAddInfoParameter{ private long faceValueRebate; private long guestMoney; private long introductionPay; + private long deduction; private long payBack; private String payBackDay; private String payBackBank; diff --git a/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java b/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java index de21f0e..370d692 100644 --- a/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java +++ b/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java @@ -122,6 +122,7 @@ public class SellInfoServiceImpl implements SellInfoService{ .formula(parameter.getFormula()) .payBackYn(parameter.isPayBackYn()) .payBackBank(parameter.getPayBackBank()) + .deduction(parameter.getDeduction()) .payBackNumber(parameter.getPayBackNumber()) .installment(parameter.getInstallment()) .phoneId(parameter.getPhoneId()) diff --git a/src/main/resources/static/res/front/js/biz/sell/add.js b/src/main/resources/static/res/front/js/biz/sell/add.js index fa667da..7ae867a 100644 --- a/src/main/resources/static/res/front/js/biz/sell/add.js +++ b/src/main/resources/static/res/front/js/biz/sell/add.js @@ -30,6 +30,7 @@ let appVue = new Vue({ insertType: 'change', usim: '', formula: '', + addFormula: '', faceValueRebate: '', guestMoney: '', introductionPay: '', @@ -44,7 +45,9 @@ let appVue = new Vue({ addRebate: '', cashRebate: '', etc: '', - guestKind: '' + guestKind: '', + deductionFormula: '', + deduction: '' }, mounted: function () { this.init(); @@ -102,18 +105,12 @@ let appVue = new Vue({ alert('생일을 입력하세요'); return false; } - if($this.phoneNumber== ''){ - alert('핸드폰번호를 입력하세요'); - return false; - } + if($this.mainRatePlan== ''){ alert('요금제를 입력하세요'); return false; } - if($this.phoneId== ''){ - alert('핸드폰을 선택하세요'); - return false; - } + if($this.formula== ''){ alert('리베이트 계산식을 입력하세요'); return false; @@ -126,9 +123,19 @@ let appVue = new Vue({ alert('현금수납를 입력하세요'); return false; } - if($this.factoryPrice== '' ||$this.factoryPrice== 0){ - alert('출고가를 입력하세요'); - return false; + if($this.insertType != 'other'){ + if($this.phoneNumber== ''){ + alert('핸드폰번호를 입력하세요'); + return false; + } + if($this.phoneId== ''){ + alert('핸드폰을 선택하세요'); + return false; + } + if($this.factoryPrice== '' ||$this.factoryPrice== 0){ + alert('출고가를 입력하세요'); + return false; + } } if($this.disclosureSubsidy != '' && $this.disclosureSubsidy != 0 && $this.disclosureSubsidy != '0'){ $this.disclosureSubsidyYn = true; @@ -136,20 +143,30 @@ let appVue = new Vue({ let index = $('#businessPartner').find(':selected').index(); //시리얼 입력 여부 if($this.info.businessPartnerList[index].serialYn){ - let confirmAction = confirm("시리얼 번호 필수인데 그냥 입력 하시겠습니까?"); - if (confirmAction) { - - }else{ - return false; + if($this.serialNumber == ''){ + let confirmAction = confirm("시리얼 번호 필수인데 그냥 입력 하시겠습니까?"); + if (confirmAction) { + + }else{ + return false; + } } } - debugger; + let realFormula = $this.formula; + if($this.addRebate != '' && $this.addRebate != 0 && $this.addRebate != '0'){ + realFormula = realFormula + '+' + $this.addFormula; + } + if($this.deduction != '' && $this.deduction != 0 && $this.deduction != '0'){ + realFormula = realFormula + $this.deductionFormula; + } + let parameter = { openingDate : $this.openingDate, birthday : $this.birthday, pbirthday : $this.pbirthday, payBackDay : $this.payBackDay, + usim : $this.usim.replaceAll(',', ''), faceValueRebate : $this.faceValueRebate.replaceAll(',', ''), guestMoney : $this.guestMoney.replaceAll(',', ''), @@ -159,6 +176,7 @@ let appVue = new Vue({ disclosureSubsidy : $this.disclosureSubsidy.replaceAll(',', ''), cashRebate: $this.cashRebate.replaceAll(',', ''), addRebate: $this.addRebate.replaceAll(',', ''), + deduction : $this.deduction.replaceAll(',', '').replaceAll('-', ''), businessPartner : $this.businessPartner, mobileCarrier : $this.mobileCarrier, @@ -172,7 +190,7 @@ let appVue = new Vue({ installment : $this.installment, phoneId : $this.phoneId, insertType : $this.insertType, - formula : $this.formula, + formula : realFormula, payBackYn : $this.payBackYn, payBackBank : $this.payBackBank, payBackNumber : $this.payBackNumber, @@ -315,7 +333,7 @@ let appVue = new Vue({ formulaChange: function(e){ let $this = this; var result = 0; - var calc = e.target.value; //-1-2-3 = -6 + var calc = $this.formula+'+'+$this.addFormula + $this.deductionFormula; //-1-2-3 = -6 var plusList = calc.split('+');//-1-2-3 for(var i=0;i
- +
@@ -54,6 +54,28 @@ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
@@ -78,7 +100,7 @@
- + ※ 유선시 P(현금수납 or 상품권) = 고객현금 + 페이백(P/B)
고객정보 등록
@@ -189,9 +211,9 @@
기타
- +
- +
diff --git a/src/main/webapp/WEB-INF/view/sell/excel/info.jsp b/src/main/webapp/WEB-INF/view/sell/excel/info.jsp index 35e5da9..ce5c320 100644 --- a/src/main/webapp/WEB-INF/view/sell/excel/info.jsp +++ b/src/main/webapp/WEB-INF/view/sell/excel/info.jsp @@ -70,8 +70,10 @@ 액면R/B 추가R/B 고객현금 + 차감 차감내용 + 현금수납 or 유선상품권 유심비 수수료 @@ -126,8 +128,8 @@ {{callMoneyText(x.faceValueRebate)}} {{callMoneyText(x.addRebate)}} {{callMoneyText(x.guestMoney)}} - 0 - 0 + {{callMoneyText(x.deduction)}} + 0 {{callMoneyText(x.cashRebate)}} {{callMoneyText(x.usim)}} {{getFees(x)}}