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:
jazz
2026-02-06 16:22:29 +09:00
parent 006d3f5a09 844d539166
commit f82df1e5cf
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;
}