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

배송그룹 수정

Browse Source
This commit is contained in:
김현욱
2026-02-06 15:57:12 +09:00
parent 543a05b5f5
commit 844d539166
10 changed files with 1084 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/wb/domainserver/domain/gcone/setup/dlvygrp/mapper/BODlvygrpMapper.java
View File

@@ -88,18 +88,21 @@ public interface BODlvygrpMapper {
* @param dlvyGroup
*/
void updateBODlvyGroupRtnlc(BODlvygrpVO dlvyGroup);
void updateBODlvyGroupRtnlc2(BODlvygrpVO dlvyGroup);
/**
* 배송그룹 반송지 등록
* @param dlvyGroup
*/
void insertBODlvyGroupAddress(BODlvygrpVO dlvyGroup);
void insertBODlvyGroupAddress2(BODlvygrpVO dlvyGroup);
/**
* 배송그룹 반송지 삭제 (Y -> N)
* @param dlvyGroup
*/
void deleteBODlvyGroupRtnlc(BODlvygrpVO dlvyGroup);
void deleteBODlvyGroupRtnlc2(BODlvygrpVO dlvyGroup);
/**
* 배송 반송지 조회

11
src/main/java/com/wb/domainserver/domain/gcone/setup/dlvygrp/service/BODlvygrpService.java
View File

@@ -76,9 +76,11 @@ public class BODlvygrpService {
public Map<String, Object> insertBODlvyGroup(BODlvygrpVO dlvyGroup) {
Map<String, Object> message = new HashMap<>();
try {
// KR 반송지 등록
mapper.insertBODlvyGroupAddress(dlvyGroup);
// JP 반송지 등록
mapper.insertBODlvyGroupAddress2(dlvyGroup);
// 배송그룹 등록
mapper.insertBODlvyGroup(dlvyGroup);
message.put("dlvyGroupInnb", dlvyGroup.getDlvyGroupInnb());
message.put("result", "success");
@@ -113,6 +115,7 @@ public class BODlvygrpService {
try {
mapper.updateBODlvyGroupRtnlc(dlvyGroup);
mapper.updateBODlvyGroupRtnlc2(dlvyGroup);
int result = mapper.updateBODlvyGroupDtl(dlvyGroup);
message.put("result", "success");
message.put("dlvyGroupInnb", dlvyGroup.getDlvyGroupInnb());
@@ -137,7 +140,9 @@ public class BODlvygrpService {
int goodsEa = mapper.isIncludeGoods(dlvyGroup);
if(goodsEa < 1) {
try {
dlvyGroup = mapper.selectBODlvyGroupDtlForm(dlvyGroup);
mapper.deleteBODlvyGroupRtnlc(dlvyGroup);
mapper.deleteBODlvyGroupRtnlc2(dlvyGroup);
int result = mapper.deleteBODlvyGroup(dlvyGroup);
message.put("result", "success");
} catch (WnbtRestException wre){

60
src/main/java/com/wb/domainserver/domain/gcone/setup/dlvygrp/vo/BODlvygrpVO.java
View File

@@ -73,12 +73,66 @@ public class BODlvygrpVO extends AbstractVO {
private String rtnlcTelnb;
/*반품배송비왕복금액적용여부*/
/** 반품배송비왕복금액적용여부 */
private String returnDlvyApplcAt;
/*반품배송비금액*/
/** 반품배송비금액 */
private String returnDlvyAmt;
/*왕복배송비금액*/
/** 왕복배송비금액 */
private String exchngDlvyAmt;
/** 반송지2(JP) 고유번호 */
private Integer rtnlcInnb2;
/** 반송지 우편번호2(JP) */
private String rtnlcZip2;
/** 반송지 주소2(JP) */
private String rtnlcAdres2;
/** 반송지 상세주소2(JP) */
@Length(min=0, max=100, message = "반송지(JP상세주소)")
private String rtnlcDtlAdres2;
/** 반송지 전화번호2(JP) */
private String rtnlcTelnb2;
/** 기본배송비2(JP) */
private String dftDlvyAmt2;
/** 금액조건2(JP) */
private String amtCndUseAt2;
/** 금액조건 추가금액2(JP) */
private String amtCndAditAmt2;
/** 개수조건2(JP) */
private String cntCndUseAt2;
/** 개수조건 추가금액2(JP) */
private String cntCndAditAmt2;
/** 배송지역추가여부2(JP) */
private String dlvyAreaAditAt2;
/** 지역추가배송비2(JP) */
private String areaAditDlvyAmt2;
/** 묶음배송 사용여부2(JP) */
private String bundleDlvyUseAt2;
/** 묶음배송 조건금액2(JP) */
private String bundleDlvyCndAmt2;
/** 반품배송비왕복금액적용여부2(JP) */
private String returnDlvyApplcAt2;
/** 반품배송비금액2(JP) */
private String returnDlvyAmt2;
/** 왕복배송비금액2(JP) */
private String exchngDlvyAmt2;
}

