This commit is contained in:
zxcxz2002
2023-12-12 10:51:27 +09:00
parent 245ff379aa
commit 8ba8498fae
7 changed files with 11 additions and 6 deletions
@@ -18,5 +18,5 @@ public class MainRatePlan extends BaseEntity{
private String planType; private String planType;
private String planName; private String planName;
private long price; private long price;
private long sort;
} }
@@ -17,5 +17,6 @@ public class SubRatePlan extends BaseEntity{
private String carrierName; private String carrierName;
private String planName; private String planName;
private long price; private long price;
private long sort;
} }
@@ -11,5 +11,5 @@ import com.ns.mobile.website.biz.entity.MainRatePlan;
@Repository @Repository
public interface MainRatePlanRepository extends JpaRepository<MainRatePlan, Long> { public interface MainRatePlanRepository extends JpaRepository<MainRatePlan, Long> {
Optional<List<MainRatePlan>> findByDelYn(boolean delYn); Optional<List<MainRatePlan>> findByDelYnOrderBySortAsc(boolean delYn);
} }
@@ -10,5 +10,5 @@ import com.ns.mobile.website.biz.entity.SubRatePlan;
@Repository @Repository
public interface SubRatePlanRepository extends JpaRepository<SubRatePlan, Long> { public interface SubRatePlanRepository extends JpaRepository<SubRatePlan, Long> {
Optional<List<SubRatePlan>> findByDelYn(boolean delYn); Optional<List<SubRatePlan>> findByDelYnOrderBySortAsc(boolean delYn);
} }
@@ -90,13 +90,13 @@ public class SellInfoServiceImpl implements SellInfoService{
SellAddInfoModel result = new SellAddInfoModel(); SellAddInfoModel result = new SellAddInfoModel();
List<BusinessPartner> businessPartnerList = businessPartnerRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("거래처 조회가 실패하였습니다.")); List<BusinessPartner> businessPartnerList = businessPartnerRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("거래처 조회가 실패하였습니다."));
result.setBusinessPartnerList(businessPartnerList); result.setBusinessPartnerList(businessPartnerList);
List<MainRatePlan> mainRatePlanList = mainRatePlanRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("요금제 조회가 실패하였습니다.")); List<MainRatePlan> mainRatePlanList = mainRatePlanRepository.findByDelYnOrderBySortAsc(false).orElseThrow(() -> new BizApiException("요금제 조회가 실패하였습니다."));
result.setMainRatePlanList(mainRatePlanList); result.setMainRatePlanList(mainRatePlanList);
List<MobileCarrier> mobileCarrierList = mobileCarrierRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("통신사 조회가 실패하였습니다.")); List<MobileCarrier> mobileCarrierList = mobileCarrierRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("통신사 조회가 실패하였습니다."));
result.setMobileCarrierList(mobileCarrierList); result.setMobileCarrierList(mobileCarrierList);
List<Phone> phoneList = phoneRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("핸드폰 조회가 실패하였습니다.")); List<Phone> phoneList = phoneRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("핸드폰 조회가 실패하였습니다."));
result.setPhoneList(phoneList); result.setPhoneList(phoneList);
List<SubRatePlan> subRatePlanList = subRatePlanRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("부가서비스 조회가 실패하였습니다.")); List<SubRatePlan> subRatePlanList = subRatePlanRepository.findByDelYnOrderBySortAsc(false).orElseThrow(() -> new BizApiException("부가서비스 조회가 실패하였습니다."));
result.setSubRatePlanList(subRatePlanList); result.setSubRatePlanList(subRatePlanList);
return result; return result;
@@ -123,7 +123,7 @@ let appVue = new Vue({
let $this = this; let $this = this;
let fees = $this.getFees(x); let fees = $this.getFees(x);
if(x.name=='황재승') if(x.name=='하지영')
debugger; debugger;
var settlementAmount = Number($this.getSettlementAmount(x).replaceAll(',','')); var settlementAmount = Number($this.getSettlementAmount(x).replaceAll(',',''));
var bondIssuanceAmount = ((settlementAmount + x.usim)-(x.guestMoney+fees+x.deduction)); var bondIssuanceAmount = ((settlementAmount + x.usim)-(x.guestMoney+fees+x.deduction));
@@ -214,6 +214,10 @@
</div> </div>
</div> </div>
<div class="row d-flex justify-content-center">
<button type="button" class="btn btn-primary btn-round mb-3 col-sm-2" @click="save" tabindex="23">저장</button>
</div>
<h5 class="mt-3 mb-3">기타</h5> <h5 class="mt-3 mb-3">기타</h5>
<div class="border border-2 mb-3"> <div class="border border-2 mb-3">
<div class="row d-flex justify-content-center"> <div class="row d-flex justify-content-center">