itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
이경숙
2026-04-16 12:07:04 +09:00
parent 28a4552815 16523bba0a
commit c78197583f
7 changed files with 1061 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java
View File

@@ -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()))

12
src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java
View File

@@ -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;

2
src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java
View File

@@ -414,7 +414,7 @@ public class OrdrController {
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
//결재 플랫폼 구분 코드
ordrVO.setSetlePltfomTyCd("PC".equals(request.getAttribute("env"))?"01":"02");
ordrVO.setSetlePltfomTyCd("PC".equals(request.getAttribute("env"))?"03":"04");
//약관정보 세팅
BOStplatVO stplatVO = new BOStplatVO();