diff --git a/src/main/java/com/ns/mobile/website/biz/entity/MainRatePlan.java b/src/main/java/com/ns/mobile/website/biz/entity/MainRatePlan.java index 3b7b092..6c681ec 100644 --- a/src/main/java/com/ns/mobile/website/biz/entity/MainRatePlan.java +++ b/src/main/java/com/ns/mobile/website/biz/entity/MainRatePlan.java @@ -18,5 +18,5 @@ public class MainRatePlan extends BaseEntity{ private String planType; private String planName; private long price; - + private long sort; } diff --git a/src/main/java/com/ns/mobile/website/biz/entity/SubRatePlan.java b/src/main/java/com/ns/mobile/website/biz/entity/SubRatePlan.java index d8f88ef..33e112c 100644 --- a/src/main/java/com/ns/mobile/website/biz/entity/SubRatePlan.java +++ b/src/main/java/com/ns/mobile/website/biz/entity/SubRatePlan.java @@ -17,5 +17,6 @@ public class SubRatePlan extends BaseEntity{ private String carrierName; private String planName; private long price; + private long sort; } diff --git a/src/main/java/com/ns/mobile/website/biz/repository/MainRatePlanRepository.java b/src/main/java/com/ns/mobile/website/biz/repository/MainRatePlanRepository.java index 0e8bdb6..c1fe253 100644 --- a/src/main/java/com/ns/mobile/website/biz/repository/MainRatePlanRepository.java +++ b/src/main/java/com/ns/mobile/website/biz/repository/MainRatePlanRepository.java @@ -11,5 +11,5 @@ import com.ns.mobile.website.biz.entity.MainRatePlan; @Repository public interface MainRatePlanRepository extends JpaRepository { - Optional> findByDelYn(boolean delYn); + Optional> findByDelYnOrderBySortAsc(boolean delYn); } diff --git a/src/main/java/com/ns/mobile/website/biz/repository/SubRatePlanRepository.java b/src/main/java/com/ns/mobile/website/biz/repository/SubRatePlanRepository.java index 2371be4..f8e8409 100644 --- a/src/main/java/com/ns/mobile/website/biz/repository/SubRatePlanRepository.java +++ b/src/main/java/com/ns/mobile/website/biz/repository/SubRatePlanRepository.java @@ -10,5 +10,5 @@ import com.ns.mobile.website.biz.entity.SubRatePlan; @Repository public interface SubRatePlanRepository extends JpaRepository { - Optional> findByDelYn(boolean delYn); + Optional> findByDelYnOrderBySortAsc(boolean delYn); } 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 370d692..f776b96 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 @@ -90,13 +90,13 @@ public class SellInfoServiceImpl implements SellInfoService{ SellAddInfoModel result = new SellAddInfoModel(); List businessPartnerList = businessPartnerRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("거래처 조회가 실패하였습니다.")); result.setBusinessPartnerList(businessPartnerList); - List mainRatePlanList = mainRatePlanRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("요금제 조회가 실패하였습니다.")); + List mainRatePlanList = mainRatePlanRepository.findByDelYnOrderBySortAsc(false).orElseThrow(() -> new BizApiException("요금제 조회가 실패하였습니다.")); result.setMainRatePlanList(mainRatePlanList); List mobileCarrierList = mobileCarrierRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("통신사 조회가 실패하였습니다.")); result.setMobileCarrierList(mobileCarrierList); List phoneList = phoneRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("핸드폰 조회가 실패하였습니다.")); result.setPhoneList(phoneList); - List subRatePlanList = subRatePlanRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("부가서비스 조회가 실패하였습니다.")); + List subRatePlanList = subRatePlanRepository.findByDelYnOrderBySortAsc(false).orElseThrow(() -> new BizApiException("부가서비스 조회가 실패하였습니다.")); result.setSubRatePlanList(subRatePlanList); return result; diff --git a/src/main/resources/static/res/front/js/biz/sell/info.js b/src/main/resources/static/res/front/js/biz/sell/info.js index aede416..30f10c4 100644 --- a/src/main/resources/static/res/front/js/biz/sell/info.js +++ b/src/main/resources/static/res/front/js/biz/sell/info.js @@ -123,7 +123,7 @@ let appVue = new Vue({ let $this = this; let fees = $this.getFees(x); - if(x.name=='황재승') + if(x.name=='하지영') debugger; var settlementAmount = Number($this.getSettlementAmount(x).replaceAll(',','')); var bondIssuanceAmount = ((settlementAmount + x.usim)-(x.guestMoney+fees+x.deduction)); diff --git a/src/main/webapp/WEB-INF/view/sell/add.jsp b/src/main/webapp/WEB-INF/view/sell/add.jsp index 7eea26d..8393245 100644 --- a/src/main/webapp/WEB-INF/view/sell/add.jsp +++ b/src/main/webapp/WEB-INF/view/sell/add.jsp @@ -214,6 +214,10 @@ +
+ +
+
기타