From e9e97cb51bc6853eb3b8d3f55283288770055351 Mon Sep 17 00:00:00 2001 From: kuhan Date: Wed, 4 Jan 2023 19:02:36 +0900 Subject: [PATCH] =?UTF-8?q?sell=20info=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ddl/create_ddl.sql | 114 ++++++++++++++++-- .../mobile/website/biz/entity/SellInfo.java | 47 ++++++++ .../SellAddInfoModel.java} | 4 +- .../biz/model/sell/SellAddInfoParameter.java | 42 +++++++ .../biz/repository/SellInfoRepository.java | 15 +++ .../website/biz/service/GuestService.java | 8 -- .../website/biz/service/SellInfoService.java | 11 ++ ...viceImpl.java => SellInfoServiceImpl.java} | 19 ++- ...ontroller.java => SellInfoController.java} | 10 +- ...roller.java => ApiSellInfoController.java} | 23 ++-- .../res/front/js/biz/api/guest-service.js | 16 --- .../res/front/js/biz/api/sell-service.js | 21 ++++ .../res/front/js/biz/{guest => sell}/add.js | 113 ++++++++++++++--- .../res/front/js/lib/bootstrap-select.js | 1 - .../webapp/WEB-INF/view/include/inc_head.jsp | 2 +- .../WEB-INF/view/{guest => sell}/add.jsp | 95 ++++++++++----- 16 files changed, 433 insertions(+), 108 deletions(-) create mode 100644 src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java rename src/main/java/com/ns/mobile/website/biz/model/{GuestAddInfoModel.java => sell/SellAddInfoModel.java} (89%) create mode 100644 src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java create mode 100644 src/main/java/com/ns/mobile/website/biz/repository/SellInfoRepository.java delete mode 100644 src/main/java/com/ns/mobile/website/biz/service/GuestService.java create mode 100644 src/main/java/com/ns/mobile/website/biz/service/SellInfoService.java rename src/main/java/com/ns/mobile/website/biz/service/impl/{GuestServiceImpl.java => SellInfoServiceImpl.java} (80%) rename src/main/java/com/ns/mobile/website/web/controller/home/{GuestController.java => SellInfoController.java} (80%) rename src/main/java/com/ns/mobile/website/web/controller/home/api/{ApiGuestController.java => ApiSellInfoController.java} (76%) delete mode 100644 src/main/resources/static/res/front/js/biz/api/guest-service.js create mode 100644 src/main/resources/static/res/front/js/biz/api/sell-service.js rename src/main/resources/static/res/front/js/biz/{guest => sell}/add.js (62%) rename src/main/webapp/WEB-INF/view/{guest => sell}/add.jsp (63%) diff --git a/ddl/create_ddl.sql b/ddl/create_ddl.sql index 17d6d28..8ff734b 100644 --- a/ddl/create_ddl.sql +++ b/ddl/create_ddl.sql @@ -1,22 +1,22 @@ -drop table erp.mobile_carrier; -create table erp.mobile_carrier +drop table mobile_carrier; +create table mobile_carrier ( - id bigint auto_increment primary key, - carrier_name varchar(50) not null UNIQUE, - del_yn bit default b'0' null + id bigint auto_increment primary key, + carrier_name varchar(50) not null UNIQUE, + del_yn bit default b'0' null ); INSERT INTO erp.mobile_carrier(id, carrier_name, del_yn) VALUES(1, 'KT', 0); INSERT INTO erp.mobile_carrier(id, carrier_name, del_yn) VALUES(2, 'SKT', 0); INSERT INTO erp.mobile_carrier(id, carrier_name, del_yn) VALUES(3, 'LGT', 0); -drop table erp.business_partner; -create table erp.business_partner +drop table business_partner; +create table business_partner ( - id bigint auto_increment primary key, - partner_name varchar(50) not null, - carrier_name varchar(50) not null, - del_yn bit default b'0' null, - FOREIGN KEY(carrier_name) REFERENCES mobile_carrier(carrier_name) + id bigint auto_increment primary key, + partner_name varchar(50) not null, + carrier_name varchar(50) not null, + del_yn bit default b'0' null, + FOREIGN KEY(carrier_name) REFERENCES mobile_carrier(carrier_name) ); INSERT INTO erp.business_partner (id, partner_name, carrier_name, del_yn) VALUES(1, '한빛', 'SKT', 0); INSERT INTO erp.business_partner (id, partner_name, carrier_name, del_yn) VALUES(2, '행복', 'SKT', 0); @@ -36,3 +36,93 @@ INSERT INTO erp.business_partner (id, partner_name, carrier_name, del_yn) VALUES INSERT INTO erp.business_partner (id, partner_name, carrier_name, del_yn) VALUES(16, '에스엔넷 SK', 'SKT', 0); INSERT INTO erp.business_partner (id, partner_name, carrier_name, del_yn) VALUES(17, '에스엔넷 KT', 'KT', 0); INSERT INTO erp.business_partner (id, partner_name, carrier_name, del_yn) VALUES(18, '에스엔넷 LG', 'LGT', 0); +ALTER table erp.business_partner add column serial_yn bit default b'0'; +ALTER TABLE erp.business_partner CHANGE serial_yn serial_yn bit(1) DEFAULT b'0' NULL AFTER carrier_name; + + +create table erp.phone +( + id bigint auto_increment primary key, + pet_name varchar(50) not null comment '아이폰,갤럭시 등', + model varchar(50) not null comment 'a2683, F711 등', + storage int not null comment '핸드폰 용량', + producer varchar(50) not null comment '제조사', + del_yn bit default b'0' null +); + +create table erp.main_rate_plan +( + id bigint auto_increment primary key, + carrier_name varchar(50) not null, + plan_type varchar(50) not null default 'phone' comment '요금제 타입', + plan_name varchar(50) not null comment '요금제 이름', + price bigint null comment '요금제 가격', + del_yn bit default b'0' null, + FOREIGN KEY(carrier_name) REFERENCES mobile_carrier(carrier_name) +); +ALTER TABLE erp.main_rate_plan MODIFY COLUMN price bigint(20) DEFAULT 0 NULL COMMENT '요금제 가격'; +create table erp.sub_rate_plan +( + id bigint auto_increment primary key, + carrier_name varchar(50) not null, + plan_name varchar(50) not null comment '요금제 이름', + price bigint null comment '요금제 가격', + del_yn bit default b'0' null, + FOREIGN KEY(carrier_name) REFERENCES mobile_carrier(carrier_name) +); +ALTER TABLE erp.sub_rate_plan MODIFY COLUMN price bigint(20) DEFAULT 0 NULL COMMENT '요금제 가격'; + +drop table menu; +create table menu +( + id varchar(10) not null, + name varchar(255) null, + url varchar(255) null, + auth varchar(255) null, + uppr_id varchar(10) not null, + active_url varchar(255) null, + sort int null, + menu_icon varchar(255) null, + del_yn bit default b'0' null, + primary key (id, uppr_id) +); +INSERT INTO menu (id, name, url, auth, uppr_id, active_url, sort, menu_icon) VALUES ('1', '거래처 등록', '/partner/add', 'guest', '0', null, 1, 'menuIcon01'); +INSERT INTO menu (id, name, url, auth, uppr_id, active_url, sort, menu_icon) VALUES ('2', '요금제 등록', '/main/rate/plan/add', 'guest', '0', null, 2, 'menuIcon02'); +INSERT INTO menu (id, name, url, auth, uppr_id, active_url, sort, menu_icon) VALUES ('3', '부가서비스 등록', '/sub/rate/plan/add', 'guest', '0', null, 3, 'menuIcon03'); +INSERT INTO menu (id, name, url, auth, uppr_id, active_url, sort, menu_icon) VALUES ('4', '핸드폰 등록', '/phone/add', 'guest', '0', null, 4, 'menuIcon04'); +INSERT INTO menu (id, name, url, auth, uppr_id, active_url, sort, menu_icon) VALUES ('5', '고객정보 등록', '/guest/add', 'guest', '0', null, 5, 'menuIcon05'); +INSERT INTO menu (id, name, url, auth, uppr_id, active_url, sort, menu_icon) VALUES ('6', '관리자메뉴', '/admin', 'guest', '0', null, 6, 'menuIcon06'); +select now() from dual; + +drop table sell_info; +create table sell_info +( + id bigint auto_increment primary key, + openingDate datetime(6) not null, + birthday datetime(6) not null, + pbirthday datetime(6), + payBackDay datetime(6), + reg_dt datetime(6) default now(), + businessPartner varchar(255) not null, + mobileCarrier varchar(255) not null, + name varchar(255) not null, + phoneNumber varchar(255) not null, + pname varchar(255), + pphoneNumber varchar(255), + mainRatePlan varchar(255) not null, + subRatePlan varchar(255), + serialNumber varchar(255), + insertType varchar(255) not null, + formula varchar(255), + payBackYn varchar(255), + payBackBank varchar(255), + payBackNumber varchar(255), + installment bigint not null, + phoneId bigint not null, + usim bigint default 0, + faceValueRebate bigint, + guestMoney bigint, + introductionPay bigint, + payBack bigint, + del_yn bit default b'0' null +); \ No newline at end of file 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 new file mode 100644 index 0000000..c2e22ae --- /dev/null +++ b/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java @@ -0,0 +1,47 @@ +package com.ns.mobile.website.biz.entity; + +import java.time.LocalDateTime; + +import javax.persistence.Entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@Entity +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SellInfo extends BaseEntity{ + + private LocalDateTime openingDate; + private LocalDateTime birthday; + private LocalDateTime pbirthday; + private LocalDateTime payBackDay; + + private String businessPartner; + private String mobileCarrier; + private String name; + private String phoneNumber; + private String pname; + private String pphoneNumber; + private String mainRatePlan; + private String subRatePlan; + private String serialNumber; + private String insertType; + private String formula; + private String payBackYn; + private String payBackBank; + private String payBackNumber; + + private long installment; + private long phoneId; + private long usim; + private long faceValueRebate; + private long guestMoney; + private long introductionPay; + private long payBack; + +} diff --git a/src/main/java/com/ns/mobile/website/biz/model/GuestAddInfoModel.java b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoModel.java similarity index 89% rename from src/main/java/com/ns/mobile/website/biz/model/GuestAddInfoModel.java rename to src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoModel.java index 4ba4183..65dbc92 100644 --- a/src/main/java/com/ns/mobile/website/biz/model/GuestAddInfoModel.java +++ b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoModel.java @@ -1,4 +1,4 @@ -package com.ns.mobile.website.biz.model; +package com.ns.mobile.website.biz.model.sell; import java.util.List; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -public class GuestAddInfoModel{ +public class SellAddInfoModel{ List businessPartnerList; List mainRatePlanList; 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 new file mode 100644 index 0000000..be8c087 --- /dev/null +++ b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java @@ -0,0 +1,42 @@ +package com.ns.mobile.website.biz.model.sell; + +import java.time.LocalDateTime; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SellAddInfoParameter{ + + private String openingDate; + private String businessPartner; + private String mobileCarrier; + private String name; + private String birthday; + private String phoneNumber; + private String pname; + private String pbirthday; + private String pphoneNumber; + private String mainRatePlan; + private String subRatePlan; + private String serialNumber; + private long installment; + private long phoneId; + private String insertType; + private long usim; + private String formula; + private long faceValueRebate; + private long guestMoney; + private long introductionPay; + private long payBack; + private String payBackDay; + private String payBackYn; + private String payBackBank; + private String payBackNumber; + +} diff --git a/src/main/java/com/ns/mobile/website/biz/repository/SellInfoRepository.java b/src/main/java/com/ns/mobile/website/biz/repository/SellInfoRepository.java new file mode 100644 index 0000000..e7420db --- /dev/null +++ b/src/main/java/com/ns/mobile/website/biz/repository/SellInfoRepository.java @@ -0,0 +1,15 @@ +package com.ns.mobile.website.biz.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.ns.mobile.website.biz.entity.SellInfo; +import com.ns.mobile.website.biz.entity.SubRatePlan; + +@Repository +public interface SellInfoRepository extends JpaRepository { + Optional> findByDelYn(boolean delYn); +} diff --git a/src/main/java/com/ns/mobile/website/biz/service/GuestService.java b/src/main/java/com/ns/mobile/website/biz/service/GuestService.java deleted file mode 100644 index ee02f30..0000000 --- a/src/main/java/com/ns/mobile/website/biz/service/GuestService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ns.mobile.website.biz.service; - -import com.ns.mobile.website.biz.model.GuestAddInfoModel; - -public interface GuestService { - - public GuestAddInfoModel getGuestAddInfo(); -} diff --git a/src/main/java/com/ns/mobile/website/biz/service/SellInfoService.java b/src/main/java/com/ns/mobile/website/biz/service/SellInfoService.java new file mode 100644 index 0000000..321b505 --- /dev/null +++ b/src/main/java/com/ns/mobile/website/biz/service/SellInfoService.java @@ -0,0 +1,11 @@ +package com.ns.mobile.website.biz.service; + +import com.ns.mobile.website.biz.model.sell.SellAddInfoModel; +import com.ns.mobile.website.biz.model.sell.SellAddInfoParameter; + +public interface SellInfoService { + + public SellAddInfoModel getSellAddInfo(); + + public void insertSellAdd(SellAddInfoParameter parameter); +} diff --git a/src/main/java/com/ns/mobile/website/biz/service/impl/GuestServiceImpl.java b/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java similarity index 80% rename from src/main/java/com/ns/mobile/website/biz/service/impl/GuestServiceImpl.java rename to src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java index b024fe7..1f1d630 100644 --- a/src/main/java/com/ns/mobile/website/biz/service/impl/GuestServiceImpl.java +++ b/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java @@ -10,13 +10,15 @@ import com.ns.mobile.website.biz.entity.MobileCarrier; import com.ns.mobile.website.biz.entity.Phone; import com.ns.mobile.website.biz.entity.SubRatePlan; import com.ns.mobile.website.biz.exception.BizApiException; -import com.ns.mobile.website.biz.model.GuestAddInfoModel; +import com.ns.mobile.website.biz.model.sell.SellAddInfoModel; +import com.ns.mobile.website.biz.model.sell.SellAddInfoParameter; import com.ns.mobile.website.biz.repository.BusinessPartnerRepository; import com.ns.mobile.website.biz.repository.MainRatePlanRepository; import com.ns.mobile.website.biz.repository.MobileCarrierRepository; import com.ns.mobile.website.biz.repository.PhoneRepository; +import com.ns.mobile.website.biz.repository.SellInfoRepository; import com.ns.mobile.website.biz.repository.SubRatePlanRepository; -import com.ns.mobile.website.biz.service.GuestService; +import com.ns.mobile.website.biz.service.SellInfoService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,17 +26,19 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RequiredArgsConstructor @Service -public class GuestServiceImpl implements GuestService{ +public class SellInfoServiceImpl implements SellInfoService{ private final BusinessPartnerRepository businessPartnerRepository; private final MainRatePlanRepository mainRatePlanRepository; private final MobileCarrierRepository mobileCarrierRepository; private final PhoneRepository phoneRepository; private final SubRatePlanRepository subRatePlanRepository; + private final SellInfoRepository sellInfoRepository; + @Override - public GuestAddInfoModel getGuestAddInfo() { + public SellAddInfoModel getSellAddInfo() { - GuestAddInfoModel result = new GuestAddInfoModel(); + SellAddInfoModel result = new SellAddInfoModel(); List businessPartnerList = businessPartnerRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("거래처 조회가 실패하였습니다.")); result.setBusinessPartnerList(businessPartnerList); List mainRatePlanList = mainRatePlanRepository.findByDelYn(false).orElseThrow(() -> new BizApiException("요금제 조회가 실패하였습니다.")); @@ -48,6 +52,11 @@ public class GuestServiceImpl implements GuestService{ return result; } + @Override + public void insertSellAdd(SellAddInfoParameter parameter) { + + sellInfoRepository.save(null); + } } diff --git a/src/main/java/com/ns/mobile/website/web/controller/home/GuestController.java b/src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java similarity index 80% rename from src/main/java/com/ns/mobile/website/web/controller/home/GuestController.java rename to src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java index d1ddc65..d07f51c 100644 --- a/src/main/java/com/ns/mobile/website/web/controller/home/GuestController.java +++ b/src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import com.ns.mobile.website.biz.service.GuestService; +import com.ns.mobile.website.biz.service.SellInfoService; import com.ns.mobile.website.web.auth.PublicAccess; import com.ns.mobile.website.web.controller.BaseController; import com.ns.mobile.website.web.properties.LaneduProperties; @@ -17,19 +17,19 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @Controller -public class GuestController extends BaseController { +public class SellInfoController extends BaseController { private final LaneduProperties laneduProperties; @Autowired - private GuestService guestService; + private SellInfoService sellService; @PublicAccess - @RequestMapping(value = {"guest/add"}) + @RequestMapping(value = {"sell/add"}) String home(Model model, HttpServletRequest request, HttpSession session ) { model.addAttribute("version", laneduProperties.getVersion()); - return "guest/add"; + return "sell/add"; } diff --git a/src/main/java/com/ns/mobile/website/web/controller/home/api/ApiGuestController.java b/src/main/java/com/ns/mobile/website/web/controller/home/api/ApiSellInfoController.java similarity index 76% rename from src/main/java/com/ns/mobile/website/web/controller/home/api/ApiGuestController.java rename to src/main/java/com/ns/mobile/website/web/controller/home/api/ApiSellInfoController.java index 892aa27..b918e30 100644 --- a/src/main/java/com/ns/mobile/website/web/controller/home/api/ApiGuestController.java +++ b/src/main/java/com/ns/mobile/website/web/controller/home/api/ApiSellInfoController.java @@ -5,11 +5,13 @@ import javax.servlet.http.HttpSession; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ns.mobile.website.biz.model.GuestAddInfoModel; import com.ns.mobile.website.biz.model.ResponseResult; -import com.ns.mobile.website.biz.service.GuestService; +import com.ns.mobile.website.biz.model.sell.SellAddInfoModel; +import com.ns.mobile.website.biz.model.sell.SellAddInfoParameter; +import com.ns.mobile.website.biz.service.SellInfoService; import com.ns.mobile.website.web.auth.PublicAccess; import com.ns.mobile.website.web.controller.BaseController; @@ -19,16 +21,23 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RequiredArgsConstructor @RestController -public class ApiGuestController extends BaseController { +public class ApiSellInfoController extends BaseController { - private final GuestService guestService; + private final SellInfoService sellInfoService; @PublicAccess - @PostMapping("/api/guest/add/info.api") - public ResponseEntity list(HttpServletRequest request, HttpSession session){ - GuestAddInfoModel result = guestService.getGuestAddInfo(); + @PostMapping("/api/sell/add/info.api") + public ResponseEntity addInfo(HttpServletRequest request, HttpSession session){ + SellAddInfoModel result = sellInfoService.getSellAddInfo(); return ResponseResult.success(result); } + + @PublicAccess + @PostMapping("/api/sell/add.api") + public ResponseEntity add(@RequestBody SellAddInfoParameter parameter, HttpServletRequest request, HttpSession session){ + sellInfoService.insertSellAdd(parameter); + return ResponseResult.success(); + } // // @PublicAccess // @PostMapping("/api/phone/detail.api") diff --git a/src/main/resources/static/res/front/js/biz/api/guest-service.js b/src/main/resources/static/res/front/js/biz/api/guest-service.js deleted file mode 100644 index d72a756..0000000 --- a/src/main/resources/static/res/front/js/biz/api/guest-service.js +++ /dev/null @@ -1,16 +0,0 @@ -if (typeof (nscompany) == 'undefined') { nscompany = {}; } -if (typeof (nscompany.mobile) == 'undefined') { nscompany.mobile = {}; } -if (typeof (nscompany.mobile.api) == 'undefined') { nscompany.mobile.api = {}; } -if (typeof (nscompany.mobile.api.guest) == 'undefined') { nscompany.mobile.api.guest = {}; } - -(function (_context_) { - - var API_GUEST_ADD_INFO = '/api/guest/add/info.api'; - - // 핸드폰 전체 리스트 - _context_.addInfo = function (parameter, callback) { - commonFunction(API_GUEST_ADD_INFO, parameter, callback); - }; - - -})(nscompany.mobile.api.guest); diff --git a/src/main/resources/static/res/front/js/biz/api/sell-service.js b/src/main/resources/static/res/front/js/biz/api/sell-service.js new file mode 100644 index 0000000..2c26f04 --- /dev/null +++ b/src/main/resources/static/res/front/js/biz/api/sell-service.js @@ -0,0 +1,21 @@ +if (typeof (nscompany) == 'undefined') { nscompany = {}; } +if (typeof (nscompany.mobile) == 'undefined') { nscompany.mobile = {}; } +if (typeof (nscompany.mobile.api) == 'undefined') { nscompany.mobile.api = {}; } +if (typeof (nscompany.mobile.api.sell) == 'undefined') { nscompany.mobile.api.sell = {}; } + +(function (_context_) { + + var API_SELL_ADD_INFO = '/api/sell/add/info.api'; + var API_SELL_ADD = '/api/sell/add.api'; + + // 핸드폰 전체 리스트 + _context_.addInfo = function (parameter, callback) { + commonFunction(API_SELL_ADD_INFO, parameter, callback); + }; + // 고객 정보 저장 + _context_.add = function (parameter, callback) { + commonFunction(API_SELL_ADD, parameter, callback); + }; + + +})(nscompany.mobile.api.sell); diff --git a/src/main/resources/static/res/front/js/biz/guest/add.js b/src/main/resources/static/res/front/js/biz/sell/add.js similarity index 62% rename from src/main/resources/static/res/front/js/biz/guest/add.js rename to src/main/resources/static/res/front/js/biz/sell/add.js index 732af4a..e785443 100644 --- a/src/main/resources/static/res/front/js/biz/guest/add.js +++ b/src/main/resources/static/res/front/js/biz/sell/add.js @@ -13,24 +13,31 @@ let appVue = new Vue({ mainRatePlanList: [], subRatePlanList: [] }, - openingDate : '', + openingDate : '23', businessPartner : '', mobileCarrier: '', name: '', - birthday: '', + birthday: '19', phoneNumber: '', pname: '', - pbirthday: '', + pbirthday: '19', pphoneNumber: '', mainRatePlan: '', - subRatePlan: '', + subRatePlan: [], serialNumber: '', installment: '0', - petName: '', + phoneId: '', insertType: 'change', usim: '0', formula: '', - faceValueRebate: '' + faceValueRebate: '', + guestMoney: '', + introductionPay: '', + payBack: '', + payBackDay: '', + payBackYn: 'N', + payBackBank: '', + payBackNumber: '' }, mounted: function () { this.init(); @@ -44,24 +51,12 @@ let appVue = new Vue({ let $this = this; $this.bindData(); $this.insertTypeChange(); - - $(".money").on('blur', function(e){ - e.stopPropagation(); - e.stopImmediatePropagation(); - var value; - if(e.target.value < 100){ - value = e.target.value*10000; - }else{ - value = e.target.value; - } - e.target.value = $this.moneyText(value.toString()); - }); }, bindData: function () { let $this = this; let parameter = ''; - nscompany.mobile.api.guest.addInfo(parameter, function (success, message, data) { + nscompany.mobile.api.sell.addInfo(parameter, function (success, message, data) { if (!success) { alert(message); return false; @@ -77,6 +72,57 @@ let appVue = new Vue({ $('.selectpicker').selectpicker(); }); }, + save: function(){ + let $this = this; + + //개통일 date로 변환 + if($this.openingDate.length == 6){ + $this.openingDate = '20' + $this.openingDate; + } + + if($this.payBackDay.length == 6){ + $this.payBackDay = '20' + $this.payBackDay; + } + + let parameter = { + openingDate : $this.peningDate, + birthday : $this.birthday, + pbirthday : $this.pbirthday, + payBackDay : $this.payBackDay, + + usim : $this.usim.replaceAll(',', ''), + faceValueRebate : $this.faceValueRebate.replaceAll(',', ''), + guestMoney : $this.guestMoney.replaceAll(',', ''), + introductionPay : $this.introductionPay.replaceAll(',', ''), + payBack : $this.payBack.replaceAll(',', ''), + + businessPartner : $this.businessPartner, + mobileCarrier : $this.mobileCarrier, + name : $this.name, + phoneNumber : $this.phoneNumber, + pname : $this.pname, + pphoneNumber : $this.pphoneNumber, + mainRatePlan : $this.mainRatePlan, + subRatePlan : $this.subRatePlan.toString(), + serialNumber : $this.serialNumber, + installment : $this.installment, + phoneId : $this.phoneId, + insertType : $this.insertType, + formula : $this.formula, + payBackYn : $this.payBackYn, + payBackBank : $this.payBackBank, + payBackNumber : $this.payBackNumber, + } + console.log(parameter); + nscompany.mobile.api.sell.add(parameter, function (success, message, data) { + if (!success) { + alert(message); + return false; + } + alert("저장 되었습니다."); + //location.reload(); + }); + }, birthdayChange: function (){ let $this = this; if($this.birthday.length != 8){ //생일 입력 안됨 @@ -137,6 +183,15 @@ let appVue = new Vue({ $('#mainRatePlan').selectpicker('refresh'); //$('#mainRatePlan').find(':selected').index(); //선택값쓸떄 + //부가서비스 셋팅 + $this.view.subRatePlanList = []; //배열 초기화 + Array.prototype.push.apply($this.view.subRatePlanList, $this.info.subRatePlanList.filter(function(x){ + if(x.carrierName === $this.mobileCarrier){ + return true; + } + })); + $('#subRatePlan').selectpicker('refresh'); + //시리얼 입력 여부 if($this.info.businessPartnerList[index].serialYn){ $("#serialNumber").removeAttr('disabled'); @@ -172,12 +227,32 @@ let appVue = new Vue({ }, moneyText: function(value){ value = Number(value.replaceAll(',', '')); + + if(value < 100){ + value = value*10000; + } + if(isNaN(value)) { //NaN인지 판별 return 0; }else { //NaN이 아닌 경우 const formatValue = value.toLocaleString('ko-KR'); return formatValue; } + }, + payBackChange: function(){ + let $this = this; + if($this.payBack != ''){ + $("#payBackDay").removeAttr('disabled'); + $("#payBackYn").removeAttr('disabled'); + $("#payBackBank").removeAttr('disabled'); + $("#payBackNumber").removeAttr('disabled'); + }else{ + $("#payBackDay").attr('disabled', 'disabled'); + $("#payBackYn").attr('disabled', 'disabled'); + $("#payBackBank").attr('disabled', 'disabled'); + $("#payBackNumber").attr('disabled', 'disabled'); + } + } } }); \ No newline at end of file diff --git a/src/main/resources/static/res/front/js/lib/bootstrap-select.js b/src/main/resources/static/res/front/js/lib/bootstrap-select.js index 8627ea3..3c3f9bd 100644 --- a/src/main/resources/static/res/front/js/lib/bootstrap-select.js +++ b/src/main/resources/static/res/front/js/lib/bootstrap-select.js @@ -3582,4 +3582,3 @@ })); -//# sourceMappingURL=bootstrap-select.js.map \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/include/inc_head.jsp b/src/main/webapp/WEB-INF/view/include/inc_head.jsp index 7c7e920..2328003 100644 --- a/src/main/webapp/WEB-INF/view/include/inc_head.jsp +++ b/src/main/webapp/WEB-INF/view/include/inc_head.jsp @@ -18,4 +18,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/guest/add.jsp b/src/main/webapp/WEB-INF/view/sell/add.jsp similarity index 63% rename from src/main/webapp/WEB-INF/view/guest/add.jsp rename to src/main/webapp/WEB-INF/view/sell/add.jsp index aede186..e34ff57 100644 --- a/src/main/webapp/WEB-INF/view/guest/add.jsp +++ b/src/main/webapp/WEB-INF/view/sell/add.jsp @@ -28,17 +28,17 @@
- +
- +
- +
@@ -48,36 +48,36 @@
- +
- +
- +
- +
- +
- +
@@ -95,9 +95,11 @@
- +
- +
@@ -121,14 +123,14 @@
-
-
@@ -145,62 +147,91 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
+ +
+ +
- - +