diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java index b005f962..87093ec9 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java @@ -437,39 +437,12 @@ public class BOMaSopmalService { log.debug("masopmal {}", vo); // update payLink mapper.updateBOShopPayLink(vo); - // PC 결제 정보 - String pcSetleType = vo.getPcSetleTypeList(); - String[] pcSetleTypeArr = null; - DataMap pcSetleInfoDm = new DataMap(); - if (!StringUtil.isEmpty(pcSetleType)) { - pcSetleTypeArr = StringUtil.split(pcSetleType, "$"); - pcSetleInfoDm = ynSetParam(pcSetleTypeArr); - pcSetleInfoDm.put("updusr", vo.getUpdusr()); - pcSetleInfoDm.put("setleInfoInnb", vo.getPcSetleInfoInnb()); - mapper.updateBOShopPayInfo(pcSetleInfoDm); - } else { - pcSetleInfoDm = ynSetParam(pcSetleTypeArr); - pcSetleInfoDm.put("updusr", vo.getUpdusr()); - pcSetleInfoDm.put("setleInfoInnb", vo.getPcSetleInfoInnb()); - mapper.updateBOShopPayInfo(pcSetleInfoDm); - } - // MOBILE 결제 정보 - String mobileSetleType = vo.getMobileSetleTypeList(); - String[] mobileSetleTypeArr = null; - DataMap mobileSetleInfoDm = new DataMap(); - if (!StringUtil.isEmpty(mobileSetleType)) { - mobileSetleTypeArr = StringUtil.split(mobileSetleType, "$"); - mobileSetleInfoDm = ynSetParam(mobileSetleTypeArr); - mobileSetleInfoDm.put("updusr", vo.getUpdusr()); - mobileSetleInfoDm.put("setleInfoInnb", vo.getMobileSetleInfoInnb()); - mapper.updateBOShopPayInfo(mobileSetleInfoDm); - } else { - mobileSetleInfoDm = ynSetParam(mobileSetleTypeArr); - mobileSetleInfoDm.put("updusr", vo.getUpdusr()); - mobileSetleInfoDm.put("setleInfoInnb", vo.getMobileSetleInfoInnb()); - mapper.updateBOShopPayInfo(mobileSetleInfoDm); - } + // 결제 정보 업데이트 + updateSetleInfo(vo.getPcSetleTypeList(), vo.getPcSetleInfoInnb(), vo.getUpdusr()); // PC + updateSetleInfo(vo.getMobileSetleTypeList(), vo.getMobileSetleInfoInnb(), vo.getUpdusr()); // MOBILE + updateSetleInfo(vo.getPcSubsvcSetleTypeList(), vo.getPcSubsvcSetleInfoInnb(), vo.getUpdusr()); // 구독서비스 PC + updateSetleInfo(vo.getMobileSubsvcSetleTypeList(), vo.getMobileSubsvcSetleInfoInnb(), vo.getUpdusr()); // 구독서비스 MOBILE if (!ObjectUtils.isEmpty(vo.getFamilySiteNmArr())) { String[] siteNm = vo.getFamilySiteNmArr(); @@ -523,6 +496,26 @@ public class BOMaSopmalService { return message; } + /** + * 결제정보 업데이트 + * @param setleType 결제정보 List + * @param setleInfoInnb 결제정보 고유번호 + * @param updusr 수정자 고유번호 + */ + private void updateSetleInfo(String setleType, String setleInfoInnb, int updusr) { + String[] setleTypeArr = null; + + if (!StringUtil.isEmpty(setleType)) { + setleTypeArr = StringUtil.split(setleType, "$"); + } + + DataMap dm = ynSetParam(setleTypeArr); + dm.put("updusr", updusr); + dm.put("setleInfoInnb", setleInfoInnb); + + mapper.updateBOShopPayInfo(dm); + } + private void setBOMaSopmalVO(BOMaSopmalVO vo) { if(!StringUtil.isEmpty(vo.getSmsAtmcSndngLmttBgntme())) diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java index 4bf36696..3bfb7f6a 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java @@ -483,12 +483,24 @@ public class BOMaSopmalVO extends AbstractVO { /** mobile 결제정보 List */ private String mobileSetleTypeList; + /** 구독서비스 pc 결제정보 List */ + private String pcSubsvcSetleTypeList; + + /** 구독서비스 mobile 결제정보 List */ + private String mobileSubsvcSetleTypeList; + /** pc 결제정보 Innb */ private String pcSetleInfoInnb; /** mobile 결제정보 Innb */ private String mobileSetleInfoInnb; + /** 구독서비스 pc 결제정보 Innb */ + private String pcSubsvcSetleInfoInnb; + + /** 구독서비스 mobile 결제정보 Innb */ + private String mobileSubsvcSetleInfoInnb; + /** 회원가입 안내 타이틀 */ private String joinGuidanceSj; diff --git a/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalC.jsp b/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalC.jsp index d714fee1..b0841533 100644 --- a/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalC.jsp +++ b/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalC.jsp @@ -271,34 +271,18 @@ } /* ******************************************************** - * PC 결제정보 합치기 + * 결제정보 합치기 ******************************************************** */ - const fn_make_pc_setleTyCds = function() { - var pcSetleTypeList = ''; + const fn_make_setleTyCds = function(setleTyName) { + var setleTypeList = ''; - $('[name=pc-setle-type]:checked').each(function() { - pcSetleTypeList += '$' + $(this).val(); + $('[name='+setleTyName+']:checked').each(function() { + setleTypeList += '$' + $(this).val(); }); - pcSetleTypeList = pcSetleTypeList.substring(1); - - return pcSetleTypeList; + setleTypeList = setleTypeList.substring(1); + return setleTypeList; } - /* ******************************************************** - * MOBILE 결제정보 합치기 - ******************************************************** */ - const fn_make_mobile_setleTyCds = function() { - var mobileSetleTypeList = ''; - - $('[name=mobile-setle-type]:checked').each(function() { - mobileSetleTypeList += '$' + $(this).val(); - }); - mobileSetleTypeList = mobileSetleTypeList.substring(1); - - return mobileSetleTypeList; - } - - /* ******************************************************** * 입력창 추가 ******************************************************** */ @@ -492,8 +476,10 @@ fn_make_externalLinkages(); fn_make_eamil(); - var pcSetleTypeList = fn_make_pc_setleTyCds(); - var mobileSetleTypeList = fn_make_mobile_setleTyCds(); + var pcSetleTypeList = fn_make_setleTyCds('pc-setle-type'); + var mobileSetleTypeList = fn_make_setleTyCds('mobile-setle-type'); + var pcSubsvcSetleTypeList = fn_make_setleTyCds('pc-subsvc-setle-type'); + var mobileSubsvcSetleTypeList = fn_make_setleTyCds('mobile-subsvc-setle-type'); let regForm = $('#regForm'); regForm.find("#joinGuidanceSj").val(fn_get_editor_data('#joinGuidanceSj')); @@ -517,6 +503,8 @@ params += "&pcSetleTypeList="+pcSetleTypeList; params += "&mobileSetleTypeList="+mobileSetleTypeList; + params += "&pcSubsvcSetleTypeList="+pcSubsvcSetleTypeList; + params += "&mobileSubsvcSetleTypeList="+mobileSubsvcSetleTypeList; $.ajax({ @@ -1025,296 +1013,296 @@