101
src/main/java/com/wb/domainserver/domain/mngr/setup/dlvygrp/controller/SetupDlvygrpController.java
View File

@@ -151,11 +151,15 @@ public class SetupDlvygrpController {
if(bindingResult.hasErrors()) {
throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
}
// VO Param setting
// 기본배송비 null 일때 0으로 기본값 셋팅
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
dlvyGroup.setDftDlvyAmt("0");
}
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt2())) {
dlvyGroup.setDftDlvyAmt2("0");
}
// 금액조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getAmtCndUseAt() == null || dlvyGroup.getAmtCndUseAt().equals("N")) {
dlvyGroup.setAmtCndAditAmt("0");
@@ -164,6 +168,13 @@ public class SetupDlvygrpController {
dlvyGroup.setAmtCndUseAt("N");
}
}
if(dlvyGroup.getAmtCndUseAt2() == null || dlvyGroup.getAmtCndUseAt2().equals("N")) {
dlvyGroup.setAmtCndAditAmt2("0");
// 금액조건2 여부가 null 일 때 N으로 기본값 셋팅
if(dlvyGroup.getAmtCndUseAt2() == null) {
dlvyGroup.setAmtCndUseAt2("N");
}
}
// 개수조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getCntCndUseAt() == null || dlvyGroup.getCntCndUseAt().equals("N")) {
dlvyGroup.setCntCndAditAmt("0");
@@ -172,6 +183,13 @@ public class SetupDlvygrpController {
dlvyGroup.setCntCndUseAt("N");
}
}
if(dlvyGroup.getCntCndUseAt2() == null || dlvyGroup.getCntCndUseAt2().equals("N")) {
dlvyGroup.setCntCndAditAmt2("0");
// 개수조건2 여부가 null 일 때 N으로 기본값 셋팅
if(dlvyGroup.getCntCndUseAt2() == null){
dlvyGroup.setCntCndUseAt2("N");
}
}
// 묶음배송 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getBundleDlvyUseAt() == null || dlvyGroup.getBundleDlvyUseAt().equals("N")){
dlvyGroup.setBundleDlvyCndAmt("0");
@@ -180,23 +198,42 @@ public class SetupDlvygrpController {
dlvyGroup.setBundleDlvyUseAt("N");
}
}
if(dlvyGroup.getBundleDlvyUseAt2() == null || dlvyGroup.getBundleDlvyUseAt2().equals("N")){
dlvyGroup.setBundleDlvyCndAmt2("0");
// 묶음배송 여부가 null 일 때 N으로 기본값 셋팅
if(dlvyGroup.getBundleDlvyUseAt2() == null) {
dlvyGroup.setBundleDlvyUseAt2("N");
}
}
// 배송권역 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getDlvyAreaAditAt().equals("N")) {
dlvyGroup.setAreaAditDlvyAmt("0");
}
if(dlvyGroup.getDlvyAreaAditAt2().equals("N")) {
dlvyGroup.setAreaAditDlvyAmt2("0");
}
// 반품배송비 편도 null 일때 0으로 기본값 셋팅
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt())) {
dlvyGroup.setReturnDlvyAmt("0");
}
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt2())) {
dlvyGroup.setReturnDlvyAmt2("0");
}
// 반품배송비 왕복 null 일때 0으로 기본값 셋팅
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt())) {
dlvyGroup.setExchngDlvyAmt("0");
}
if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt2())) {
dlvyGroup.setExchngDlvyAmt2("0");
}
//반품 배송비 왕복금액 적용여부 null 일 경우 N 처리
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt())) {
dlvyGroup.setReturnDlvyApplcAt("N");
}
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt2())) {
dlvyGroup.setReturnDlvyApplcAt2("N");
}
// 숫자(금액&갯수) ',' 제거
dlvyGroup.setDftDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt()));
dlvyGroup.setAmtCndAditAmt(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt()));
@@ -206,6 +243,14 @@ public class SetupDlvygrpController {
dlvyGroup.setReturnDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt()));
dlvyGroup.setExchngDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt()));
dlvyGroup.setDftDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt2()));
dlvyGroup.setAmtCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt2()));
dlvyGroup.setCntCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getCntCndAditAmt2()));
dlvyGroup.setAreaAditDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getAreaAditDlvyAmt2()));
dlvyGroup.setBundleDlvyCndAmt2(StringUtil.removeCommaChar(dlvyGroup.getBundleDlvyCndAmt2()));
dlvyGroup.setReturnDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt2()));
dlvyGroup.setExchngDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt2()));
//사용자 정보 추출 및 적용
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
dlvyGroup.setRegusr(user.getUserInnb());
@@ -369,6 +414,9 @@ public class SetupDlvygrpController {
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
dlvyGroup.setDftDlvyAmt("0");
}
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt2())) {
dlvyGroup.setDftDlvyAmt2("0");
}
// 금액조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getAmtCndUseAt() == null || dlvyGroup.getAmtCndUseAt().equals("N")) {
dlvyGroup.setAmtCndAditAmt("0");
@@ -377,6 +425,13 @@ public class SetupDlvygrpController {
dlvyGroup.setAmtCndUseAt("N");
}
}
if(dlvyGroup.getAmtCndUseAt2() == null || dlvyGroup.getAmtCndUseAt2().equals("N")) {
dlvyGroup.setAmtCndAditAmt2("0");
// 금액조건2 여부가 null 일 때 N으로 기본값 셋팅
if(dlvyGroup.getAmtCndUseAt2() == null) {
dlvyGroup.setAmtCndUseAt2("N");
}
}
// 개수조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getCntCndUseAt() == null || dlvyGroup.getCntCndUseAt().equals("N")) {
dlvyGroup.setCntCndAditAmt("0");
@@ -385,6 +440,13 @@ public class SetupDlvygrpController {
dlvyGroup.setCntCndUseAt("N");
}
}
if(dlvyGroup.getCntCndUseAt2() == null || dlvyGroup.getCntCndUseAt2().equals("N")) {
dlvyGroup.setCntCndAditAmt2("0");
// 개수조건2 여부가 null 일 때 N으로 기본값 셋팅
if(dlvyGroup.getCntCndUseAt2() == null){
dlvyGroup.setCntCndUseAt2("N");
}
}
// 묶음배송 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getBundleDlvyUseAt() == null || dlvyGroup.getBundleDlvyUseAt().equals("N")){
dlvyGroup.setBundleDlvyCndAmt("0");
@@ -393,26 +455,43 @@ public class SetupDlvygrpController {
dlvyGroup.setBundleDlvyUseAt("N");
}
}
if(dlvyGroup.getBundleDlvyUseAt2() == null || dlvyGroup.getBundleDlvyUseAt2().equals("N")){
dlvyGroup.setBundleDlvyCndAmt2("0");
// 묶음배송 여부가 null 일 때 N으로 기본값 셋팅
if(dlvyGroup.getBundleDlvyUseAt2() == null) {
dlvyGroup.setBundleDlvyUseAt2("N");
}
}
// 배송권역 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
if(dlvyGroup.getDlvyAreaAditAt().equals("N")) {
dlvyGroup.setAreaAditDlvyAmt("0");
}
if(dlvyGroup.getDlvyAreaAditAt2().equals("N")) {
dlvyGroup.setAreaAditDlvyAmt2("0");
}
// 반품배송비 편도 null 일때 0으로 기본값 셋팅
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt())) {
dlvyGroup.setReturnDlvyAmt("0");
}
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt2())) {
dlvyGroup.setReturnDlvyAmt2("0");
}
// 반품배송비 왕복 null 일때 0으로 기본값 셋팅
if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt())) {
dlvyGroup.setExchngDlvyAmt("0");
}
if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt2())) {
dlvyGroup.setExchngDlvyAmt2("0");
}
//반품 배송비 왕복금액 적용여부 null 일 경우 N 처리
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt())) {
dlvyGroup.setReturnDlvyApplcAt("N");
}
if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt2())) {
dlvyGroup.setReturnDlvyApplcAt2("N");
}
// 숫자(금액&갯수) , 제거
// 숫자(금액&갯수) ',' 제거
dlvyGroup.setDftDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt()));
dlvyGroup.setAmtCndAditAmt(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt()));
dlvyGroup.setCntCndAditAmt(StringUtil.removeCommaChar(dlvyGroup.getCntCndAditAmt()));
@@ -421,6 +500,14 @@ public class SetupDlvygrpController {
dlvyGroup.setReturnDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt()));
dlvyGroup.setExchngDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt()));
dlvyGroup.setDftDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt2()));
dlvyGroup.setAmtCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt2()));
dlvyGroup.setCntCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getCntCndAditAmt2()));
dlvyGroup.setAreaAditDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getAreaAditDlvyAmt2()));
dlvyGroup.setBundleDlvyCndAmt2(StringUtil.removeCommaChar(dlvyGroup.getBundleDlvyCndAmt2()));
dlvyGroup.setReturnDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt2()));
dlvyGroup.setExchngDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt2()));
//배송그룹 등록처리 결과 메시지(JSON) 처리
//사용자 정보 추출 및 적용
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();