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

Compare commits

base: itfirst:451252549575ec95195c490c558157aeb932cab9
Branches Tags
itfirst:master itfirst:develop itfirst:master_order01
..
compare: itfirst:master_order01
Branches Tags
itfirst:develop itfirst:master itfirst:master_order01

1 Commits
4512525495 ... master_ord

Author SHA1 Message Date
김현욱
305d5d226c 배송비 계산 수정(4) 2026-02-12 15:15:07 +09:00
71 changed files with 1631 additions and 6995 deletions
Expand all files Collapse all files

100
src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/controller/BOMaMtngController.java
View File

@@ -286,7 +286,13 @@ public class BOMaMtngController {
return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
}
} else {
// 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크
// if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
// log.info("배송지 정보를 찾을 수 없습니다.");
// content.put("result","Y");
// content.put("message", "배송지 정보를 찾을 수 없습니다.");
// // throw new WnbtRestException("주문유형 정보를 찾을 수 없습니다.");
// return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
// }
if (CollectionUtils.isEmpty(shipping)) {
log.info("배송지 정보를 찾을 수 없습니다.");
content.put("result","Y");
@@ -323,27 +329,91 @@ public class BOMaMtngController {
String[] receptMbtlnbArray = null; // 배송지 받는이 휴대폰번호
if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
if (
StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||
( "01".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcRnmAdres")) ) ||
( "02".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcLnbAdres")) ) ||
StringUtil.isEmpty((String) shipping.get("dlvylcAdresDtl"))
) {
if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {
// 배송지 리스트
List<LinkedHashMap<String, Object>> dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylc.get("dlvylc");
/** ----------------------------------------------- 배송지별 주문 상품 수량 검사 START ----------------------------------------------- */
content = checkDistributedQyMatchesOrder(goodsList, dlvylcListMulti);
if (!"0".equals(content.get("status"))) {
return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
}
/** ----------------------------------------------- 배송지별 주문 상품 수량 검사 END ----------------------------------------------- */
// 부정판매 체크를 위한 배송지 정렬
if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
boolean hasInvalidAddress = dlvylcListMulti.stream().anyMatch(map -> {
String dlvylcZip = StringUtil.isNullToString(map.get("dlvylcZip"));
String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
return StringUtil.isEmpty(dlvylcZip)
|| StringUtil.isEmpty(adresDvCd)
|| ("01".equals(adresDvCd) && StringUtil.isEmpty(dlvylcRnmAdres))
|| ("02".equals(adresDvCd) && StringUtil.isEmpty(dlvylcLnbAdres))
|| StringUtil.isEmpty(adresDtl);
});
if (hasInvalidAddress) {
content.put("result","Y");
content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
}
String dlvylcAdresDvCd = (String) shipping.get("dlvylcAdresDvCd");
String dlvylcLnbAdres = (String) shipping.get("dlvylcLnbAdres");
String dlvylcRnmAdres = (String) shipping.get("dlvylcRnmAdres");
String dlvylcAdresDtl = (String) shipping.get("dlvylcAdresDtl");
List<String> adresList = dlvylcListMulti.stream()
.map(map -> {
String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
String adresMulti;
if ("01".equals(adresDvCd)) {
adresMulti = dlvylcRnmAdres + " " + adresDtl;
} else {
adresMulti = dlvylcLnbAdres + " " + adresDtl;
}
adres = "01".equals(dlvylcAdresDvCd) ? dlvylcRnmAdres + " " + dlvylcAdresDtl : dlvylcLnbAdres + " " + dlvylcAdresDtl;
return adresMulti;
})
.collect(Collectors.toList());
String recpntMbtlnb = StringUtil.isNullToString(shipping.get("recpntMbtlnb"));
receptMbtlnbArray = new String[]{recpntMbtlnb};
adresArray = adresList.toArray(new String[0]);
List<String> receptMbtlnbList = dlvylcListMulti.stream()
.map(map -> {
return StringUtil.isNullToString(map.get("recpntMbtlnb"));
})
.collect(Collectors.toList());
receptMbtlnbArray = receptMbtlnbList.toArray(new String[0]);
}
}
// if (
// StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
// StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||
// ( "01".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcRnmAdres")) ) ||
// ( "02".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcLnbAdres")) ) ||
// StringUtil.isEmpty((String) shipping.get("dlvylcAdresDtl"))
// ) {
// content.put("result","Y");
// content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
// return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
// }
//
// String dlvylcAdresDvCd = (String) shipping.get("dlvylcAdresDvCd");
// String dlvylcLnbAdres = (String) shipping.get("dlvylcLnbAdres");
// String dlvylcRnmAdres = (String) shipping.get("dlvylcRnmAdres");
// String dlvylcAdresDtl = (String) shipping.get("dlvylcAdresDtl");
//
// adres = "01".equals(dlvylcAdresDvCd) ? dlvylcRnmAdres + " " + dlvylcAdresDtl : dlvylcLnbAdres + " " + dlvylcAdresDtl;
//
// String recpntMbtlnb = StringUtil.isNullToString(shipping.get("recpntMbtlnb"));
// receptMbtlnbArray = new String[]{recpntMbtlnb};
} else if ("05".equals(ordrTyCd)) { // 여러곳 배송
if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {

477
src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java
View File

@@ -8,7 +8,6 @@ import com.wb.domainserver.domain.gcone.bbs.cnslt.vo.BOCnsltVO;
import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
import com.wb.domainserver.domain.gcone.goods.purchs.mapper.BOPurchsMapper;
import com.wb.domainserver.domain.gcone.goods.purchs.vo.*;
import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper;
import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrderRestAmtVO;
import com.wb.domainserver.exception.WnbtRestException;
import com.wb.domainserver.security.authentication.AnonymousUser;
@@ -34,9 +33,6 @@ public class BOOrderService {
@Autowired
private BOPurchsMapper mapper;
@Autowired
private BOOrdrMapper boOrdrMapper;
@Autowired
private BOMaMtngService maMtngService;
@@ -97,35 +93,14 @@ public class BOOrderService {
log.debug("insertMngrOrdrRegist-param : {}", param);
/* *****************************
0. 배송 정책에 따른 배송지 세팅
0. 여러곳 배송 배송지 세팅
***************************** */
/** 여러곳 배송 배송지 세팅 시작 */
LinkedHashMap<String, Object> multiOrdrDlvylcMap = new LinkedHashMap<>();
List<LinkedHashMap<String, Object>> dlvylcListMulti = new ArrayList<>();
multiOrdrDlvylcMap = (LinkedHashMap) param.get("multiOrdrDlvylc");
log.debug("multiOrdrDlvylcMap : {}", multiOrdrDlvylcMap);
String dlvylcAreaCd = (String) shipping.get("dlvylcAreaCd");
String ordrAdressZip = StringUtil.isNullToString(shipping.get("dlvylcZip"));
String prefcd = (String) shipping.get("prefcd");
String defaultAdressAt = "N";
String finalSopmalCd = sopmalCd;
DataMap defaultAdressVO = new DataMap() {{ //
put("sopmalCd", finalSopmalCd); // 쇼핑몰 코드
put("zip", ordrAdressZip); // 우편번호
put("prefcd", prefcd); // 도도부현코드
}};
if("KR".equals(dlvylcAreaCd)){
defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire(defaultAdressVO);
}
if("JP".equals(dlvylcAreaCd)){
defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire2(defaultAdressVO);
}
if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
for(int i=0;i<goodsList.size();i++) {
@@ -140,68 +115,25 @@ public class BOOrderService {
DataMap shippingGrouping = mapper.selectShippingGrouping(shippingParam);
// "KR".equals(dlvylcAreaCd)인 경우
String itemDlvyGroupDvCd = (String) shippingGrouping.get("dlvyGroupDvCd");
BigDecimal itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt"); // 기본배송비
BigDecimal itemDlvyAmt = itemDftDlvyAmt; // 배송비
String itemDlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt"); // 도서산간 추가 배송비 조건
BigDecimal itemAreaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt"); // 도서산간 추가 배송비
String itemAmtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건
BigDecimal itemAmtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt");
String itemCntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
BigDecimal itemCntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 수량
// String dlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt"); // 도서산간 추가 배송비 조건
// BigDecimal areaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt"); // 도서산간 추가 배송비
if("JP".equals(dlvylcAreaCd)){
itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt2"); // 기본배송비
itemDlvyAmt = itemDftDlvyAmt; // 배송비
itemDlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt2"); // 도서산간 추가 배송비 조건
itemAreaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt2"); // 도서산간 추가 배송비
itemAmtCndUseAt = (String) shippingGrouping.get("amtCndUseAt2"); // 금액조건
itemAmtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt");
itemCntCndUseAt = (String) shippingGrouping.get("cntCndUseAt2"); // 수량조건
itemCntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt2"); // 수량
List<LinkedHashMap> itemGoodsList = new ArrayList<>();
itemGoodsList.add(goodsList.get(i));
for (LinkedHashMap<String, Object> itemGoodsMap : itemGoodsList) {
itemGoodsMap.put("qy", 1);
}
// 추가배송비 계산 (MUL)
if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) {
if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
List<LinkedHashMap> itempPrsntList = new ArrayList<>();
if(!prsntList.isEmpty()){
itempPrsntList.add(prsntList.get(i));
for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
itemPrsntMap.put("qy", 1);
}
}
if ("03".equals(itemDlvyGroupDvCd) && "Y".equals(itemCntCndUseAt)) {
// BigDecimal qy = (BigDecimal) goodsList.get(i).get("qy"); // 수량
BigDecimal qy = new BigDecimal(String.valueOf(goodsList.get(i).get("qy"))); // 수량
BigDecimal unitQy = qy.divide(itemCntCndAditAmt, 0, RoundingMode.CEILING); // 단위수량
goodsQy = unitQy.intValue();
for(int j=0;j<goodsQy;j++) {
List<LinkedHashMap> itemGoodsList = new ArrayList<>();
itemGoodsList.add(goodsList.get(i));
for (LinkedHashMap<String, Object> itemGoodsMap : itemGoodsList) {
if((goodsQy-j) > 1){
itemGoodsMap.put("qy", itemCntCndAditAmt.intValue());
} else {
itemGoodsMap.put("qy", qy.intValue() - (itemCntCndAditAmt.intValue() * j));
}
}
List<LinkedHashMap> itempPrsntList = new ArrayList<>();
if(!prsntList.isEmpty()){
itempPrsntList.add(prsntList.get(i));
for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
if((goodsQy-j) > 1){
itemPrsntMap.put("qy", itemCntCndAditAmt.intValue());
} else {
itemPrsntMap.put("qy", qy.intValue() - (itemCntCndAditAmt.intValue() * j));
}
}
}
LinkedHashMap<String, Object> dlvyMap = new LinkedHashMap<>();
dlvyMap.put("dftDlvyAmt", itemDftDlvyAmt.intValue());
@@ -211,9 +143,7 @@ public class BOOrderService {
dlvyMap.put("dplctDscntAt", "");
dlvyMap.put("otrCouponSmtmUseAt", "");
dlvyMap.put("mngrFreeDlvyUseAt", "N");
dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd"));
dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
dlvyMap.put("prefcd", shipping.get("prefcd"));
dlvyMap.put("recpntNm", shipping.get("recpntNm"));
dlvyMap.put("recpntMbtlnb", shipping.get("recpntMbtlnb"));
dlvyMap.put("dlvylcAdresDvCd", shipping.get("dlvylcAdresDvCd"));
@@ -226,55 +156,9 @@ public class BOOrderService {
dlvylcListMulti.add(dlvyMap);
}
} else {
BigDecimal qy = new BigDecimal(String.valueOf(goodsList.get(i).get("qy"))); // 수량
List<LinkedHashMap> itemGoodsList = new ArrayList<>();
itemGoodsList.add(goodsList.get(i));
for (LinkedHashMap<String, Object> itemGoodsMap : itemGoodsList) {
itemGoodsMap.put("qy", qy.intValue());
}
List<LinkedHashMap> itempPrsntList = new ArrayList<>();
if(!prsntList.isEmpty()){
itempPrsntList.add(prsntList.get(i));
for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
itemPrsntMap.put("qy", qy.intValue());
}
}
LinkedHashMap<String, Object> dlvyMap = new LinkedHashMap<>();
dlvyMap.put("dftDlvyAmt", itemDftDlvyAmt.intValue());
dlvyMap.put("dlvyAmt", itemDlvyAmt.intValue());
dlvyMap.put("couponInnb", 0);
dlvyMap.put("dwldCouponInnb", 0);
dlvyMap.put("dplctDscntAt", "");
dlvyMap.put("otrCouponSmtmUseAt", "");
dlvyMap.put("mngrFreeDlvyUseAt", "N");
dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd"));
dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
dlvyMap.put("prefcd", shipping.get("prefcd"));
dlvyMap.put("recpntNm", shipping.get("recpntNm"));
dlvyMap.put("recpntMbtlnb", shipping.get("recpntMbtlnb"));
dlvyMap.put("dlvylcAdresDvCd", shipping.get("dlvylcAdresDvCd"));
dlvyMap.put("dlvylcLnbAdres", shipping.get("dlvylcLnbAdres"));
dlvyMap.put("dlvylcRnmAdres", shipping.get("dlvylcRnmAdres"));
dlvyMap.put("dlvylcAdresDtl", shipping.get("dlvylcAdresDtl"));
dlvyMap.put("dlvyMssageCn", shipping.get("dlvyMssageCn"));
dlvyMap.put("goodsList", itemGoodsList);
dlvyMap.put("prsntList", itempPrsntList); //prsntList.get(i));
dlvylcListMulti.add(dlvyMap);
}
}
// 배송지가 1개 이상이면 여러곳 배송으로 변경
if(dlvylcListMulti.size() > 1) {
ordrTyCd = "05";
}
} else if ("05".equals(ordrTyCd)) { // 여러곳 배송, 선물하기
if (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) {
@@ -285,8 +169,6 @@ public class BOOrderService {
}
/** 여러곳 배송 배송지 세팅 종료 */
/* *****************************
1. 주문등록(GC_ORDER)
***************************** */
@@ -312,6 +194,65 @@ public class BOOrderService {
BOOrderShippingVO shippingEscrowVO = new BOOrderShippingVO();
if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
log.debug("여러곳 배송 > 배송지별 배송정보 => {} ", new Gson().toJson(dlvylcListMulti));
// 짜투리 계산을 위해 상품별 수량 체크
List<LinkedHashMap> goodsSetList = new ArrayList<>();
for (LinkedHashMap multiGoods : goodsList) {
int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
LinkedHashMap baseGoods = goodsList.stream()
.filter(goods ->
Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
)
.findFirst()
.orElse(null);
if (baseGoods != null) {
LinkedHashMap merged = new LinkedHashMap<>(baseGoods);
merged.put("setQy", 0);
goodsSetList.add(merged);
}
}
log.debug("상품별 수량 체크 : {}", goodsSetList);
if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
// 배송지별 상품 수량 합산 - isLast 찾기 위함.
List<LinkedHashMap<String, Object>> allMergedGoodsList = new ArrayList<>();
for (LinkedHashMap<String, Object> dlvylcMapMulti : dlvylcListMulti) {
List<LinkedHashMap> goodsListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("goodsList");
for (LinkedHashMap multiGoods : goodsListMulti) {
int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
LinkedHashMap baseGoods = goodsList.stream()
.filter(goods ->
Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
)
.findFirst()
.orElse(null);
if (baseGoods != null) {
LinkedHashMap<String, Object> merged = new LinkedHashMap<>(baseGoods);
allMergedGoodsList.add(merged);
}
}
}
// 분배된 할인 금액 누적
BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
int allGoodsCount = 0; // 전체 상품 순번
for (LinkedHashMap<String, Object> dlvylcMapMulti : dlvylcListMulti) {
log.debug("dlvylcMapMulti : {}", dlvylcMapMulti);
BOOrderShippingVO shippingVO = new BOOrderShippingVO();
@@ -320,36 +261,111 @@ public class BOOrderService {
shippingVO.setMngrInnb(orderVO.getMngrInnb());
shippingVO.setMbrInnb(orderVO.getMbrInnb());
shippingVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
shippingVO.setMngrFreeDlvyUseAt(StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) != "" ? StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) : "N");
shippingVO.setMngrFreeDlvyUseAt(StringUtil.isNullToString(dlvylcMapMulti.get("mngrFreeDlvyUseAt")) != "" ? StringUtil.isNullToString(dlvylcMapMulti.get("mngrFreeDlvyUseAt")) : "N");
/* *****************************************
5. 주문배송 정보 등록(GC_ORDER_SHIPPING)
***************************************** */
insertShipping(ordrTyCd, shipping, shippingVO);
insertShipping(ordrTyCd, dlvylcMapMulti, shippingVO);
shippingEscrowVO = shippingVO; //에스크로에 보낼 배송정보
BigInteger ordrDlvyInnb = shippingVO.getOrdrDlvyInnb();
String mngrFreeDlvyUseAt = (String) shipping.get("mngrFreeDlvyUseAt");
String mngrFreeDlvyUseAt = (String) dlvylcMapMulti.get("mngrFreeDlvyUseAt");
if ("Y".equals(mngrFreeDlvyUseAt)) { // TODO : cjh : 2025-02-28 무료 배송비 : 'Y' 일 경우 애누리에 할인 금액 세팅 -> 배송비 0원에 여부 데이터만 세팅으로 변경 됌.
// BigDecimal dscntAmt = new BigDecimal(StringUtils.hasText((String) enuri.get("enuriAmt")) ? (String) enuri.get("enuriAmt") : "0");
// BigDecimal mngrFreeDlvyUseAmt = new BigDecimal((String) shipping.get("mngrFreeDlvyUseAmt"));
// BigDecimal mngrFreeDlvyUseAmt = new BigDecimal((String) dlvylcMapMulti.get("mngrFreeDlvyUseAmt"));
// enuri.put("enuriAmt", dscntAmt.add(mngrFreeDlvyUseAmt).toString());
}
// 분배된 할인 금액 누적
BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
int optionSeqIndex = 1;
BOOrderNoVO optionNoVO = new BOOrderNoVO();
optionNoVO.setOrdrInnb(ordrInnb);
for (int i = 0; i < goodsList.size(); i++) {
LinkedHashMap goods = goodsList.get(i);
List<LinkedHashMap> goodsListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("goodsList");
boolean isLast = i == goodsList.size() - 1;
List<LinkedHashMap> mergedGoodsList = new ArrayList<>();
/** CJH
* 배송지별 상품 정보 머지
* 여러곳 배송일 경우 서버에서 계산해온 상품 정보를 배송지별 수량에 맞게 분배하다보니
* 상품 정보와 배송지별 수량정보를 합쳐주는 작업이 필요함
* * 일반 주분에서 이벤트 할인 금액, 쿠폰 적용 처리, 적립 마일리지 계산을 배송지별로 계속해서 계산하는데에 어려움이 있어 상품은 유지하고 배송지별로 분배하는 방법을 채택함.
*/
for (LinkedHashMap multiGoods : goodsListMulti) {
int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
// 머지대상
int qy = (int) multiGoods.get("qy"); // 주문 수량
// goodsList에서 상세 정보 찾기
LinkedHashMap baseGoods = goodsList.stream()
.filter(goods ->
Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
)
.findFirst()
.orElse(null);
if (baseGoods != null) {
// 병합
LinkedHashMap<String, Object> merged = new LinkedHashMap<>(baseGoods);
merged.put("baseQy", merged.get("qy")); // 총 상품별 주문 수량 유지
merged.put("qy", qy); // 수량은 배송지별 정보 우선
mergedGoodsList.add(merged);
}
}
log.debug("머지 작업 후 mergedGoodsList : {}", mergedGoodsList);
log.debug("머지 작업 후 goodsList : {}", goodsList);
/** ------------------------------------------- 사은품 세팅 시작 ------------------------------------------- */
List<LinkedHashMap> prsntListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("prsntList");
List<LinkedHashMap> mergedPrsntList = new ArrayList<>();
/** CJH
* 배송지별 상품 정보 머지
* 여러곳 배송일 경우 서버에서 계산해온 상품 정보를 배송지별 수량에 맞게 분배하다보니
* 상품 정보와 배송지별 수량정보를 합쳐주는 작업이 필요함
* * 일반 주분에서 이벤트 할인 금액, 쿠폰 적용 처리, 적립 마일리지 계산을 배송지별로 계속해서 계산하는데에 어려움이 있어 상품은 유지하고 배송지별로 분배하는 방법을 채택함.
*/
for (LinkedHashMap multiGoods : prsntListMulti) {
int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
// 머지대상
int qy = (int) multiGoods.get("provdCnt"); // 주문 수량
// goodsList에서 상세 정보 찾기
LinkedHashMap baseGoods = prsntList.stream()
.filter(goods ->
Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
)
.findFirst()
.orElse(null);
if (baseGoods != null) {
// 병합
LinkedHashMap<String, Object> merged = new LinkedHashMap<>(baseGoods);
merged.put("baseQy", merged.get("provdCnt")); // 총 상품별 주문 수량 유지
merged.put("provdCnt", qy); // 수량은 배송지별 정보 우선
mergedPrsntList.add(merged);
}
}
log.debug("머지 작업 후 mergedPrsntList : {}", mergedPrsntList);
log.debug("머지 작업 후 prsntList : {}", prsntList);
/** ------------------------------------------- 사은품 세팅 끝 ------------------------------------------- */
for (int i = 0; i < mergedGoodsList.size(); i++) {
LinkedHashMap goods = mergedGoodsList.get(i);
boolean isLast = allGoodsCount == allMergedGoodsList.size() - 1;
if (!CollectionUtils.isEmpty(goods)) {
int goodsInnb = (int) goods.get("goodsInnb");
@@ -374,10 +390,12 @@ public class BOOrderService {
setGoodsOptn(sopmalCd, goodsInnb, goodsOptnInnb, ordrQy, itemOptnVO); // 상품 옵션정보 세팅
setDscntDtls(goodsInnb, goodsOptnInnb, null, goodsList, shipping, enuri, itemOptnVO, isLast, isLast, discountInfo); // 상품 할인내역 세팅
LinkedHashMap goodsSet = goodsSetList.stream().filter(obj-> Objects.equals(goodsInnb, obj.get("goodsInnb")) && Objects.equals(goodsOptnInnb, obj.get("goodsOptnInnb"))).findAny().orElse(null);
setDscntDtlsMulti(goodsInnb, goodsOptnInnb, null, mergedGoodsList, dlvylcMapMulti, enuri, itemOptnVO, isLast, isLast, discountInfo, goodsList, goodsSet); // 상품 할인내역 세팅 - 여러곳 배송
if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // 회원
setMlgAmt(ordrTyCd, goodsInnb, goodsOptnInnb, ordrQy, goodsList, itemOptnVO); // 상품 마일리지 정보 세팅
setMlgAmtMulti(ordrTyCd, goodsInnb, goodsOptnInnb, ordrQy, mergedGoodsList, itemOptnVO, goodsSet); // 상품 마일리지 정보 세팅 - 여러곳 배송
} else {
itemOptnVO.setMlgAccmlUnit(new BigDecimal(0)); // 마일리지적립금액(개당)
itemOptnVO.setMlgAccmlRest(new BigDecimal(0)); // 마일리지적립금액(짜투리)
@@ -386,6 +404,9 @@ public class BOOrderService {
itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
mapper.insertOrdrGoodsOption(itemOptnVO); // 주문 상품 옵션 정보 등록
// 상품별 수량 체크
goodsSet.put("setQy", (int) goodsSet.get("setQy") + ordrQy);
String inputOptn = (String) goods.get("inputOptn");
if (StringUtils.hasText(inputOptn)) {
@@ -421,14 +442,139 @@ public class BOOrderService {
}
}
}
// 전체 수량의 마지막 체크
allGoodsCount = allGoodsCount + 1;
}
/* ***********************************************************
7. 주문 상품 옵션(사은품) 정보 등록(GC_ORDER_ITEM_OPTION)
*********************************************************** */
if (!CollectionUtils.isEmpty(prsntList)) {
insertPrsnt(sopmalCd, ordrInnb, shippingVO.getOrdrDlvyInnb(), prsntList);
insertPrsnt(sopmalCd, ordrInnb, ordrDlvyInnb, mergedPrsntList);
}
}
}
// BOOrderShippingVO shippingVO = new BOOrderShippingVO();
//
// shippingVO.setSopmalCd(sopmalCd);
// shippingVO.setOrdrInnb(ordrInnb);
// shippingVO.setMngrInnb(orderVO.getMngrInnb());
// shippingVO.setMbrInnb(orderVO.getMbrInnb());
// shippingVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
// shippingVO.setMngrFreeDlvyUseAt(StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) != "" ? StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) : "N");
//
// /* *****************************************
// 5. 주문배송 정보 등록(GC_ORDER_SHIPPING)
// ***************************************** */
//
// insertShipping(ordrTyCd, shipping, shippingVO);
// shippingEscrowVO = shippingVO; //에스크로에 보낼 배송정보
//
// BigInteger ordrDlvyInnb = shippingVO.getOrdrDlvyInnb();
//
// String mngrFreeDlvyUseAt = (String) shipping.get("mngrFreeDlvyUseAt");
//
// if ("Y".equals(mngrFreeDlvyUseAt)) { // TODO : cjh : 2025-02-28 무료 배송비 : 'Y' 일 경우 애누리에 할인 금액 세팅 -> 배송비 0원에 여부 데이터만 세팅으로 변경 됌.
//// BigDecimal dscntAmt = new BigDecimal(StringUtils.hasText((String) enuri.get("enuriAmt")) ? (String) enuri.get("enuriAmt") : "0");
//// BigDecimal mngrFreeDlvyUseAmt = new BigDecimal((String) shipping.get("mngrFreeDlvyUseAmt"));
//
// // enuri.put("enuriAmt", dscntAmt.add(mngrFreeDlvyUseAmt).toString());
// }
//
// // 분배된 할인 금액 누적
// BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
//
// int optionSeqIndex = 1;
// BOOrderNoVO optionNoVO = new BOOrderNoVO();
// optionNoVO.setOrdrInnb(ordrInnb);
// for (int i = 0; i < goodsList.size(); i++) {
// LinkedHashMap goods = goodsList.get(i);
//
// boolean isLast = i == goodsList.size() - 1;
//
// if (!CollectionUtils.isEmpty(goods)) {
// int goodsInnb = (int) goods.get("goodsInnb");
// int goodsOptnInnb = (int) goods.get("goodsOptnInnb");
// int ordrQy = (int) goods.get("qy");
//
// BOOrderItemVO orderItemVO = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
// Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).findAny().orElse(null);
//
// /* ***********************************************
// 6. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
// 주문 상품 입력 옵션 정보 등록
// *********************************************** */
// if (orderItemVO != null) {
// BOOrderItemOptnVO itemOptnVO = new BOOrderItemOptnVO();
//
// itemOptnVO.setSopmalCd(sopmalCd);
// itemOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb());
// itemOptnVO.setOrdrDlvyInnb(ordrDlvyInnb);
// itemOptnVO.setOrdrInnb(ordrInnb);
// itemOptnVO.setOrdrSttusCd("0"); // 주문상태(99:결제실패)
//
// setGoodsOptn(sopmalCd, goodsInnb, goodsOptnInnb, ordrQy, itemOptnVO); // 상품 옵션정보 세팅
//
// setDscntDtls(goodsInnb, goodsOptnInnb, null, goodsList, shipping, enuri, itemOptnVO, isLast, isLast, discountInfo); // 상품 할인내역 세팅
//
// if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // 회원
// setMlgAmt(ordrTyCd, goodsInnb, goodsOptnInnb, ordrQy, goodsList, itemOptnVO); // 상품 마일리지 정보 세팅
// } else {
// itemOptnVO.setMlgAccmlUnit(new BigDecimal(0)); // 마일리지적립금액(개당)
// itemOptnVO.setMlgAccmlRest(new BigDecimal(0)); // 마일리지적립금액(짜투리)
// }
//
// itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
// mapper.insertOrdrGoodsOption(itemOptnVO); // 주문 상품 옵션 정보 등록
//
// String inputOptn = (String) goods.get("inputOptn");
//
// if (StringUtils.hasText(inputOptn)) {
// String[] inputOptns = inputOptn.split("/");
//
// for (int j = 0; j < inputOptns.length; j++) {
// String optn = inputOptns[j];
// String[] optns = optn.split(",");
//
// BOOrderItemOptnVO inputOptnVO = new BOOrderItemOptnVO();
//
// inputOptnVO.setSopmalCd(sopmalCd); // 쇼핑몰 코드
// inputOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb()); // 주문상품 고유번호
// inputOptnVO.setOrdrDlvyInnb(ordrDlvyInnb); // 주문배송 고유번호
// inputOptnVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
// inputOptnVO.setRelateOrdrGoodsOptnInnb(itemOptnVO.getOrdrGoodsOptnInnb());
//
// setGoodsOptn(optns[0], Integer.parseInt(optns[1]), Integer.parseInt(optns[2]), 0, inputOptnVO);
//
// if (i == 0) {
// inputOptnVO.setOptnVal1(optns[3]);
// } else if (i == 1) {
// inputOptnVO.setOptnVal2(optns[3]);
// } else if (i == 2) {
// inputOptnVO.setOptnVal3(optns[3]);
// } else if (i == 3) {
// inputOptnVO.setOptnVal4(optns[3]);
// }
//
// itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
// mapper.insertOrdrGoodsOption(inputOptnVO); // 주문 상품 입력 옵션 정보 등록
// }
// }
// }
// }
// }
//
// /* ***********************************************************
// 7. 주문 상품 옵션(사은품) 정보 등록(GC_ORDER_ITEM_OPTION)
// *********************************************************** */
// if (!CollectionUtils.isEmpty(prsntList)) {
// insertPrsnt(sopmalCd, ordrInnb, shippingVO.getOrdrDlvyInnb(), prsntList);
// }
} else if ("05".equals(ordrTyCd)) { // 여러곳 배송, 선물하기
log.debug("여러곳 배송 > 배송지별 배송정보 => {} ", new Gson().toJson(dlvylcListMulti));
@@ -1404,20 +1550,30 @@ public class BOOrderService {
shippingVO.setDlvyMthCd("01"); // 택배
if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
shippingVO.setRecpntNm((String) shipping.get("recpntNm"));
shippingVO.setRecpntTelnb((String) shipping.get("recpntTelnb"));
shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb"));
shippingVO.setRecpntNm(StringUtil.isNullToString(shipping.get("recpntNm")));
shippingVO.setRecpntTelnb(StringUtil.isNullToString(shipping.get("recpntTelnb")));
shippingVO.setRecpntMbtlnb(StringUtil.isNullToString(shipping.get("recpntMbtlnb")));
shippingVO.setDlvylcAreaCd((String) shipping.get("dlvylcAreaCd"));
shippingVO.setPrefcd((String) shipping.get("prefcd"));
shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip"));
shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd"));
shippingVO.setDlvylcLnbAdres((String) shipping.get("dlvylcLnbAdres"));
shippingVO.setDlvylcRnmAdres((String) shipping.get("dlvylcRnmAdres"));
shippingVO.setDlvylcAdresDtl((String) shipping.get("dlvylcAdresDtl"));
shippingVO.setDlvylcZip(StringUtil.isNullToString(shipping.get("dlvylcZip")));
shippingVO.setDlvylcAdresDvCd(StringUtil.isNullToString(shipping.get("dlvylcAdresDvCd")));
shippingVO.setDlvylcLnbAdres(StringUtil.isNullToString(shipping.get("dlvylcLnbAdres")));
shippingVO.setDlvylcRnmAdres(StringUtil.isNullToString(shipping.get("dlvylcRnmAdres")));
shippingVO.setDlvylcAdresDtl(StringUtil.isNullToString(shipping.get("dlvylcAdresDtl")));
shippingVO.setDlvyMssageCn((String) shipping.get("dlvyMssageCn"));
shippingVO.setDlvyCycleCd((String) shipping.get("dlvyCycleCd"));
shippingVO.setDlvyMssageCn(StringUtil.isNullToString(shipping.get("dlvyMssageCn")));
shippingVO.setDlvyCycleCd(StringUtil.isNullToString(shipping.get("dlvyCycleCd")));
// shippingVO.setRecpntNm((String) shipping.get("recpntNm"));
// shippingVO.setRecpntTelnb((String) shipping.get("recpntTelnb"));
// shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb"));
//
// shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip"));
// shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd"));
// shippingVO.setDlvylcLnbAdres((String) shipping.get("dlvylcLnbAdres"));
// shippingVO.setDlvylcRnmAdres((String) shipping.get("dlvylcRnmAdres"));
// shippingVO.setDlvylcAdresDtl((String) shipping.get("dlvylcAdresDtl"));
//
// shippingVO.setDlvyMssageCn((String) shipping.get("dlvyMssageCn"));
// shippingVO.setDlvyCycleCd((String) shipping.get("dlvyCycleCd"));
}
if ("05".equals(ordrTyCd)) { // 여러곳 배송
@@ -1448,8 +1604,6 @@ public class BOOrderService {
shippingVO.setRecpntTelnb(StringUtil.isNullToString(shipping.get("recpntTelnb")));
shippingVO.setRecpntMbtlnb(StringUtil.isNullToString(shipping.get("recpntMbtlnb")));
shippingVO.setDlvylcAreaCd(StringUtil.isNullToString(shipping.get("dlvylcAreaCd")));
shippingVO.setPrefcd(StringUtil.isNullToString(shipping.get("prefcd")));
shippingVO.setDlvylcZip(StringUtil.isNullToString(shipping.get("dlvylcZip")));
shippingVO.setDlvylcAdresDvCd(StringUtil.isNullToString(shipping.get("dlvylcAdresDvCd")));
shippingVO.setDlvylcLnbAdres(StringUtil.isNullToString(shipping.get("dlvylcLnbAdres")));
@@ -2383,6 +2537,9 @@ public class BOOrderService {
throw new WnbtRestException("주문배송 정보를 찾을 수 없습니다.");
}
} else {
// if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
// throw new WnbtRestException("주문배송 정보를 찾을 수 없습니다.");
// }
if (CollectionUtils.isEmpty(shipping)) {
throw new WnbtRestException("주문배송 정보를 찾을 수 없습니다.");
}

2
src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java
View File

@@ -1837,8 +1837,6 @@ public class BOPurchsService {
public Map<String, Object> selectSetleExpectAmt(DataMap param) {
Map<String, Object> content = new HashMap<>();
log.debug("BOPurchsService.selectSetleExpectAmt-param : {}", param);
String sopmalCd = (String) param.get("sopmalCd");
LinkedHashMap setleExpectAmtMap = new LinkedHashMap(){{

4
src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java
View File

@@ -26,12 +26,8 @@ public class BOOrderShippingVO extends AbstractVO {
private String recpntMbtlnb;
private String dlvylcAreaCd;
private String dlvylcZip;
private String prefcd;
private String dlvylcAdresDvCd;
private String dlvylcLnbAdres;

9
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java
View File

@@ -335,8 +335,6 @@ public interface BOOrdrMapper {
*/
public List<DataMap> selectOrderShippingList(BOOrdrShippingVO ordrShippingVO);
public List<DataMap> selectOrderShippingListGrp(BOOrdrShippingVO ordrShippingVO);
/**
* 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 상품 목록 조회
* @param paramMap
@@ -351,13 +349,6 @@ public interface BOOrdrMapper {
*/
public List<DataMap> selectRefundShippingGoodsList(DataMap paramMap);
/**
* 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정 > 배송지정보 일치여부 확인
* @param ordrShippingVO
* @return Integer
*/
public Integer selectDlvylcAreaCdInfo(BOOrdrShippingVO ordrShippingVO);
/**
* 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정
* @param ordrShippingVO

146
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java
View File

@@ -13,8 +13,6 @@ import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderNoService;
import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderService;
import com.wb.domainserver.domain.gcone.goods.purchs.service.BOPurchsService;
import com.wb.domainserver.domain.gcone.goods.purchs.vo.*;
import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
import com.wb.domainserver.domain.gcone.mbr.mbr.mapper.BOMbrMapper;
import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrAppnVO;
@@ -146,9 +144,6 @@ public class BOOrdrService{
@Autowired
private BOOrderNoService orderNoService;
@Autowired
private BOSubsvcService subsvcService;
@Autowired
private PropertyService propertyService;
@@ -1988,8 +1983,6 @@ public class BOOrdrService{
List<DataMap> shippingList = mapper.selectOrderShippingList(shippingVO);
// List<DataMap> shippingListGrp = mapper.selectOrderShippingListGrp(shippingVO);
if (!CollectionUtils.isEmpty(shippingList)) {
for (int i = 0; i < shippingList.size(); i++) {
DataMap param = shippingList.get(i);
@@ -2013,12 +2006,9 @@ public class BOOrdrService{
List<DataMap> mlgAccmlNtcList = purchsMapper.selectMlgAccmlNtcList(purchsrVO);
/*구독 취소*/
content.put("order", ordrDtl);
content.put("goodsList", goodsList);
content.put("shippingList", shippingList);
// content.put("shippingListGrp", shippingListGrp);
content.put("dscntList", dscntList);
content.put("setleList", setleList);
content.put("refundList", refundList);
@@ -2046,7 +2036,6 @@ public class BOOrdrService{
log.debug("param{}",param);
paramVO.setRecpntNm((String) param.get("recpntNm"));
paramVO.setRecpntMbtlnb((String) param.get("recpntMbtlnb"));
paramVO.setDlvylcAreaCd((String) param.get("dlvylcAreaCd"));
paramVO.setDlvylcZip((String) param.get("dlvylcZip"));
paramVO.setDlvylcAdresDvCd((String) param.get("dlvylcAdresDvCd"));
paramVO.setDlvylcLnbAdres((String) param.get("dlvylcLnbAdres"));
@@ -2061,21 +2050,12 @@ public class BOOrdrService{
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
paramVO.setUpdusr(user.getUserInnb());
/* 배송지정보 일치여부 확인 이후 업데이트 */
int cnt = mapper.selectDlvylcAreaCdInfo(paramVO);
if (cnt == 0) {
message.put("status", "1");
message.put("message", "배송지 국가는 변경할 수 없습니다.");
}
if(cnt > 0) {
cnt = mapper.updateDlvylcInfo(paramVO);
int cnt = mapper.updateDlvylcInfo(paramVO);
if (cnt == 0) {
message.put("status", "1");
message.put("message", "배송지 수정을 실패하였습니다");
}
}
return message;
}
@@ -3023,7 +3003,7 @@ public class BOOrdrService{
public Map<String, Object> selectSetleExpectAmt(DataMap param) throws Exception {
Map<String, Object> content = new HashMap<>();
log.debug("BOOrdrService.selectSetleExpectAmt-param : {}", param);
log.debug("selectSetleExpectAmt-param : {}", param);
LinkedHashMap setleExpectAmtMap = new LinkedHashMap() {{
put("goodsAmt", 0);
@@ -3401,12 +3381,9 @@ public class BOOrdrService{
LinkedHashMap<String, Object> shippingMap = (LinkedHashMap) param.get("shipping");
// String ordrAdressZip = StringUtil.isNullToString(param.get("dlvylcZip"));
// String dlvylcAreaCd = (String) param.get("dlvylcAreaCd");
// String prefcd = (String) param.get("prefcd");
String ordrAdressZip = StringUtil.isNullToString(shippingMap != null ? shippingMap.get("dlvylcZip") : "");
String dlvylcAreaCd = StringUtil.isNullToString(shippingMap != null ? shippingMap.get("dlvylcAreaCd") : "");
String prefcd = StringUtil.isNullToString(shippingMap != null ? shippingMap.get("prefcd") : "");
String ordrAdressZip = StringUtil.isNullToString(shippingMap.get("dlvylcZip"));
String dlvylcAreaCd = (String) shippingMap.get("dlvylcAreaCd");
String prefcd = (String) shippingMap.get("prefcd");
DataMap defaultAdressVO = new DataMap() {{ //
put("sopmalCd", sopmalCd); // 쇼핑몰 코드
put("zip", ordrAdressZip); // 우편번호
@@ -6144,119 +6121,6 @@ public class BOOrdrService{
사용자 > 상품 > 구매/결제 > 비회원구매하기 종료
#################################### */
/* ####################################
사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 시작
#################################### */
/**
* 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 구독서비스 결제 화면 정보 조회
* @param ordrVO
* @return Map<String, Object>
*/
public Map<String, Object> selectSubsvcPurchs(BOOrdrVO ordrVO) {
Map<String, Object> content = new HashMap<>();
//구독서비스 조회
BOSubsvcVO subsvcVO = new BOSubsvcVO();
subsvcVO.setSopmalCd(ordrVO.getSopmalCd());
subsvcVO.setSubsvcInnb(ordrVO.getSubsvcInnb());
DataMap subsvcOne = subsvcService.selectBOSubsvcDetail(subsvcVO);
BOPurchsrVO purchsrVO = new BOPurchsrVO();
purchsrVO.setSopmalCd(ordrVO.getSopmalCd());
purchsrVO.setMbrDvCd(ordrVO.getMbrDvCd());
purchsrVO.setMbrInnb(String.valueOf(ordrVO.getMbrInnb()));
purchsrVO.setMbrId(ordrVO.getMbrId());
BOCashVO cashVO = new BOCashVO();
cashVO.setSopmalCd(ordrVO.getSopmalCd());
cashVO.setMbrDvCd(ordrVO.getMbrDvCd());
cashVO.setMbrInnb(String.valueOf(ordrVO.getMbrInnb()));
//구매자조회
DataMap purchsrMap = purchsService.selectPurchsr(purchsrVO);
if (!CollectionUtils.isEmpty(purchsrMap)) {
BOMlgVO mlgVo = new BOMlgVO();
mlgVo.setMbrDvCd((String) purchsrMap.get("mbrDvCd"));
mlgVo.setMbrInnb(purchsrMap.get("mbrInnb").toString());
// 마일리지 잔액 총액
BigDecimal blceSum = mlgService.selectBOMlgBlceSum(mlgVo);
// 충전형 마일리지 잔액 총액
BigDecimal cashBlceSum = mlgService.selectBOCashBlce(cashVO);
purchsrMap.put("sopmalCd", ordrVO.getSopmalCd());
purchsrMap.put("dftDlvylc", purchsService.selectDftDlvylc(purchsrVO));
purchsrMap.put("ableMlgAmt", blceSum.intValue());
purchsrMap.put("ableCashMlgAmt", cashBlceSum.intValue());
}
DataMap paramMap = new DataMap(){{
put("sopmalCd", ordrVO.getSopmalCd());
put("setlePltfomTyCd", ordrVO.getSetlePltfomTyCd()); // PC
}};
DataMap payInfo = purchsMapper.selectPayInfo(paramMap);
DataMap shopInfo = purchsMapper.selectOrdrShopInfo(ordrVO);
content.put("purchsr", purchsrMap);
content.put("mlgAccmlNtcList", purchsMapper.selectMlgAccmlNtcList(purchsrVO));
content.put("subsvcOne", subsvcOne);
content.put("payInfo", payInfo);
content.put("shopInfo", shopInfo);
return content;
}
/**
* 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 결제 예정금액
* @param param
* @return Map<String, Object>
*/
public Map<String, Object> selectSubsvcSetleExpectAmt(DataMap param) throws Exception {
Map<String, Object> content = new HashMap<>();
log.debug("selectSetleExpectAmt-param : {}", param);
LinkedHashMap setleExpectAmtMap = new LinkedHashMap() {{
put("goodsAmt", 0);
put("dlvyAmt", 0);
put("evtDscntAmt", 0);
put("goodsCouponDscntAmt", 0);
put("dlvyCouponDscntAmt", 0);
put("cartCouponDscntAmt", 0);
put("useMlgAmt", 0);
put("useCashMlgAmt", 0);
put("dscntAmt", 0);
put("setleAmt", 0);
put("accmlMlgAmt", 0);
}};
BigDecimal goodsAmt = new BigDecimal(0);
BigDecimal setleAmt = new BigDecimal(0);
LinkedHashMap subsvcOne = (LinkedHashMap) param.get("subsvcOne");
log.debug("subsvcOne : {}", subsvcOne);
goodsAmt = BigDecimal.valueOf((Integer) subsvcOne.get("selpric"));
setleAmt = BigDecimal.valueOf((Integer) subsvcOne.get("selpric"));
// ############################################## 결제 예정 금액 적용 ##############################################
setleExpectAmtMap.put("goodsAmt", goodsAmt.intValue());
setleExpectAmtMap.put("setleAmt", setleAmt.intValue());
content.put("setleExpectAmt", setleExpectAmtMap);
content.put("subsvcOne", param.get("subsvcOne"));
return content;
}
/* ####################################
사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 종료
#################################### */
/* ####################################
사용자 > 상품 > 구매/결제 > 개인결제 시작
#################################### */

3
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java
View File

@@ -81,8 +81,7 @@ public class BODwldItmVO extends AbstractVO {
item50("dlvy_amt_setle_mth_nm", "배송비결제방식"),
item51("ordr_ty_nm", "주문유형"),
item52("optn_cd_1", "상품코드"),
item53("dlvy_mssage_cn", "배송메시지"),
item54("shipping_sttus_nm", "출고상태");
item53("dlvy_mssage_cn", "배송메시지");
private final String key;
private final String value;

6
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java
View File

@@ -46,14 +46,10 @@ public class BOOrdrRefundVO extends AbstractVO {
private BigDecimal refundAmt; // 환불금액
private BigDecimal wonRefundAmt; // 환불금액(원화)
private BigDecimal refundAccmlmnyAmt; // 환불적립금액
private BigDecimal refundDlvyAmt; // 환불배송비총금액
private BigDecimal wonRefundDlvyAmt; // 환불배송비총금액(원화)
private BigDecimal mlgAccmlmnyAmt; // 적립금보정금액
private String mlgAccmlmnyValidDt; // 적립금유효기간
@@ -94,8 +90,6 @@ public class BOOrdrRefundVO extends AbstractVO {
private BigDecimal returnDlvyAmt; // 반품배송비금액
private BigDecimal wonReturnDlvyAmt; // 반품배송비금액(원화)
private String returnDlvyTrgetCd; // 반품배송비수령대상코드
private String returnDlvyRspnsblCd; // 반품배송비지불책임코드

3
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java
View File

@@ -40,9 +40,6 @@ public class BOOrdrShippingVO extends AbstractVO {
/** 받는자휴대폰번호 */
private String recpntMbtlnb;
/** 배송지역코드 */
private String dlvylcAreaCd;
/** 배송지우편번호 */
private String dlvylcZip;

3
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrVO.java
View File

@@ -151,9 +151,6 @@ public class BOOrdrVO extends AbstractVO {
/** 장바구니 고유번호 배열 */
private String[] cartInnbs;
/** 구독서비스 고유번호 */
private String subsvcInnb;
/** 주문배송 고유번호 */
private String ordrDlvyInnb;

33
src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java
View File

@@ -171,26 +171,6 @@ public class MyOrdrController {
return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListRForm";
}
/**
* 마이 페이지 > MY쇼핑 > 마이페이지 > 주문/배송 목록 조회
* @param ordrDlvyVO
* @return ResponseEntity<WnbtResponse>
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectMbrSubsvcOrdrListInqireMapge")
public String selectMbrSubsvcOrdrListInqireMapge(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
model.addAttribute("data", content);
// responseHandler.handleResponse(
// sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOMbrOrdrListInqireAjax", ordrDlvyVO),
// model,
// "data"
// );
return "sopmal/mpage/ordr/SubsvcOrdrDlvyListMpageRList";
}
/**
* 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 주문/배송 목록 조회
* @param ordrDlvyVO
@@ -228,12 +208,10 @@ public class MyOrdrController {
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectMbrSubsvcOrdrDtlInqire")
public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo, BORtngudrefndVO boRtngudrefndVO) throws Exception {
boRtngudrefndVO.setServerDv("sopmal");
public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if ("01".equals(user.getSysDvCd())) {
ordrDlvyVO.setSopmalCd(user.getSopmalCd());
boRtngudrefndVO.setSopmalCd(user.getSopmalCd());
}
Map<String, Object> message = boOrdrService.selectMbrOrdrDtlInqire(ordrDlvyVO);
/**발급대상구분코드*/
@@ -250,13 +228,6 @@ public class MyOrdrController {
// );
model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
model.addAttribute("vo", ordrDlvyVO);
/**환불내역이 있으면 정보조회*/
if(message.get("order") != null && !"".equals(((DataMap)message.get("order")).get("orderReInnb"))){
boRtngudrefndVO.setOrderReInnb((String)((DataMap)message.get("order")).get("orderReInnb"));
Map<String, Object> refund = new HashMap<String, Object>();
refund.put("result", boRtngudrefndService.selectBORtngudRefndDtlInqire(boRtngudrefndVO));
model.addAttribute("resultMap", refund);
}
// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
Map<String, Object> content = selectBOMpageInfoInqire(vo);
@@ -787,7 +758,7 @@ public class MyOrdrController {
// model,
// "resultMap"
// );
model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(boRtngudrefndVO));
model.addAttribute("paramVO", boRtngudrefndVO);
// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
Map<String, Object> content2 = selectBOMpageInfoInqire(vo);

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

@@ -20,13 +20,12 @@ import com.wb.domainserver.domain.gcone.goods.goods.service.BOGoodsService;
import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderService;
import com.wb.domainserver.domain.gcone.goods.purchs.service.BOPurchsService;
import com.wb.domainserver.domain.gcone.goods.purchs.vo.*;
import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO;
import com.wb.domainserver.domain.gcone.ordr.dlivy.service.BODlivyService;
import com.wb.domainserver.domain.gcone.ordr.npay.service.BONpayConfigService;
import com.wb.domainserver.domain.gcone.ordr.npay.vo.BONpayConfigVO;
import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrderCommonService;
import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrLogService;
import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService;
import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOCrmDlvylcVO;
@@ -37,9 +36,14 @@ import com.wb.domainserver.domain.gcone.promtn.coupon.service.BOCouponService;
import com.wb.domainserver.domain.gcone.setup.dlvygrp.service.BODlvygrpService;
import com.wb.domainserver.domain.gcone.setup.nbkk.service.BONbkkService;
import com.wb.domainserver.domain.gcone.setup.site.vo.BOSiteVO;
import com.wb.domainserver.domain.sample.vo.PrevewVO;
import com.wb.domainserver.domain.sopmal.goods.vo.GoodsVO;
import com.wb.domainserver.domain.sopmal.ordr.vo.OrdrVO;
import com.wb.domainserver.domain.sopmal.ordr.vo.PayVO;
import com.wb.domainserver.domain.sopmal.ordr.vo.SpbkVO;
import com.wb.domainserver.exception.WnbtRestException;
import com.wb.domainserver.exception.code.PurchsValidCode;
import com.wb.domainserver.response.ApiResponse;
import com.wb.domainserver.response.WnbtResponse;
import com.wb.domainserver.response.WnbtResponseBody;
import com.wb.domainserver.response.WnbtWebClientResponseHandler;
@@ -47,6 +51,9 @@ import com.wb.domainserver.security.authentication.AnonymousUser;
import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
import com.wb.domainserver.security.authorization.annotation.Policy;
import com.wb.domainserver.util.CookieUtils;
import com.wb.domainserver.util.communicate.RESRC;
import com.wb.domainserver.util.communicate.ReplyFromResrc;
import com.wb.domainserver.util.communicate.SendToResrc;
import com.wb.domainserver.util.cookie.CookieUtil;
import com.wb.domainserver.util.dataaccess.DataMap;
@@ -58,6 +65,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Base64Util;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -66,10 +74,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -131,8 +136,6 @@ public class OrdrController {
private BOMaMtngService boMaMtngService;
@Autowired
private BOPurchsService boPurchsService;
@Autowired
private BOSubsvcService subsvcService;
/* ####################################
사용자 > 상품 > 구매/결제 > 회원구매하기 시작
@@ -396,134 +399,6 @@ public class OrdrController {
// );
}
/* ####################################
사용자 > 구독상품 > 구매/결제 > 회원구매하기 시작
#################################### */
/**
* 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 구독서비스 결제 화면 이동
* @return SubsvcPurchsC.jsp
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectSubsvcPurchsForm")
public String selectSubsvcSetleInqire(HttpServletRequest request, ModelMap model, BOOrdrVO ordrVO) throws Exception {
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
//결재 플랫폼 구분 코드
ordrVO.setSetlePltfomTyCd("PC".equals(request.getAttribute("env"))?"01":"02");
//약관정보 세팅
BOStplatVO stplatVO = new BOStplatVO();
stplatVO.setPageIndex(1);
stplatVO.setPageUnit(paginationProperties.getPageUnit());
stplatVO.setNmbrPurchsAt("Y");
stplatVO.setSrchSopmalCd(user.getSopmalCd());
DataMap stplat = selectBOStplatListInqire(stplatVO);
//주문 상품정보 세팅
if ("01".equals(user.getSysDvCd())) {
ordrVO.setSopmalCd(user.getSopmalCd());
}
ordrVO.setMbrInnb(user.getUserInnb());
ordrVO.setMbrId(user.getMbrId());
ordrVO.setMbrDvCd(user.getMbrDvCd());
Map<String, Object> content = service.selectSubsvcPurchs(ordrVO);
model.addAttribute("data", content);
model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrVO));
model.addAttribute("deviceType", Util.getDeviceType(request));
model.addAttribute("stplat", stplat);
return Util.getDeviceType(request) + "/ordr/SubsvcPurchsC";
}
/**
* 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 구독서비스 조회
* @param param
* @return ResponseEntity<WnbtResponse>
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectOrderSubsvcOne", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectOrderSubsvcOne(@RequestBody HashMap<String, Object> param) {
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
BOSubsvcVO subsvcVO = new BOSubsvcVO();
if ("01".equals(user.getSysDvCd())) {
subsvcVO.setSopmalCd(user.getSopmalCd());
}
subsvcVO.setSubsvcInnb(String.valueOf(param.get("subsvcInnb")));
DataMap content = subsvcService.selectBOSubsvcDetail(subsvcVO);
return ResponseEntity.ok(
WnbtResponse.builder()
.resBody(new WnbtResponseBody(content))
.build()
);
}
/**
* 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 결제 예정금액 조회
* @param param
* @return ResponseEntity<WnbtResponse>
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectSubsvcSetleExpectAmt", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectSubsvcSetleExpectAmt(HttpServletRequest request, @RequestBody HashMap<String, Object> param) {
String sesionId ="";
Cookie[] cookies = request.getCookies();
if(cookies != null){
for(Cookie cookie : cookies ){
if(cookie.getName().equals("JSESSIONID")){
sesionId = cookie.getValue();
param.put("sesionId", sesionId);
break;
}
}
}
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if ("01".equals(user.getSysDvCd())) {
param.put("sopmalCd", user.getSopmalCd());
param.put("mbrDvCd", user.getMbrDvCd());
param.put("mbrInnb", user.getUserInnb());
}
Map<String, Object> content = new HashMap<>();
try {
DataMap datamap = new DataMap();
param.entrySet().forEach(map -> {
datamap.put(map.getKey(), map.getValue());
});
content = service.selectSubsvcSetleExpectAmt(datamap);
} catch (WnbtRestException wre) {
log.debug("결제예정금액 ordr wre");
log.error(wre.getMessage(), wre);
content = new HashMap<>() {{
put("status", "1");
put("message", wre.getMessage());
put("mlgMxmmUseAmt", wre.getCode());
}};
} catch (Exception e) {
log.debug("결제예정금액 ordr e");
log.error(e.getMessage(), e);
content = new HashMap<>() {{
put("status", "1");
put("message", "예기치 못한 오류가 발생하였습니다.\n관리자에게 문의하시기 바랍니다.");
}};
}
return ResponseEntity.ok(
WnbtResponse.builder()
.resBody(new WnbtResponseBody(content))
.build()
);
// return responseHandler.handleResponse(
// sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOSetleExpectAmt", param),
// ReplyFromResrc::getReply
// );
}
/**
* 관리자 주문 > 브랜드페이 > 토큰발급
@@ -3134,7 +3009,13 @@ public class OrdrController {
return content;
}
} else {
// 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크
// if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
// log.info("배송지 정보를 찾을 수 없습니다.");
// content.put("result","Y");
// content.put("message", "배송지 정보를 찾을 수 없습니다.");
// // throw new WnbtRestException("주문유형 정보를 찾을 수 없습니다.");
// return content;
// }
if (CollectionUtils.isEmpty(shipping)) {
log.info("배송지 정보를 찾을 수 없습니다.");
content.put("result","Y");
@@ -3171,6 +3052,70 @@ public class OrdrController {
String[] receptMbtlnbArray = null; // 배송지 받는이 휴대폰번호
if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
// if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {
//
// // 배송지 리스트
// List<LinkedHashMap<String, Object>> dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylc.get("dlvylc");
//
// /** ----------------------------------------------- 배송지별 주문 상품 수량 검사 START ----------------------------------------------- */
// content = checkDistributedQyMatchesOrder(goodsList, dlvylcListMulti);
// if (!"0".equals(content.get("status"))) {
// return content;
// }
// /** ----------------------------------------------- 배송지별 주문 상품 수량 검사 END ----------------------------------------------- */
//
// // 부정판매 체크를 위한 배송지 정렬
// if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
//
// boolean hasInvalidAddress = dlvylcListMulti.stream().anyMatch(map -> {
// String dlvylcZip = StringUtil.isNullToString(map.get("dlvylcZip"));
// String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
// String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
// String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
// String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
//
// return StringUtil.isEmpty(dlvylcZip)
// || StringUtil.isEmpty(adresDvCd)
// || ("01".equals(adresDvCd) && StringUtil.isEmpty(dlvylcRnmAdres))
// || ("02".equals(adresDvCd) && StringUtil.isEmpty(dlvylcLnbAdres))
// || StringUtil.isEmpty(adresDtl);
// });
//
// if (hasInvalidAddress) {
// content.put("result","Y");
// content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
// return content;
// }
//
// List<String> adresList = dlvylcListMulti.stream()
// .map(map -> {
// String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
// String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
// String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
// String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
// String adresMulti;
// if ("01".equals(adresDvCd)) {
// adresMulti = dlvylcRnmAdres + " " + adresDtl;
// } else {
// adresMulti = dlvylcLnbAdres + " " + adresDtl;
// }
//
// return adresMulti;
// })
// .collect(Collectors.toList());
//
// adresArray = adresList.toArray(new String[0]);
//
// List<String> receptMbtlnbList = dlvylcListMulti.stream()
// .map(map -> {
// return StringUtil.isNullToString(map.get("recpntMbtlnb"));
// })
// .collect(Collectors.toList());
//
// receptMbtlnbArray = receptMbtlnbList.toArray(new String[0]);
//
// }
// }
if (
StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||

2
src/main/resources/application-local.yml
View File

@@ -85,7 +85,7 @@ spring:
show-sql: true
servlet:
multipart:
max-file-size: 15MB
max-file-size: 10MB
max-request-size: -1
mybatis:

2
src/main/resources/application-stage.yml
View File

@@ -85,7 +85,7 @@ spring:
show-sql: true
servlet:
multipart:
max-file-size: 15MB
max-file-size: 10MB
max-request-size: -1
mybatis:

5
src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml
View File

@@ -386,9 +386,7 @@
, ORDR_STTUS_CD
, RECPNT_NM
, RECPNT_MBTLNB
, DLVYLC_AREA_CD
, DLVYLC_ZIP
, PREFCD
, DLVYLC_ADRES_DV_CD
, DLVYLC_LNB_ADRES
, DLVYLC_RNM_ADRES
@@ -424,9 +422,7 @@
, #{ordrSttusCd}
, #{recpntNm}
, HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
, #{dlvylcAreaCd}
, #{dlvylcZip}
, #{prefcd}
, #{dlvylcAdresDvCd}
, #{dlvylcLnbAdres}
, #{dlvylcRnmAdres}
@@ -1284,7 +1280,6 @@ FROM (
ELSE FDA.LNB_ADRES
END ADRES
, FDA.DTL_ADRES
, FDA.CSTMCLER_CD
FROM GC_DELIVERY_ADDRESS FDA
WHERE FDA.MBR_INNB = #{mbrInnb}
AND FDA.MBR_DV_CD = #{mbrDvCd}

60
src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml
View File

@@ -20,7 +20,6 @@
THEN NOW() BETWEEN GS.EXPSR_BGN_DT AND GS.EXPSR_END_DT
ELSE 1=1
END
AND GS.USE_AT = 'Y'
]]>
</select>
@@ -75,61 +74,60 @@
, CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
FROM (
SELECT COUNT(*) OVER() AS TOT_CNT
, GS.SUBSVC_INNB
, GS.SOPMAL_CD
, CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
, GS.SUBSVC_NM
, GS.SUBSVC_GNR
, GS.SUBSVC_GNR_NM
, GS.DLVY_CNT
, GS.INVNTRY_QY
, GS.INVNTRY_QY - GS.USEFUL_INVNTRY_QY AS AVAIL_QT /*가용제고*/
, GS.SUBSVC_STTUS_CD
, FN_GET_COMMCODE_NAME('GOODS_STTUS', GS.SUBSVC_STTUS_CD) AS SUBSVC_STTUS /*구독서비스 상태*/
, FN_GET_COMMCODE_NAME('EXPSR_DV', GS.EXPSR_DV_CD) AS EXPSR_DV /*노출구분*/
, GS.SUBSVC_CT /*구독료*/
, GS.TME_DLVY_AMT /*1회배송비*/
, GS.CNSMRPRIC /*소비자가*/
, GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC /*실판매가=구독료+(1회배송비X배송횟수)*/
, GS.IMG /*섬네일 이미지*/
, GS.LAST_PROCS_ODR /*최종차수*/
FROM GC_SUBSVC GS
WHERE GS.USE_AT = 'Y'
AND GS.SOPMAL_CD = #{sopmalCd}
, GC.SUBSVC_INNB
, GC.SOPMAL_CD
, GC.SUBSVC_NM
, GC.SUBSVC_GNR
, GC.SUBSVC_GNR_NM
, GC.DLVY_CNT
, GC.INVNTRY_QY
, GC.INVNTRY_QY - GC.USEFUL_INVNTRY_QY AS AVAIL_QT /*가용제고*/
, GC.SUBSVC_STTUS_CD
, FN_GET_COMMCODE_NAME('GOODS_STTUS', GC.SUBSVC_STTUS_CD) AS SUBSVC_STTUS /*구독서비스 상태*/
, FN_GET_COMMCODE_NAME('EXPSR_DV', GC.EXPSR_DV_CD) AS EXPSR_DV /*노출구분*/
, GC.SUBSVC_CT /*구독료*/
, GC.TME_DLVY_AMT /*1회배송비*/
, GC.CNSMRPRIC /*소비자가*/
, GC.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC /*실판매가=구독료+(1회배송비X배송횟수)*/
, GC.IMG /*섬네일 이미지*/
, GC.LAST_PROCS_ODR /*최종차수*/
FROM GC_SUBSVC GC
WHERE GC.USE_AT = 'Y'
AND GC.SOPMAL_CD = #{sopmalCd}
<if test="srchSelSubsvcNm != null and srchSelSubsvcNm != ''">
AND GS.SUBSVC_NM = #{srchSelSubsvcNm} /*구독서비스 명*/
AND GC.SUBSVC_NM = #{srchSelSubsvcNm} /*구독서비스 명*/
</if>
<if test="srchSelSubsvcGnr != null and srchSelSubsvcGnr != ''">
AND GS.SUBSVC_GNR = #{srchSelSubsvcGnr} /*기수*/
AND GC.SUBSVC_GNR = #{srchSelSubsvcGnr} /*기수*/
</if>
<if test="srchSubsvcNm != null and srchSubsvcNm != ''">
AND GS.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%') /*구독서비스 명*/
AND GC.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%') /*구독서비스 명*/
</if>
<if test="srchSubsvcGnrNm != null and srchSubsvcGnrNm != ''">
AND GS.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%') /*기수명*/
AND GC.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%') /*기수명*/
</if>
<choose>
<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchArrSubsvcSttusCd)">
/*판매상태*/
AND GS.SUBSVC_STTUS_CD IN
AND GC.SUBSVC_STTUS_CD IN
<foreach collection="srchArrSubsvcSttusCd" item="subsvcSttusCd" open="(" close=")" separator=",">
#{subsvcSttusCd}
</foreach>
</when>
</choose>
<if test="srchExpsrDvCd != null and srchExpsrDvCd != ''">
AND GS.EXPSR_DV_CD = #{srchExpsrDvCd} /*노출여부*/
AND GC.EXPSR_DV_CD = #{srchExpsrDvCd} /*노출여부*/
</if>
ORDER BY
<choose>
<when test="sortDv == 'subsvcGnrAsc'">
GS.SUBSVC_NM ASC, SUBSVC_GNR ASC,
GC.SUBSVC_NM ASC, SUBSVC_GNR ASC,
</when>
<otherwise>
GS.SUBSVC_NM DESC, SUBSVC_GNR DESC,
GC.SUBSVC_NM DESC, SUBSVC_GNR DESC,
</otherwise>
</choose>
GS.SUBSVC_INNB ASC
GC.SUBSVC_INNB ASC
) TB
WHERE (@ROWNUM:=0)=0
) PV

1
src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml
View File

@@ -683,7 +683,6 @@
,FMG.MBR_GRAD_NM -- 회원 등급명
,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(SH.RECPNT_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS RECPNT_MBTLNB
,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(O.ORDRR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS ORDRR_MBTLNB
,FN_GET_COMMCODE_NAME('ORDR_STTUS', SH.ORDR_STTUS_CD) AS ORDR_STTUS_NM
]]>
<include refid="dlivyProcsFrom"/>
<include refid="dlivyProcsWhere"/>

123
src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
View File

@@ -514,10 +514,7 @@
, DATE_FORMAT(FO.ORDR_RCEPT_DT, '%Y-%m-%d %H:%i') AS ORDR_RCEPT_DT -- 주문접수일
, FO.SLE_ENVRN_CD -- 판매환경코드
, FN_GET_COMMCODE_NAME('SLE_ENVRN', FO.SLE_ENVRN_CD) AS SLE_ENVRN_NM
, CASE
WHEN FO.SUBSVC_AT = 'Y' THEN CONCAT(GS.SUBSVC_NM,'(', GS.SUBSVC_GNR_NM, ')')
ELSE FN_GET_ORDER_GOODS_NAME(FO.SOPMAL_CD, FO.ORDR_INNB)
END AS GOODS_NM -- 상품명
, FN_GET_ORDER_GOODS_NAME(FO.SOPMAL_CD, FO.ORDR_INNB) AS GOODS_NM -- 상품명
, FN_GET_ORDER_COUNT(FO.SOPMAL_CD, FO.ORDR_INNB, 'ITEM') AS ITEM_CNT -- 상품 개수
, FN_GET_ORDER_COUNT(FO.SOPMAL_CD, FO.ORDR_INNB, 'ORDER') AS ORDER_CNT -- 상품 종수
, (
@@ -583,7 +580,6 @@
END
)
) BLACK_DV -- 블랙리스트 구분
, FO.SUBSVC_AT
FROM GC_ORDER FO
LEFT JOIN LATERAL (
SELECT FM.MBR_INNB
@@ -604,9 +600,6 @@
LEFT JOIN GC_ORDER_SETLE FOS -- LEFT 로 다시 변경
ON FOS.SOPMAL_CD = FO.SOPMAL_CD
AND FOS.ORDR_INNB = FO.ORDR_INNB
LEFT JOIN GC_SUBSVC GS
ON GS.SOPMAL_CD = FO.SOPMAL_CD
AND GS.SUBSVC_INNB = FO.SUBSVC_INNB
WHERE FO.USE_AT = 'Y'
/*AND FO.SUBSVC_AT = 'N'*/
AND FOS.ORDR_INNB IS NOT NULL -- GC_ORDER_SETLE 에 데이터가 있을 때 조건
@@ -1003,7 +996,6 @@
, IFNULL(FOI.MLG_AMT, 0) AS MLG_AMT
, IFNULL(FOS.DLVY_AMT, 0) AS DLVY_AMT
, IFNULL(FO.RL_SETLE_AMT, 0) AS SETLE_AMT
, ROUND(FO.WON_RL_SETLE_AMT) AS WON_RL_SETLE_AMT
FROM (
SELECT FOI.SOPMAL_CD
, FOI.ORDR_INNB
@@ -1104,7 +1096,6 @@
, FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ordr_ty_nm
, FOI.optn_cd_1
, FOSH.dlvy_mssage_cn
, FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS shipping_sttus_nm
FROM GC_ORDER FO
INNER JOIN LATERAL (
SELECT GOI.SOPMAL_CD
@@ -1491,13 +1482,6 @@
END AS SALES_POSBLE_REGIST_AT /* 현금영수증 신청 가능 여부 */
, IF(FO.SMRT_SHOPNG_ORDRNB IS NOT NULL AND FO.SMRT_SHOPNG_ORDRNB != '0', FO.SMRT_SHOPNG_ORDRNB, NULL) AS SMRT_SHOPNG_ORDRNB
, CONCAT(SP.SOPMAL_NM, ' ', STR.STR_NM) AS STR_NM
, (SELECT MAX(CAST(GOR.ORDER_REFUND_INNB AS CHAR))
FROM GC_ORDER_REFUND GOR
WHERE GOR.SOPMAL_CD = FO.SOPMAL_CD
AND GOR.ORDR_INNB = FO.ORDR_INNB
AND GOR.USE_AT = 'Y'
AND GOR.REFUND_PROCS_STTUS_CD = '03' /*처리상태:환불완료*/) AS ORDER_RE_INNB
, FO.SUBSVC_AT
FROM GC_ORDER FO
INNER JOIN (
SELECT FOI.SOPMAL_CD
@@ -1666,10 +1650,8 @@
, REFUND_ACNT_DPSTR_NM
, REFUND_ACNTNB
, REFUND_AMT
, WON_REFUND_AMT
, REFUND_ACCMLMNY_AMT
, REFUND_DLVY_AMT
, WON_REFUND_DLVY_AMT
, MLG_ACCMLMNY_AMT
, MLG_ACCMLMNY_VALID_DT
, ENURI_REVISN_AMT
@@ -1695,7 +1677,6 @@
, RETURN_CSTMR_TELNB
, RETURN_CSTMR_MBTLNB
, RETURN_DLVY_AMT
, WON_RETURN_DLVY_AMT
, RETURN_DLVY_TRGET_CD
, RETURN_DLVY_RSPNSBL_CD
, RETURN_DLVY_PYMNT_TY_CD
@@ -1733,10 +1714,8 @@
, #{refundAcntDpstrNm}
, REPLACE(#{refundAcntnb}, '-', '')
, #{refundAmt}
, #{wonRefundAmt}
, #{refundAccmlmnyAmt}
, #{refundDlvyAmt}
, #{wonRefundDlvyAmt}
, #{mlgAccmlmnyAmt}
, #{mlgAccmlmnyValidDt}
, #{enuriRevisnAmt}
@@ -1762,7 +1741,6 @@
, HEX(AES_ENCRYPT(REPLACE(#{returnCstmrTelnb}, '-', ''), '1df5be2f7e90ae36'))
, HEX(AES_ENCRYPT(REPLACE(#{returnCstmrMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
, #{returnDlvyAmt}
, #{wonReturnDlvyAmt}
, #{returnDlvyTrgetCd}
, #{returnDlvyRspnsblCd}
, #{returnDlvyPymntTyCd}
@@ -2014,71 +1992,6 @@
ORDER BY FOS.ORDR_DLVY_INNB ASC
</select>
<!-- 배송지정보 목록 조회 그룹 -->
<select id="selectOrderShippingListGrp" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO" resultType="dataMap">
SELECT SOPMAL_CD, ORDR_INNB, RECPNT_NM, RECPNT_TELNB, RECPNT_MBTLNB, DLVYLC_ZIP, DLVYLC_ADRES_DV_CD, ADRES, DLVYLC_RNM_ADRES, DLVYLC_LNB_ADRES, DLVYLC_ADRES_DTL, DLVY_MSSAGE_CN, GIFT_MSSAGE_CN, GIFT_STTUS_CD, GIFT_STTUS_CD_NM, ORDR_STTUS_CD, ORDR_STTUS_NM, FREE_DLVY_CND_AMT, DFT_DLVY_AMT
FROM (
SELECT FOS.SOPMAL_CD
, FOS.ORDR_INNB
, FOS.ORDR_DLVY_INNB
, FOS.RECPNT_NM
, CASE
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 11 THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 8, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)) LIKE '02%' THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)) NOT LIKE '02%' THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 9 THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 6, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 8 THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 5, 4))
ELSE
CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))
END AS RECPNT_TELNB
, CASE
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 11 THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 8, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)) LIKE '02%' THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)) NOT LIKE '02%' THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 9 THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 6, 4))
WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 8 THEN
CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 5, 4))
ELSE
CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))
END AS RECPNT_MBTLNB
, FOS.DLVYLC_ZIP
, FOS.DLVYLC_ADRES_DV_CD
, CASE WHEN FOS.DLVYLC_ADRES_DV_CD = '01'
THEN FOS.DLVYLC_RNM_ADRES
ELSE FOS.DLVYLC_LNB_ADRES
END ADRES
, FOS.DLVYLC_RNM_ADRES
, FOS.DLVYLC_LNB_ADRES
, FOS.DLVYLC_ADRES_DTL
, FOS.DLVY_MSSAGE_CN
, FOS.GIFT_MSSAGE_CN
, FOS.GIFT_STTUS_CD
, FN_GET_COMMCODE_NAME('GIFT_STTUS', FOS.GIFT_STTUS_CD) AS GIFT_STTUS_CD_NM
, FOS.ORDR_STTUS_CD
, FN_GET_COMMCODE_NAME('ORDR_STTUS', FOS.ORDR_STTUS_CD) AS ORDR_STTUS_NM
, ROUND(FOS.RL_DLVY_AMT) AS RL_DLVY_AMT
, ROUND(FOS.FREE_DLVY_CND_AMT) AS FREE_DLVY_CND_AMT
, ROUND(FOS.DFT_DLVY_AMT) AS DFT_DLVY_AMT
FROM GC_ORDER_SHIPPING FOS
WHERE FOS.SOPMAL_CD = #{sopmalCd}
AND FOS.ORDR_INNB = #{ordrInnb}
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(ordrDlvyInnb)">
AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
</if>
ORDER BY FOS.ORDR_DLVY_INNB ASC
) AA
GROUP BY SOPMAL_CD, ORDR_INNB, RECPNT_NM, RECPNT_TELNB, RECPNT_MBTLNB, DLVYLC_ZIP, DLVYLC_ADRES_DV_CD, ADRES, DLVYLC_RNM_ADRES, DLVYLC_LNB_ADRES, DLVYLC_ADRES_DTL, DLVY_MSSAGE_CN, GIFT_MSSAGE_CN, GIFT_STTUS_CD, GIFT_STTUS_CD_NM, ORDR_STTUS_CD, ORDR_STTUS_NM, FREE_DLVY_CND_AMT, DFT_DLVY_AMT
</select>
<!-- 배송지별 상품 목록 조회 -->
<select id="selectOrderShippingGoodsList" parameterType="dataMap" resultType="dataMap">
<![CDATA[
@@ -2320,16 +2233,6 @@
]]>
</select>
<!-- 배송지정보 일치여부 확인 -->
<select id="selectDlvylcAreaCdInfo" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO">
SELECT COUNT(*) AS CNT
FROM GC_ORDER_SHIPPING GOS
WHERE GOS.SOPMAL_CD = #{sopmalCd}
AND GOS.ORDR_INNB = #{ordrInnb}
AND GOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
AND GOS.DLVYLC_AREA_CD = #{dlvylcAreaCd}
</select>
<!-- 배송지정보 수정 -->
<update id="updateDlvylcInfo" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO">
UPDATE GC_ORDER_SHIPPING FOS
@@ -2361,7 +2264,6 @@
WHERE FOS.SOPMAL_CD = #{sopmalCd}
AND FOS.ORDR_INNB = #{ordrInnb}
AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
AND FOS.DLVYLC_AREA_CD = #{dlvylcAreaCd}
</update>
<!-- 주문메모 목록 조회 -->
@@ -2519,7 +2421,6 @@
WHEN FOS.PG_CMPNY_NM = 'kcp' THEN GPL.KCP_MID
ELSE GPL.OLD_TOSS_MID
END AS MID
, ROUND(FOS.WON_SETLE_AMT) AS WON_SETLE_AMT
FROM GC_ORDER_SETLE FOS
INNER JOIN GC_PAY_LINK GPL
ON FOS.SOPMAL_CD = GPL.SOPMAL_CD
@@ -5387,14 +5288,7 @@
<!-- 사용자 > 마이페이지 > 구독서비스 주문/배송 목록 조회 -->
<select id="selectMbrSubsvcOrdrList" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO" resultType="dataMap">
<![CDATA[
SELECT PV.*
, (SELECT MAX('구독취소')
FROM GC_ORDER_REFUND GOR
WHERE GOR.SOPMAL_CD = PV.SOPMAL_CD
AND GOR.ORDR_INNB = PV.ORDR_INNB
AND GOR.USE_AT = 'Y'
AND GOR.REFUND_PROCS_STTUS_CD = '03' /*처리상태:환불완료*/
AND GOR.REFUND_TY_CD != '01' /*환불구분:결제취소가 아님*/) AS REFUND_STTUS_NM
SELECT *
FROM (
SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
, TB.*
@@ -5524,7 +5418,7 @@
AND FOS.ORDR_INNB = FO.ORDR_INNB
WHERE FO.USE_AT = 'Y'
AND FO.SUBSVC_AT = 'Y' /*구독서비스*/
AND FO.ORDR_STTUS_CD BETWEEN '15' AND '95'
AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
AND FO.SOPMAL_CD = #{sopmalCd}
AND FO.MBR_DV_CD = #{mbrDvCd}
AND FO.MBR_INNB = #{mbrInnb}
@@ -5532,6 +5426,12 @@
) TB
WHERE (@rownum:=0) = 0
]]>
<include refid="mbrOrdrSubsvcListWhere"/>
) PV
LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
</select>
<sql id="mbrOrdrSubsvcListWhere">
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
AND (
TB.ORDR_INNB LIKE CONCAT('%', #{srchwrd}, '%') OR
@@ -5541,9 +5441,8 @@
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnDt) and @com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endDt)">
AND TB.ORDR_RCEPT_DT BETWEEN DATE(#{bgnDt}) AND DATE(#{endDt}) + 1
</if>
) PV
LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
</select>
</sql>
</mapper>

43
src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml
View File

@@ -326,11 +326,12 @@
<sql id="mbrRefundListWhere">
<![CDATA[
WHERE 1=1
]]>
<![CDATA[
AND RE.SOPMAL_CD = #{sopmalCd}
AND O.MBR_DV_CD = #{mbrDvCd}
AND O.MBR_INNB = #{mbrInnb}
AND RE.USE_AT = 'Y'
AND RE.REFUND_PROCS_STTUS_CD = '03' /*환불완료*/
]]>
<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
AND (
@@ -363,7 +364,6 @@
INNER JOIN GC_ORDER O
ON RE.SOPMAL_CD = O.SOPMAL_CD -- 쇼핑몰 코드
AND RE.ORDR_INNB = O.ORDR_INNB -- 주문 고유번호
AND O.SUBSVC_AT = 'N' /*구독상품 제외*/
]]>
</sql>
@@ -842,7 +842,7 @@
CASE
WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
CASE
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.RETURN_DLVY_AMT, 0), 0)
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0)
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
END
ELSE
@@ -854,42 +854,6 @@
END + (REI.REFUND_MLG_AMT + REI.REFUND_MLG_RMNDR_AMT) + (REI.REFUND_CASH_AMT + REI.REFUND_CASH_RMNDR_AMT)))
, 0) AS RL_REFUND_AMT -- 마일리지, 배송비 제외한 실 환불 금액
, IFNULL(
ROUND(CASE
WHEN RE.REFUND_TY_CD = '01' THEN RE.REFUND_AMT + RE.REFUND_DLVY_AMT
WHEN RE.REFUND_TY_CD = '02' THEN
CASE
WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
CASE
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.RETURN_DLVY_AMT, 0), 0)
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
END
ELSE
CASE
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.REFUND_AMT
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
END
END
END)
, 0) AS REAL_REFUND_AMT -- 마일리지, 쿠폰, 캐시를 제외한 실 환불 금액
, IFNULL(
ROUND(CASE
WHEN RE.REFUND_TY_CD = '01' THEN RE.WON_REFUND_AMT + RE.WON_REFUND_DLVY_AMT
WHEN RE.REFUND_TY_CD = '02' THEN
CASE
WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
CASE
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.WON_REFUND_AMT - IFNULL(RE.WON_RETURN_DLVY_AMT, 0), 0)
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
END
ELSE
CASE
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.WON_REFUND_AMT
WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
END
END
END)
, 0) AS REAL_WON_REFUND_AMT -- 마일리지, 쿠폰, 캐시를 제외한 실 환불 금액
, IFNULL(
ROUND((CASE
WHEN RE.REFUND_TY_CD = '01' THEN 0
WHEN RE.REFUND_TY_CD = '02' THEN
@@ -909,7 +873,6 @@
))
, 0) AS RL_DLVY_AMT_REFUND_AMT -- 반품 배송비
, FN_GET_COMMCODE_NAME('SETLE_MTH', ST.SETLE_TY_CD) AS SETLE_TY_CD_NM
, ROUND(ST.WON_SETLE_AMT) AS WON_SETLE_AMT
FROM (SELECT REI.SOPMAL_CD
, REI.ORDER_REFUND_INNB
, ROUND(SUM(REI.GOODS_REFUND_AMT)) AS REFUND_AMT -- * REI.REFUND_QY

1
src/main/resources/secured-config.yml
View File

@@ -10,7 +10,6 @@ secured:
- /sopmal/mpage/bnef/**
- /sopmal/mpage/mbr/**
- /sopmal/bnft/**
- /sopmal/ordr/**
admin:
anonmymous:
# 로그인 없이 접근가능한 uri없음

18
src/main/resources/static/js/dlvylc/dlvylc.js
View File

@@ -39,20 +39,6 @@ const fn_save_dftDlvylcAt = function (msg, adbkInnb) {
});
}
}
/**********************************************
리턴 formId 세팅
***********************************************/
let formIdSave;
const fn_set_formId = function (formId) {
if (formId !== ''){
formIdSave = formId;
} else {
formId = formIdSave;
}
return formId;
}
/**********************************************
배송지 관리 팝업 ()
***********************************************/
@@ -60,9 +46,7 @@ const fn_move_dlvylc_manage_pop = function (pageIndex,callback, formId = '') {
if (callback == undefined) {
callback = 'fn_set_dlvylc';
}
formId = fn_set_formId(formId);
console.log("배송지 관리 팝업 : ", formId);
$.ajax({
type: 'post',
url: '/sopmal/mpage/mbr/selectDlvylcManagePopup',
@@ -93,9 +77,7 @@ const fn_move_dlvylc_manage_full = function (pageIndex, callback, formId = '') {
if (callback == undefined) {
callback = 'fn_set_dlvylc';
}
formId = fn_set_formId(formId);
console.log("모바일 배송지 팝업 formId : ", formId);
$.ajax({
type: 'post',
url: '/sopmal/mpage/mbr/selectDlvylcManagePopup',

16
src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js
View File

@@ -72,20 +72,6 @@ const fn_select_recentDlvylcList = function (pageIndex, ordering) {
}
});
}
/**********************************************
리턴 formId 세팅
***********************************************/
let formIdSave;
const fn_set_formId = function (formId) {
if (formId !== ''){
formIdSave = formId;
} else {
formId = formIdSave;
}
return formId;
}
/**********************************************
배송지 관리 팝업 (처음 호출 할 때)
***********************************************/
@@ -96,8 +82,6 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
if (callback == undefined) {
callback = fn_set_dlvylc;
}
formId = fn_set_formId(formId);
$.ajax({
type: 'post',
url: '/crm/dlvylc/selectRpuseDlvylcListInqire',

16
src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js
View File

@@ -72,20 +72,6 @@ const fn_select_recentDlvylcList = function (pageIndex, ordering) {
}
});
}
/**********************************************
리턴 formId 세팅
***********************************************/
let formIdSave;
const fn_set_formId = function (formId) {
if (formId !== ''){
formIdSave = formId;
} else {
formId = formIdSave;
}
return formId;
}
/**********************************************
배송지 관리 팝업 (처음 호출 할 때)
***********************************************/
@@ -96,8 +82,6 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
if (callback == undefined) {
callback = fn_set_dlvylc;
}
formId = fn_set_formId(formId);
$.ajax({
type: 'post',
url: '/crm/dlvylc/selectRpuseDlvylcListInqire',

4
src/main/webapp/WEB-INF/views/comm/crm/Include.jsp
View File

@@ -48,8 +48,8 @@
<script src="<c:url value='/mngr/vendor/time-picker/timepicker.min.js'/>"></script>
<script src="<c:url value='/mngr/vendor/dropzone/dropzone.min.js'/>"></script>
<script src="<c:url value='/crm/js/script.js'/>" defer></script>
<script src="<c:url value='/js/mngr/gcone.js'/>"></script>
<script src="<c:url value='/js/mngr/fileupload_comm.js'/>"></script>
<script src="<c:url value='/js/gcone.js'/>"></script>
<script src="<c:url value='/js/fileupload_comm.js'/>"></script>
<script src="<c:url value='/ckeditor/ckeditor.js'/>"></script>
<script src="<c:url value='/mngr/vendor/chart.js/chart.umd.min.js'/>"></script>
<script src="<c:url value='/admin/vendor/jstree/jstree.min.js'/>"></script>

20
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp
View File

@@ -192,9 +192,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -319,9 +319,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -369,9 +369,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -409,9 +409,9 @@
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -482,8 +482,8 @@
// fn_move_dtlupdt(parsedResult.dlivyInnb);
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}

19
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp
View File

@@ -612,9 +612,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -643,9 +643,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -663,9 +663,9 @@
if (data.resBody != null) {}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -693,9 +693,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -1570,8 +1570,7 @@
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message)
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
}
});
}

3
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp
View File

@@ -114,7 +114,8 @@
</div>
<div class="sendOut-info__info-name">
<a href="" class="blue-6 fw-500"><c:out value="${ exList.ordrrNm }"/></a>
<br><span> [<c:out value="${exList.ordrSttusNm}"/>]</span>
<span style="font-size: 10px;" class="stone-7">▶</span>
<span><c:out value="${ exList.recpntNm }"/>님에게 1번째</span>
</div>
<div>
<p class="sendOut-info__info-address">(<c:out value="${ exList.dlvylcZip }"/>)

9
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp
View File

@@ -179,15 +179,6 @@
</span>
</label>
</c:if>
<c:if test="${ cdList.cd eq 50 }">
<label class="b-checkbox checkbox">
<input type="checkbox" value="<c:out value="${ cdList.cd }"/>" name="srchOrdrSttusCds">
<span class="check"></span>
<span class="control-label">
<span class="order-status-badge export"><c:out value="${ cdList.cdNm }"/></span>
</span>
</label>
</c:if>
<c:if test="${ cdList.cd eq 60 }">
<label class="b-checkbox checkbox">
<input type="checkbox" value="<c:out value="${ cdList.cd }"/>" name="srchOrdrSttusCds">

49
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp
View File

@@ -215,21 +215,31 @@
return false;
}
const checkedRows = $('input.dlivyCk:checked').closest('tr');
let checkedRowTd = null;
let rowTdClass = null;
let data = [];
checkedRows.each(function(index) {
const currentRow = $(this);
const nextRow = currentRow.next('tr');
checkedRowTd = currentRow.find('td').eq(1);
rowTdClass = checkedRowTd.find('button').attr('class');
if (rowTdClass && rowTdClass.includes('closed')) {
let tempRow = nextRow.next(); // 'nextRow'는 제외하고 그 다음 'tr'부터 시작
if (rowTdClass && rowTdClass.includes('closed')) {
let tempRow = nextRow.next(); // 'nextRow'는 제외하고 그 다음 'tr'부터 시작
while (tempRow.length && !tempRow.hasClass('sendOut-info__first')) {
const inputs = tempRow.find('input[name], select[name]');
let rowData = {};
@@ -237,24 +247,39 @@
inputs.each(function () {
const input = $(this);
rowData[input.attr('name')] = input.val();
fn_create_input_popup('hidden', 'dlivyUpdtVOList[' + index + '].'+(input.attr('name').split('.')[1]), input.val(), hiddenForm);
fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
});
data.push(rowData);
tempRow = tempRow.next(); // 다음 'tr'로 이동
}
} else {
const inputs = currentRow.find('input[name], select[name]').add(nextRow.find('input[name], select[name]'));
let rowData = {};
inputs.each(function() {
const input = $(this);
rowData[input.attr('name')] = input.val();
fn_create_input_popup('hidden', 'dlivyUpdtVOList[' + index + '].'+(input.attr('name').split('.')[1]), input.val(), hiddenForm);
// fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
});
data.push(rowData);
}
});
fn_create_input_popup('hidden', 'dlivyDt', dlivyRegistDate, hiddenForm);
@@ -262,6 +287,11 @@
const hiddenData = $('#hiddenForm').serializeArray();
if (isChecked()) {
if (confirm('해당 주문을 출고처리 하시겠습니까?')) {
$.ajax({
@@ -898,8 +928,7 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
}
});
}
@@ -1011,8 +1040,7 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
}
});
}
@@ -1103,8 +1131,7 @@
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
}
});
}

8
src/main/webapp/WEB-INF/views/mngr/ordr/indvdlSetle/IndvdlSetleListInqireRForm.jsp
View File

@@ -251,9 +251,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -284,9 +284,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}

47
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
View File

@@ -602,7 +602,7 @@
const paginationInfo = result.paginationInfo;
if (allOrdrList == null) {
$('#orderList').append('<tr class="row"><td class="center" colspan="14">검색어가 없거나 검색 결과가 없습니다.</td>');
$('#orderList').append('<tr class="row"><td class="center" colspan="15">검색어가 없거나 검색 결과가 없습니다.</td>');
} else {
let rowNum = paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1) * paginationInfo.recordCountPerPage) + 1;
@@ -636,9 +636,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -666,9 +666,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -686,9 +686,9 @@
if (data.resBody != null) {}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -718,9 +718,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -736,7 +736,7 @@
let header = '';
header += '<tr class="row order-section__header ' + ordrSttus + '" id="' + currTr + '-header">';
header += ' <td colspan="14">';
header += ' <td colspan="15">';
header += ' <div class="form-control-container">';
header += ' <div class="left">';
header += ' <div class="select-box">';
@@ -755,7 +755,7 @@
/* header += ' <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
}
if ('35' === data.ordrSttusCd || '50' === data.ordrSttusCd || '60' === data.ordrSttusCd || '70' === data.ordrSttusCd) {
if ('35' === data.ordrSttusCd) {
header += ' <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + data.ordrSttusCd + '">출고처리</button>';
/* header += ' <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
}
@@ -850,13 +850,16 @@
tr += ' <td>' + (rowNum - 1) + '</td>';
tr += ' <td>';
/** 구독서비스 여부 (구독/일반)*/
if (data.subsvcAt == 'Y'){
tr += '구독';
if (!fn_is_empty(data.inflowCoursUrl)) {
tr += ' <a href="' + data.inflowCoursUrl + '" target="_blank">';
tr += ' <span class="blue-8 fw-500" title="' + data.inflowCoursUrl + '">' + (data.inflowCoursNm).substring(0, 1); + '</span></td>';
tr += ' </a>';
} else {
tr += '일반';
tr += ' <span class="blue-8 fw-500" title="' + data.inflowCoursUrl + '">' + (data.inflowCoursNm).substring(0, 1); + '</span></td>';
}
tr += ' </td>';
tr += ' <td><span class="blue-8 fw-500" title="' + data.sopmalNm + '">' + (data.sopmalNm).substring(0, 1) + '</span></td>';
tr += ' <td>' + data.ordrRceptDt + '</td>';
tr += ' <td>' + fn_nvl(data.sleEnvrnNm, '') + '</td>';
tr += ' <td class="left">';
@@ -990,7 +993,7 @@
let detail = '';
detail += '<tr class="row order-section__detail' + ' ordr-innb-detail-' + ordrInnb + '">';
detail += ' <td colspan="14">';
detail += ' <td colspan="15">';
detail += ' <div class="order-section__detail-inner">';
detail += ' <h5 class="order-section__detail-title">주문상품</h5>';
detail += ' <div class="table-wrapper">';
@@ -1328,7 +1331,7 @@
let footer = '';
footer += '<tr class="row order-section__footer">';
footer += ' <td colspan="14">';
footer += ' <td colspan="15">';
footer += ' <div class="form-control-container">';
footer += ' <div class="left">';
footer += ' <div class="select-box">';
@@ -1347,8 +1350,8 @@
/* footer += ' <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
}
if ('35' === prevOrderSttusCd || '50' === prevOrderSttusCd || '60' === data.prevOrderSttusCd || '70' === data.prevOrderSttusCd) {
footer += ' <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + prevOrderSttusCd + '">출고처리</button>';
if ('35' === prevOrderSttusCd) {
footer += ' <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + data.ordrSttusCd + '">출고처리</button>';
/* footer += ' <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
}
footer += ' <button type="button" class="btn-order-print-' + data.ordrSttusCd + ' btn outline xsm fs-13"><i class="icon icon_print"></i>프린트</button>';
@@ -2184,6 +2187,7 @@
<col style="width: 50px">
<col style="width: 50px">
<col style="width: 50px">
<col style="width: 50px">
<col style="width: 120px">
<col style="width: 50px">
<col style="width: 215px">
@@ -2200,7 +2204,8 @@
<th>선택</th>
<th>중요</th>
<th>번호</th>
<th>주문구분</th>
<th>유입</th>
<th>마켓</th>
<th>주문일시</th>
<th>환경</th>
<th>주문번호</th>
@@ -2215,7 +2220,7 @@
</thead>
<tbody id="orderList">
<tr>
<td colspan="14">
<td colspan="15">
<div class="form-control-container">
<div class="left">
<span class="gray-6">* 블랙리스트는 자사몰은 적색, 물류센터는 녹색으로 표시됩니다.</span>

4
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/DwldItmSetupFormR.jsp
View File

@@ -89,9 +89,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}

16
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/FdrmDlvyRForm.jsp
View File

@@ -586,9 +586,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -613,9 +613,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -633,9 +633,9 @@
if (data.resBody != null) {}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -663,9 +663,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}

16
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/GiftOrdrInqireR.jsp
View File

@@ -586,9 +586,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -613,9 +613,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -633,9 +633,9 @@
if (data.resBody != null) {}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -663,9 +663,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}

31
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
View File

@@ -834,9 +834,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -866,9 +866,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -914,9 +914,9 @@
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -1573,9 +1573,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -1784,7 +1784,10 @@
</c:choose>
<button type="button" class="btn-ordr-sttus-35 btn gray">상품 준비</button>
</c:if>
<c:if test="${'35' <= dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
<c:if test="${'35' eq dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 -->
<a href="javascript:void(0);" id="canclPayment" class="btn outline">결제 취소</a>
</c:if>
<c:if test="${'35' lt dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 출고후 -->
<button type="button" class="btn outline" onclick="fn_refund_regist_popup('#modalDiv', '#setleCanclRefndRegistPopupC', '<c:url value="/mngr/ordr/ordrmngr/selectRtngudRegistPopupForm"/>', '${dtl.ordrInnb}', '${dtl.setleTyCd}', '${dtl.ordrSttusCd}');">반품 신청</button>
</c:if>
</div>
@@ -1819,6 +1822,7 @@
<caption>주문정보</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 60px;">
<col style="width: 60px;">
<col style="width: 10%;">
<col style="width: 120px;">
@@ -1832,7 +1836,8 @@
</colgroup>
<thead>
<tr>
<th>일반/구독</th>
<th>유입</th>
<th>마켓</th>
<th>주문일시</th>
<th>환경</th>
<th>주문번호</th>
@@ -1846,10 +1851,8 @@
</thead>
<tbody>
<tr>
<td><c:choose>
<c:when test="${dtl.subsvcAt eq 'Y'}">구독</c:when>
<c:otherwise>일반</c:otherwise>
</c:choose></td>
<td><span class="blue-8 fw-500" title="${dtl.inflowCoursNm}">${fn:substring(dtl.inflowCoursNm, 0, 1)}</span></td>
<td><span class="blue-8 fw-500" title="${dtl.sopmalNm}">${fn:substring(dtl.sopmalNm, 0, 1)}</span></td>
<td>${dtl.ordrRceptDt}</td>
<td>${dtl.sleEnvrnNm}</td>
<td>

51
src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp
View File

@@ -369,13 +369,13 @@
$('input[name="prosbleCancelAmt"]').on('input', function() {
console.log("엄ㄴ아런밍럼니;아러");
fn_mlg_display_ctrl();
});
function rlRefundAmtProcessing() {
let rlSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.rlSetleAmt}');
let wonSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.wonSetleAmt}');
let refundTyCd = '<c:out value="${ resultMap.result.refnd.refundTyCd }"/>';
let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드
let refundDlvyAmt = '<c:out value="${ resultMap.result.refnd.refundDlvyAmt }"/>'; // 환불 배송비 금액
@@ -523,18 +523,11 @@
rlRefundAmt = rlRefundAmt > 0 ? rlRefundAmt : 0;
$('.rlRefundAmt').text(formatWithComma(rlRefundAmt));
/*엔화 비율을 구해서 한화환불금액 계산*/
console.log("rlRefundAmt:",rlRefundAmt,"rlSetleAmt:",rlSetleAmt,"wonSetleAmt:",wonSetleAmt);
let wonRlRefundAmt = Math.ceil((rlRefundAmt / rlSetleAmt) * wonSetleAmt);
wonRlRefundAmt = wonRlRefundAmt > 0 ? wonRlRefundAmt : 0;
$('.wonRlRefundAmt').text(formatWithComma(wonRlRefundAmt));
}
function rlRefundAmtProcessingInput() {
let rlSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.rlSetleAmt}');
let wonSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.wonSetleAmt}');
let refundTyCd = '<c:out value="${ resultMap.result.refnd.refundTyCd }"/>';
let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드
let refundDlvyAmt = '<c:out value="${ resultMap.result.refnd.refundDlvyAmt }"/>'; // 환불 배송비 금액
@@ -680,13 +673,6 @@
rlRefundAmt = rlRefundAmt > 0 ? rlRefundAmt : 0;
$('.rlRefundAmt').text(formatWithComma(rlRefundAmt));
/*엔화 비율을 구해서 한화환불금액 계산*/
console.log("rlRefundAmt:",rlRefundAmt,"rlSetleAmt:",rlSetleAmt,"wonSetleAmt:",wonSetleAmt);
let wonRlRefundAmt = Math.ceil((rlRefundAmt / rlSetleAmt) * wonSetleAmt);
wonRlRefundAmt = wonRlRefundAmt > 0 ? wonRlRefundAmt : 0;
$('.wonRlRefundAmt').text(formatWithComma(wonRlRefundAmt));
}
$('#returnDlvyPymntTyCd').on('change', function() {
@@ -1184,8 +1170,8 @@
location.reload();
}
}, error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}
@@ -1519,7 +1505,6 @@
<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<div class="content__inner">
<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
<div class="page-title">
@@ -2754,8 +2739,9 @@
<tfoot>
<tr class="tfoot-sum">
<c:set var="reTotAmt" value="${ resultMap.result.totRefundDscntAmt }"/>
<td colspan="2" style="text-align: left;">결제내역</td>
<td colspan="10" class="tfoot-sum__sum table__blue-td text-right">
<td>결제내역</td>
<td colspan="4" class="text-right"></td>
<td colspan="7" class="tfoot-sum__sum table__blue-td text-right">
<c:if test="${ not empty reTotAmt.refundAmtQySum }">
<span class="comma setleAmtGoods">
<c:out value="${ reTotAmt.refundAmtQySum }"/>
@@ -2804,29 +2790,6 @@
</p>
</td>
</tr>
<tr class="tfoot-sum">
<td colspan="2" style="text-align: left">환불내역(원화 기준)</td>
<td colspan="10" class="tfoot-sum__sum table__blue-td text-center">
실결제 금액 :
<span class="comma">
<c:out value="${ reTotAmt.rlSetleAmt }"/>
</span>${curUnit}
/
<span class="comma">
<c:out value="${ reTotAmt.wonSetleAmt }"/>
</span>${krUnit}
|
환불 금액 :
<span class="comma rlRefundAmt">
<c:out value="${ reTotAmt.realRefundAmt }"/>
</span>${curUnit}
/
<span class="comma tfoot-sum__sum-num wonRlRefundAmt">
<c:out value="${ reTotAmt.realWonRefundAmt }"/>
</span>${krUnit}
</td>
</tr>
</tfoot>
</table>
</div>

2
src/main/webapp/WEB-INF/views/mngr/ordr/subsvc/SubsvcOrdrList.jsp
View File

@@ -94,7 +94,7 @@
<c:choose>
<c:when test="${ not empty resultMap.list }">
<c:forEach items="${ resultMap.list }" var="subsvcOrdr" varStatus="status">
<tr<c:if test="${subsvcOrdr.lastProcsOdr > subsvcOrdr.mbrLastProcsOdr}"> class="sendOut-info__reseller"</c:if>>
<tr<c:if test="${lastProcsOdr > mbrLastProcsOdr}"> class="sendOut-info__reseller"</c:if>>
<td>
<label class="b-checkbox checkbox is-medium check-all">
<input type="checkbox" name="arrCheck" class="arrCheck" value="${subsvcOrdr.ordrInnb}@${subsvcOrdr.ordrGoodsInnb}@${subsvcOrdr.ordrGoodsOptnInnb}@${subsvcOrdr.ordrDlvyInnb}">

4
src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponPkRegistC.jsp
View File

@@ -1145,9 +1145,9 @@ since : 2024.01.04 추지훈 최초 생성
}
}
}/*, error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}*/
});
}

11
src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistC.jsp
View File

@@ -343,12 +343,11 @@
</c:choose>
<div class="table-wrapper">
<form id="bbsRegForm">
<%--구독취소 유의사항--%>
<%-- <div class="refund-clause ck-content">--%>
<%-- <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>--%>
<%-- <br><br>--%>
<%-- <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>--%>
<%-- </div>--%>
<div class="refund-clause ck-content">
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
<br><br>
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
</div>
<table class="table write">
<caption>게시글 등록</caption>
<colgroup>

2
src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistPopupC.jsp
View File

@@ -292,13 +292,11 @@
<div class="table-wrapper">
<form id="bbsRegForm">
<input type='hidden' name='bbsTyCd' id='bbsTyCd' value='<c:out value="${bbsInfo.bbsTyCd}"/>'>
<c:if test="${bbsInfo.bbsTyCd eq '12'}">
<div class="refund-clause ck-content">
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
<br><br>
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
</div>
</c:if>
<table class="table write">
<caption>게시글 등록</caption>
<colgroup>

83
src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp
View File

@@ -16,7 +16,6 @@
<head>
<jsp:include page="/WEB-INF/views/comm/Include.jsp"/>
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
</head>
@@ -24,14 +23,12 @@
$(document).ready(function() {
var subsvcInnb = $('#subsvcInnb').val();
fn_select_subsvcDetail(subsvcInnb);
fn_scroll_event();
});
/******************************************************
* 구독서비스 상세 조회
* ****************************************************/
const fn_select_subsvcDetail = function(subsvcInnb) {
var cdnurl = '${cdnurl}';
var curUnit = '${curUnit}';
$.ajax({
@@ -52,23 +49,15 @@
$('#dscntRaito').text(data.dscntRaito + '%');
$('#subsvcDc').html(data.subsvcDc);
$("#fixedImg").attr("src", cdnurl + data.img);
$('#fixedTitle').text(data.subsvcConcatNm);
$('#fixedPrice').text(fn_format_number(data.selpric));
switch (data.subsvcSttusCd) {
case '01':
$('#subscribeBtn').text('구독하기');
$('#subscribeBtn').prop('disabled', false);
$('#fixedButton').text('구독하기');
$('#fixedButton').prop('disabled', false);
break;
case '02':
case '03':
$('#subscribeBtn').text(data.subsvcSttus);
$('#subscribeBtn').prop('disabled', true);
$('#fixedButton').text(data.subsvcSttus);
$('#fixedButton').prop('disabled', true);
break;
default:
break;
@@ -77,53 +66,9 @@
});
}
/******************************************************
* 숫자 자릿점 포메팅
* ****************************************************/
const fn_format_number = function(number) {
return Number(number).toLocaleString();
}
/*************************************************************
탭, 스크롤 이벤트
**************************************************************/
const fn_scroll_event = () => {
function handleTabScroll() {
var scrollTop = $(window).scrollTop();
var fixedTabHeight = 100;
var initialProductDetailTop = $('#subsvcDc').offset().top;
var threshold = initialProductDetailTop - fixedTabHeight;
if (scrollTop > threshold) {
if (!$(".productDetailTab").hasClass("fixed")) {
$(".productDetailTab").addClass("fixed");
$(".fixedProduct").addClass("fixed");
$('#subsvcDc').css("margin-top", 62 + "px");
}
} else {
if ($(".productDetailTab").hasClass("fixed")) {
$(".productDetailTab").removeClass("fixed");
$(".fixedProduct").removeClass("fixed");
$('#subsvcDc').css("margin-top", "");
}
}
}
var debounce = function (func, delay) {
var timer;
return function () {
var context = this,
args = arguments;
clearTimeout(timer);
timer = setTimeout(function () {
func.apply(context, args);
}, delay);
};
};
$(window).scroll(debounce(handleTabScroll, 20));
}
</script>
<style>
.container {
@@ -167,10 +112,6 @@
border: 1px solid #e9ecef;
padding: clamp(12px, 3%, 18px);
}
.productDetailTab.fixed {
height: 100px;
}
</style>
<body>
<%-- 공통 Header --%>
@@ -179,9 +120,9 @@
<main>
<div class="sub-wrapper">
<div class="sub-content">
<form method="post" action="/sopmal/ordr/selectSubsvcPurchsForm">
<form>
<h2 class="subList__title">구독 서비스</h2>
<div class="ck-content" style="border: 1px solid #e9ecef; background-color: #f8f9fB;">
<div class="ck-content" style="border: 1px solid #e9ecef">
<c:out value="${ resultMap.sopmalInfo[0].subsvcGuidanceWords }" escapeXml="false"/>
</div>
<c:choose>
@@ -226,25 +167,7 @@
<span style="display: block; width: 100%; text-align: center; font-size: 32px;">구독 서비스 상품 준비중</span>
</c:otherwise>
</c:choose>
<div class="productDetailTab">
<div class="fixedProduct">
<div class="fixedProduct__left">
<div class="fixedProduct__image">
<img id="fixedImg" alt="상품이미지" onerror="this.src='/pc/images/image_placeholder.png'">
</div>
<div class="fixedProduct__product">
<p id="fixedTitle" class="fixedProduct__title">상품명</p>
<span class="fixedProduct__price">
<span id="fixedPrice" class="comma">상품가격</span>
<span class="priceUnit"></span><span class="priceUnit">${curUnit}</span>
</span>
</div>
</div>
<div class="fixedProduct__right">
<button type="button" id="fixedButton" class="btn theme lg purchsOrdr">구독하기</button>
</div>
</div>
</div>
<div id="subsvcDc" class="ck-content">구독 서비스 상품 설명</div>
</form>
</div>

70
src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp
View File

@@ -40,7 +40,6 @@
**********************************************************/
const fn_init = function () {
fn_get_ordr_dlvy_list(1);
fn_get_subsvc_ordr_dlvy_list(1);
}
/* ********************************************************
@@ -536,32 +535,9 @@
$('#pageDiv').html(html);
},
error:function (request) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
}
});
}
/* 구독서비스 주문/배송 목록 조회 */
const fn_get_subsvc_ordr_dlvy_list = function (index) {
if (!fn_is_empty(index)) {
$('#subsvcPageIndex').val(index);
}
let data = $('#subsvcCondForm').serialize();
$.ajax({
type:'post',
url:'<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireMapge"/>',
data:data,
success:function (html) {
$('#subsvcPageDiv').html(html);
},
error:function (request) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
alert(message.errorMsg);
}
});
}
@@ -587,9 +563,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -615,9 +591,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -635,19 +611,6 @@
$(form).submit();
}
/* 구독서비스 주문상세 이동 */
const fn_go_subsvc_dtl = function (sopmalCd, ordrInnb) {
var form = $('#condForm');
$(form).append($('<input/>', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb}));
$(form).append($('<input/>', {type: 'hidden', name: 'dateRange', id: 'dateRange', value: 'allDays'}));
$(form).attr('method', 'get');
$(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrDtlInqire"/>');
$(form).submit();
}
/* 검색조건 세팅 */
const fn_set_param = function () {
const params = ${paramVO};
@@ -738,9 +701,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -789,9 +752,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -849,9 +812,9 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -969,15 +932,6 @@
<a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrOrdrListInqire">전체보기</a>
</div>
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">최근 주문 (구독서비스)</h3>
<form id="subsvcCondForm">
<input type="hidden" name="pageIndex" id="subsvcPageIndex" value="1">
</form>
<div id="subsvcPageDiv"></div>
<a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm">전체보기</a>
</div>
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">위시리스트</h3>
<c:choose>

4
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/IndvdlSetleR.jsp
View File

@@ -64,9 +64,9 @@
$('#pageDiv').html(html);
},
error: function(data) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}

23
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/NmbrOrdrDtlR.jsp
View File

@@ -542,9 +542,9 @@
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -572,9 +572,9 @@
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -653,9 +653,9 @@
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnSetleCancl").prop("disabled",false);
}
});
@@ -702,9 +702,9 @@
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -773,9 +773,9 @@
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnReturnRegist").prop("disabled",false);
}
});
@@ -1382,8 +1382,7 @@
</tr>
</tbody>
</table>
<%-- <p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>--%>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 이메일로 발송됩니다.</p>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>
</div>
</div>

24
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp
View File

@@ -557,9 +557,9 @@
$('#pageDiv').html(html);
},
error:function (data) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -587,9 +587,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -619,9 +619,9 @@
fn_mpage_info_refresh();
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -743,9 +743,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -814,8 +814,8 @@
$('#btnSetleCancl').prop('disabled', false);
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
$('#btnSetleCancl').prop('disabled', false);
}
}).done( function (data) {
@@ -899,8 +899,8 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
$('#btnReturnRegist').prop('disabled', false);
}
});

3
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp
View File

@@ -49,9 +49,6 @@
<c:when test="${order.ordrSttusCd == 75}">
<span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
<c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">
<a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>
</c:when>
</c:choose>
<c:if test="${ order.ordrTyCd == '04'}">
<br/>

188
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp
View File

@@ -7,7 +7,6 @@
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<%--
Class Name : OrdrDtlR.jsp
Description : 마이페이지 주문/배송조회
@@ -24,7 +23,6 @@
<%-- 공통 include --%>
<jsp:include page="/WEB-INF/views/comm/Include.jsp"/>
<c:set var="order" value="${data.order}"/>
<script src="<c:url value='/js/dlvylc/dlvylc.js'/>"></script>
@@ -98,12 +96,6 @@
const checkLength = $(row).find('input[name="goodsCheck"]:checked').length;
/** 결제 확인상태인 경우 전체취소 불가*/
if ('${order.ordrSttusCd}' == '25'){
alert('결제확인 상태에서는 전체 취소만 가능합니다.');
return false;
}
if (checkLength === 0) {
alert('결제취소/환불 하실 상품을 선택해 주십시요.');
@@ -591,8 +583,6 @@
dlvylc['recpntNm'] = data.recpntNm;
dlvylc['recpntMbtlnb'] = data.mbtlnb;
dlvylc['dlvylcZip'] = data.postcode;
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
dlvylc['prefcd'] = data.prefcd;
dlvylc['dlvylcAdresDvCd'] = data.addressType;
dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
dlvylc['dlvylcRnmAdres'] = data.roadAddress;
@@ -612,9 +602,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -641,9 +631,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -717,10 +707,9 @@
$("#btnSetleCancl").prop("disabled",true);
},
error:function(request, status, error) {
console.log(request);
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnSetleCancl").prop("disabled",true);
}
}).done( function (data) {
@@ -771,9 +760,9 @@
location.reload();
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -837,9 +826,9 @@
$("#btnReturnRegist").prop("disabled",false);
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnReturnRegist").prop("disabled",false);
}
});
@@ -1133,6 +1122,7 @@
<%-- 마이페이지 Right 영역 --%>
<jsp:include page="/WEB-INF/views/comm/mpage/MypageRight.jsp"/>
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<c:set var="order" value="${data.order}"/>
<form id="refundForm">
<input type="hidden" id="orderReInnb" name="orderReInnb"/>
<input type="hidden" id="refundOrdrInnb" name="ordrInnb"/>
@@ -1587,8 +1577,7 @@
</tbody>
</table>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>개인정보 보호법에 의하여 6개월이 지난 주문의 개인정보는 삭제처리됩니다.</p><br>
<%-- <p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>--%>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 이메일로 발송됩니다.</p>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>
</div>
</div>
@@ -1626,7 +1615,7 @@
</c:if>
<tr>
<th>결제금액</th>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.wonSetleAmt}</span>${krUnit}</td>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
<tr>
@@ -1647,6 +1636,45 @@
</td>
</tr>
</c:if>
<c:if test="${setle.reqstDvCd ne '04'}">
<c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
<tr>
<th>현금영수증</th>
<td>
<c:choose>
<c:when test="${order.salesPosbleRegistAt eq 'N'}">
<span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
</c:when>
<c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
<span class="orderDetail__waiting">미신청</span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
</c:when>
<c:otherwise>
<span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
<span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
<c:if test="${ !empty setle.cshRciptDelngNb }">
<%-- 현:현금영수증 --%>
<button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
'<c:out value="${ setle.sopmalCd }" />'
,'<c:out value="${ setle.pgInnb }" />'
,'<c:out value="${ setle.pgCmpnyNm }" />'
,'<c:out value="${ setle.cshRciptDelngNb }" />'
,'<c:out value="${ setle.reqstDvCd }" />'
,'<c:out value="${ setle.setleTyCd }" />'
,'<c:out value="${ setle.ordrSetleInnb }" />'
,'<c:out value="${ setle.ordrInnb }" />'
,'<c:out value="${ setle.mid }" />'
,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
보기
</button>
</c:if>
</c:otherwise>
</c:choose>
</td>
</tr>
</c:if>
</c:if>
</tbody>
</table>
</c:forEach>
@@ -1693,7 +1721,7 @@
</ul>
<div class="cartOrderBox__total">
<span class="cartOrderBox__totalTh">결제금액</span>
<span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span> / <span class="comma">${total.wonRlSetleAmt}</span><span class="priceUnit">${krUnit}</span></span>
<span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</div>
</div>
</div>
@@ -1707,61 +1735,61 @@
</c:forEach>
<%-- <c:if test="${not empty data.refundList }">--%>
<%-- <c:if test="${showSection}">--%>
<%-- <div class="sub-right-content__section">--%>
<%-- <h3 class="sub-right-content__title">무효/취소/반품 내역</h3>--%>
<%-- <div class="sub-right-content__section">--%>
<%-- <div class="table-wrapper">--%>
<%-- <table class="table vertical">--%>
<%-- <caption>주문상세내역</caption>--%>
<%-- <colgroup>--%>
<%-- <col style="width: auto;">--%>
<%-- <col style="width: 20%;">--%>
<%-- <col style="width: 20%;">--%>
<%-- <col style="width: 12%;">--%>
<%-- <col style="width: 12%;">--%>
<%-- <col style="width: 12%;">--%>
<%-- </colgroup>--%>
<%-- <thead>--%>
<%-- <tr>--%>
<%-- <th>무효/취소/반품</th>--%>
<%-- <th>접수일시</th>--%>
<%-- <th>처리일시</th>--%>
<%-- <th>처리수량</th>--%>
<%-- <th>처리금액</th>--%>
<%-- <th>처리상태</th>--%>
<%-- <th>보기</th>--%>
<%-- </tr>--%>
<%-- </thead>--%>
<%-- <tbody>--%>
<%-- <c:forEach var="refund" items="${data.refundList}">--%>
<%-- <c:if test="${ refund.useAt eq 'Y' }">--%>
<%-- <tr>--%>
<%-- <td> <c:out value="${refund.refundTyNm}"/></td>--%>
<%-- <td><c:out value="${refund.refundReqstDt}"/></td>--%>
<%-- <td><c:out value="${refund.refundComptDt}"/></td>--%>
<%-- <td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>--%>
<%-- <td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>--%>
<%-- <td>--%>
<%-- <c:out value="${refund.refundProcsSttusNm }"/>--%>
<%-- </td>--%>
<%-- <td>--%>
<%-- <c:if test = "${order.ordrSttusCd ne '95'}">--%>
<%-- <button type="button" class="btn sm outline"--%>
<%-- onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">--%>
<%-- 상세보기--%>
<%-- </button>--%>
<%-- </c:if>--%>
<%-- </td>--%>
<%-- </tr>--%>
<%-- </c:if>--%>
<%-- </c:forEach>--%>
<%-- </tbody>--%>
<%-- </table>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </c:if>--%>
<c:if test="${showSection}">
<div class="sub-right-content__section">
<h3 class="sub-right-content__title">무효/취소/반품 내역</h3>
<div class="sub-right-content__section">
<div class="table-wrapper">
<table class="table vertical">
<caption>주문상세내역</caption>
<colgroup>
<col style="width: auto;">
<col style="width: 20%;">
<col style="width: 20%;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 12%;">
</colgroup>
<thead>
<tr>
<th>무효/취소/반품</th>
<th>접수일시</th>
<th>처리일시</th>
<th>처리수량</th>
<th>처리금액</th>
<th>처리상태</th>
<th>보기</th>
</tr>
</thead>
<tbody>
<c:forEach var="refund" items="${data.refundList}">
<c:if test="${ refund.useAt eq 'Y' }">
<tr>
<td> <c:out value="${refund.refundTyNm}"/></td>
<td><c:out value="${refund.refundReqstDt}"/></td>
<td><c:out value="${refund.refundComptDt}"/></td>
<td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>
<td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>
<td>
<c:out value="${refund.refundProcsSttusNm }"/>
</td>
<td>
<c:if test = "${order.ordrSttusCd ne '95'}">
<button type="button" class="btn sm outline"
onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">
상세보기
</button>
</c:if>
</td>
</tr>
</c:if>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
</c:if>
<div class="sub-bottom-btn-container">
<a href="javascript:void(0);" id="btnOrdrList" class="btn xl outline theme">주문 목록</a>

23
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/RtngudCanclRefndDtlR.jsp
View File

@@ -165,7 +165,6 @@
<div class="sub-rl">
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<%-- 마이페이지 Left 영역 --%>
<jsp:include page="/WEB-INF/views/comm/mpage/MypageLeft.jsp"/>
<div class="sub-right-content">
@@ -759,7 +758,8 @@
</span>
</div>
<div class="priceSum__operator">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
viewBox="0 0 16 16" fill="none">
<g clip-path="url(#clip0_160_29539)">
<path
d="M8.99824 7.00176V0H7.00176V7.00176H0V8.99824H7.00176V16H8.99824V8.99824H16V7.00176H8.99824Z"
@@ -854,24 +854,14 @@
<path d="M3.5 8.16699H24.5V10.5003H3.5V8.16699Z" fill="black" />
</svg>
</div>
<div class="priceSum__item priceSum__item--misc" style="align-items: unset;">
<div class="priceSum__total">
<span class="priceSum__totalTitle">총 환불금액</span>
<div class="priceSum__itemPrice">
<span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</div>
</div>
<div class="priceSum__total">
<span class="priceSum__totalTitle">실 환불금액</span>
<span class="priceSum__totalTitle">환불 금액</span>
<div class="priceSum__totalPrice">
<span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</div>
<span class="priceSum__itemPrice">
[<span class="comma"><c:out value="${ reTotAmt.realWonRefundAmt }"/></span>
<span class="priceUnit">${krUnit}</span>]
</span>
<div class="priceSum__totalDetail">
(상품금액 <span class="comma"><c:out value="${ reTotAmt.refundAmtQySum }"/></span>${curUnit} + 배송비 <span class="comma"><c:out value="${ reTotAmt.rlDlvyAmt }"/></span>${curUnit})
</div>
</div>
</div>
@@ -912,9 +902,6 @@
<input type="hidden" id="pageIndex" name="pageIndex" value="${ paramVO.pageIndex }"/>
<input type="hidden" id="recordCountPerPage" name="recordCountPerPage" value="${ paramVO.recordCountPerPage }"/>
<input type="hidden" id="pageUnit" name="pageUnit" value="${ paramVO.pageUnit }"/>
<input type="hidden" name="srchwrd" id="srchwrd" value="${ paramVO.srchwrd }"/>
<input type="hidden" name="bgnDt" id="bgnDt" value="${ paramVO.bgnDt }"/>
<input type="hidden" name="endDt" id="endDt" value="${ paramVO.endDt }"/>
</form>
<%-- 공통 Footer --%>

6
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/RtngudCanclRefndListFormR.jsp
View File

@@ -27,7 +27,7 @@
<script>
$(document).ready(function() {
fn_set_param();
// fn_set_param();
let pageIndex = '<c:out value="${ resultMap.paramVO.pageIndex }"/>';
let pageUnit = '<c:out value="${ resultMap.paramVO.pageUnit }"/>';
@@ -71,9 +71,7 @@
}
/******************************************************************
* 검색조건 세팅
******************************************************************/
/* 검색조건 세팅 */
const fn_set_param = function() {
const params = ${paramVO};
const keys = Object.keys(params);

92
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListMpageRList.jsp
View File

@@ -1,92 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<c:choose>
<c:when test="${not empty data.resultList}">
<c:forEach var="order" items="${data.resultList}" begin="0" end="4">
<div class="orderList__item">
<div class="orderList__item__inner">
<a href="<c:url value="/sopmal/goods/selectGoodsDtl?sopmalCd=${order.sopmalCd}&goodsInnb=${order.goodsInnb}"/>" class="orderList__image">
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<img src="<c:out value="${ cdnurl }${order.goodsImageUrl}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${order.goodsNm}"/>">
</a>
<div class="orderList__description">
<div class="orderList__description__first">
<div class="orderList__item__top">
<a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
<span class="orderList__dot">·</span>
<span class="orderList__date"><c:out value="${order.ordrDt}"/> 주문</span>
</div>
<a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__productTitle"><c:out value="${order.goodsNm}"/></a>
<%--<span class="orderList__option"><c:out value="${order.optnNm}"/></span>--%>
<span class="cartItem__productOption"><span class="option-badge">옵션</span> <c:out value="${order.optnNm}"/></span>
<c:if test="${not empty order.inputOptnText}">
<span class="orderList__option"><c:out value="${order.inputOptnText}"/></span>
</c:if>
</div>
<div class="orderList__description__second">
<span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
</div>
<%-- <div class="orderList__description__third">--%>
<%-- <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>--%>
<%-- </div>--%>
<div class="orderList__description__fourth">
<c:choose>
<c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}">
<span class="orderList__status"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
<c:when test="${order.ordrSttusCd > 39 && order.ordrSttusCd < 71}">
<span class="orderList__status delivery"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
<c:when test="${order.ordrSttusCd == 75}">
<span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
<c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">
<span class="orderList__status cancel"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
</c:choose>
</div>
<%--
<div class="orderList__btnControls">
<c:choose>
<c:when test="${order.ordrSttusCd == 15}">
<a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">주문무효</a>
<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>
</c:when>
<c:when test="${order.ordrSttusCd > 24 && order.ordrSttusCd < 36}">
<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '');" class="btn-ordr-sttus btn gray sm full">결제취소</a>
<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>
</c:when>
<c:when test="${order.ordrSttusCd > 39 && order.ordrSttusCd < 66}">
<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>
<a href="javascript:void(0);" onclick="fn_call_refund_pop('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>
</c:when>
<c:when test="${order.ordrSttusCd > 69 && order.ordrSttusCd < 76}">
<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>
<a href="javascript:void(0);" onclick="fn_call_refund_pop('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>
<a href="<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>" class="btn-ordr-sttus btn outline sm full">리뷰작성</a>
<a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn theme sm full">구매확정111</a>
</c:when>
</c:choose>
</div>
--%>
</div>
</div>
<a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrOrdrListInqire">전체보기</a>
</div>
</c:forEach>
</c:when>
<c:otherwise>
<div class="orderList__no-result">
<img src="<c:url value="/pc/images/icon__no-result.png"/>" alt="">
<p class="orderList__no-result-text">주문내역이 없습니다.</p>
</div>
</c:otherwise>
</c:choose>

62
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp
View File

@@ -12,24 +12,33 @@
<c:forEach var="order" items="${data.resultList}">
<div class="orderList__item">
<div class="orderList__item__inner">
<a href="<c:url value="/sopmal/goods/selectGoodsDtl?sopmalCd=${order.sopmalCd}&goodsInnb=${order.goodsInnb}"/>" class="orderList__image">
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<img src="<c:out value="${ cdnurl }${order.goodsImageUrl}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${order.goodsNm}"/>">
</a>
<div class="orderList__description">
<div class="orderList__description__first">
<div class="orderList__item__top">
<a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
<span class="orderList__dot">·</span>
<span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> 구독서비스</span>
<span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>
</div>
<a href="javascript:void(0);" onclick="fn_go_subsvc_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__productTitle"><c:out value="${order.goodsNm}"/></a>
<%--<span class="orderList__option"><c:out value="${order.optnNm}"/></span>--%>
<span class="cartItem__productOption"><span class="option-badge">옵션</span> <c:out value="${order.optnNm}"/></span>
<c:if test="${not empty order.inputOptnText}">
<span class="orderList__option"><c:out value="${order.inputOptnText}"/></span>
</c:if>
</div>
<div class="orderList__description__second">
<span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
</div>
<div class="orderList__description__third">
<c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}">
<span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>
</c:if>
</div>
<div class="orderList__description__fourth">
<c:choose>
<%--구독취소가 아닌경우--%>
<c:when test="${order.refundSttusNm == null || order.refundSttusNm == ''}">
<c:choose>
<c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}">
<span class="orderList__status"><c:out value="${order.ordrSttusNm}"/></span>
@@ -40,14 +49,6 @@
<c:when test="${order.ordrSttusCd == 75}">
<span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
<c:when test="${order.ordrSttusCd >= 85}">
<span class="orderList__status cancel"><c:out value="${order.ordrSttusNm}"/></span>
</c:when>
</c:choose>
</c:when>
<c:otherwise>
<span class="orderList__status cancel"><c:out value="${order.refundSttusNm}"/></span>
</c:otherwise>
</c:choose>
<c:if test="${ order.ordrTyCd == '04'}">
<br/>
@@ -67,6 +68,43 @@
</c:choose>
</c:if>
</div>
<%-- <div class="orderList__btnControls">--%>
<%-- <c:choose>--%>
<%-- <c:when test="${order.ordrSttusCd == 15}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">주문취소</a>--%>
<%-- <c:if test="${ order.ordrTyCd != '05' }">--%>
<%-- <a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>--%>
<%-- </c:if>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 24 && order.ordrSttusCd < 34}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>--%>
<%-- <c:if test="${ order.ordrTyCd != '05' }">--%>
<%-- <a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>--%>
<%-- </c:if>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 55}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 54 && order.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>--%>
<%-- <c:if test="${ order.purchsDcsnAt eq 'Y' }">--%>
<%--&lt;%&ndash; <a href="javascript:void(0);" onclick="fn_call_refund_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>','<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>&ndash;%&gt;--%>
<%-- <a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>--%>
<%-- </c:if>--%>
<%-- <c:if test="${ order.reviewAt eq 'Y' }">--%>
<%-- <a href="<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>" class="btn-ordr-sttus btn theme sm full">리뷰작성</a>--%>
<%-- </c:if>--%>
<%-- <c:if test="${ order.purchsDcsnAt eq 'Y' }">--%>
<%-- <a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn theme sm full">구매확정</a>--%>
<%-- </c:if>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">--%>
<%-- <a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>--%>
<%-- </c:when>--%>
<%-- </c:choose>--%>
<%-- </div>--%>
</div>
</div>
</div>

27
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp
View File

@@ -15,7 +15,6 @@
------- -------- ---------------------------
2026-01-22 전준석 최초 생성
2026-02-05 이대환 내용 수정
2026-02-26 jazz 내용 수정
--%>
<!DOCTYPE html>
<html lang="ko">
@@ -557,9 +556,9 @@
$('#pageDiv').html(html);
},
error:function (data) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -587,9 +586,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -619,9 +618,9 @@
fn_mpage_info_refresh();
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -743,9 +742,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -814,8 +813,8 @@
$('#btnSetleCancl').prop('disabled', false);
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
$('#btnSetleCancl').prop('disabled', false);
}
}).done( function (data) {
@@ -899,8 +898,8 @@
}
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
$('#btnReturnRegist').prop('disabled', false);
}
});
@@ -1047,7 +1046,7 @@
</div>
<div class="sub-right-content__section">
<h3 class="sub-right-content__title">구독서비스 진행 현황</h3>
<h3 class="sub-right-content__title">구독서비스 주문/배송조회</h3>
<form id="condForm">
<input type="hidden" name="pageIndex" id="pageIndex" value="1">
<div class="customer-search">

593
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp
View File

@@ -7,7 +7,6 @@
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<%--
Class Name : OrdrDtlR.jsp
Description : 구독서비스 주문/배송 상세조회
@@ -56,8 +55,8 @@
}
});
/* 구독서비스 주문/배송 목록 화면 이동 버튼 선택 이벤트 */
$('#btnSubsvcOrdrList').on('click', function() {
/* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */
$('#btnOrdrList').on('click', function() {
const params = ${paramVO};
const keys = Object.keys(params);
@@ -65,7 +64,7 @@
newForm.attr('name', 'newForm');
newForm.attr('method', 'post');
newForm.attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm"/>');
newForm.attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrOrdrListInqire"/>');
for (let i=0; i<keys.length; i++) {
const key = keys[i];
@@ -577,7 +576,6 @@
dlvylc['recpntNm'] = data.recpntNm;
dlvylc['recpntMbtlnb'] = data.mbtlnb;
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
dlvylc['dlvylcZip'] = data.postcode;
dlvylc['dlvylcAdresDvCd'] = data.addressType;
dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
@@ -591,20 +589,16 @@
data:JSON.stringify(dlvylc),
dataType:'json',
success:function(data) {
let result = JSON.parse(data.resBody.result);
if (result != null) {
if(result.status == 0) {
if (data.resBody != null) {
alert('<spring:message code="success.common.update"/>');
location.reload();
} else {
alert(result.message);
}
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -631,9 +625,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -707,9 +701,9 @@
$("#btnSetleCancl").prop("disabled",true);
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnSetleCancl").prop("disabled",true);
}
}).done( function (data) {
@@ -760,9 +754,9 @@
location.reload();
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -826,9 +820,9 @@
$("#btnReturnRegist").prop("disabled",false);
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnReturnRegist").prop("disabled",false);
}
});
@@ -1132,359 +1126,6 @@
<c:set var="setle" value="${data.setleList[0]}" />
<c:set var="setleTyCd" value="${setle.setleTyCd}" />
</c:if>
<%--환불 내역 시작--%>
<c:if test="${order.orderReInnb != null && order.orderReInnb ne ''}">
<div class="sub-right-content__section">
<h3 class="sub-right-content__title"><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 내역</h3>
<div class="sub-right-content__section">
<h3 class="orderDetail__title"><c:out value="${ resultMap.result.refnd.registDt }"/>
<span class="orderDetail__titleNum">
<c:choose>
<c:when test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">
반품번호
</c:when>
<c:otherwise>
환불번호
</c:otherwise>
</c:choose>
<c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>
</span>
</h3>
</div>
</div>
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle"><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 처리</h3>
<div class="table-wrapper orderDetail__table">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 220px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 상태</th>
<td>
<c:choose>
<c:when test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">
<c:out value="${ resultMap.result.refnd.returnProcsSttusCdNm }"/>
</c:when>
<c:otherwise>
<c:out value="${ resultMap.result.refnd.refundProcsSttusCdNm }"/>
</c:otherwise>
</c:choose>
</td>
</tr>
<tr>
<th><c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">반품/</c:if>환불 번호</th>
<td><c:out value="${ resultMap.result.refnd.orderRefundInnb }"/></td>
</tr>
<tr>
<th>환불 종류</th>
<td><c:out value="${ resultMap.result.refnd.refundTyCdNm }"/></td>
</tr>
<c:if test = "${not empty resultMap.result.refnd.returnProcsSttusCd}">
<tr>
<th>반품 접수일</th>
<td><c:out value="${ resultMap.result.refnd.returnRceptDt }"/></td>
</tr>
</c:if>
<tr>
<th>환불 접수일</th>
<td><c:out value="${ resultMap.result.refnd.refundReqstDt }"/></td>
</tr>
<c:if test = "${not empty resultMap.result.refnd.returnComptDt}">
<tr>
<th>반품 완료일</th>
<td><c:out value="${ resultMap.result.refnd.returnComptDt }"/></td>
</tr>
</c:if>
<c:if test = "${not empty resultMap.result.refnd.refundComptDt}">
<tr>
<th>환불 완료일</th>
<td><c:out value="${ resultMap.result.refnd.refundComptDt }"/></td>
</tr>
</c:if>
</tbody>
</table>
</div>
</div>
<c:if test="${ not empty resultMap.result.refnd.returnRceptDt }">
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">반품정보
</h3>
<form id="returnDlvyUpdtForm">
<input type="hidden" name="orderReInnb" value="<c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>"/>
<div id="returnInfoContent01" class="table-wrapper orderDetail__table">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 220px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th>
<span class="orderDetail__thText">회수방법</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.returnMthCdNm }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">주소</span>
</th>
<td>
<c:if test="${ not empty resultMap.result.refnd.senderZip }">
(<c:out value="${ resultMap.result.refnd.senderZip }"/>)
</c:if>
<c:choose>
<c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '01'}">
<c:out value="${ resultMap.result.refnd.senderRnmAdres }"/>
</c:when>
<c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '02'}">
<c:out value="${ resultMap.result.refnd.senderLnbAdres }"/>
</c:when>
</c:choose>
<c:out value="${ resultMap.result.refnd.senderAdresDtl }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">휴대폰 번호</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.returnCstmrMbtlnb }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">반품 사유</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.returnResnCdNm }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">상세 사유</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.returnResnCn }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">배송비 입금</span>
</th>
<td>
<%--우리은행 1005-102-768159<br>(예금주: ㈜에스엘바이오텍)--%>
<c:if test="${ not empty resultMap.result.refnd.returnDlvyRcpmnyAcntnb }">
<c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyAcntnb }"/><br>(예금주: <c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyNm }"/>)
</c:if>
</td>
</tr>
</tbody>
</table>
</div>
</form>
</div>
</c:if>
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">환불정보</h3>
<form id="refundAcntUpdtForm">
<input type="hidden" name="orderReInnb" value="<c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>"/>
<div id="refundInfoContent01" class="table-wrapper orderDetail__table">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 220px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th>
<span class="orderDetail__thText">환불은행</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.refundAcntBnnkNm }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">예금주</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.refundAcntDpstrNm }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">계좌번호</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.refundAcntnb }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">취소 사유</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.returnResnCdNm }"/>
</td>
</tr>
<tr>
<th>
<span class="orderDetail__thText">상세 사유</span>
</th>
<td>
<c:out value="${ resultMap.result.refnd.returnResnCn }"/>
</td>
</tr>
</tbody>
</table> </div>
</form>
</div>
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">
환불 금액
</h3>
<div class="priceSum">
<c:set var="reTotAmt" value="${ resultMap.result.totRefundDscntAmt }"/>
<div class="priceSum__inner">
<div class="priceSum__item">
<span class="priceSum__itemTitle"><c:out value="${ reTotAmt.setleTyCdNm }"/></span>
<span class="priceSum__itemPrice">
<span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.refundAmtQySum }"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</div>
<div class="priceSum__operator">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
<g clip-path="url(#clip0_160_29539)">
<path
d="M8.99824 7.00176V0H7.00176V7.00176H0V8.99824H7.00176V16H8.99824V8.99824H16V7.00176H8.99824Z"
fill="black" />
</g>
<defs>
<clipPath id="clip0_160_29539">
<rect width="16" height="16" fill="white" />
</clipPath>
</defs>
</svg>
</div>
<div class="priceSum__item priceSum__item--misc">
<span class="priceSum__itemTitle">마일리지</span>
<span class="priceSum__itemPrice">
<span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.totRefundMlgAmt }"/></span>
<span class="priceUnit">점</span>
</span>
</div>
<!-- 마이너스 -->
<!-- <div class="priceSum__operator">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
fill="none">
<path d="M16 7H0V9.00002H16V7Z" fill="black" />
</svg>
</div> -->
<div class="priceSum__operator">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
viewBox="0 0 16 16" fill="none">
<g clip-path="url(#clip0_160_29539)">
<path
d="M8.99824 7.00176V0H7.00176V7.00176H0V8.99824H7.00176V16H8.99824V8.99824H16V7.00176H8.99824Z"
fill="black" />
</g>
<defs>
<clipPath id="clip0_160_29539">
<rect width="16" height="16" fill="white" />
</clipPath>
</defs>
</svg>
</div>
<div class="priceSum__item priceSum__item--misc">
<span class="priceSum__itemTitle">쿠폰</span>
<span class="priceSum__itemPrice">
<span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.totRefundCouponAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</div>
<c:if test="${ reTotAmt.rlDlvyAmtRefundAmt > 0}">
<div class="priceSum__operator">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"
fill="none">
<path d="M16 7H0V9.00002H16V7Z" fill="black" />
</svg>
</div>
<div class="priceSum__item priceSum__item--misc">
<span class="priceSum__itemTitle">반품배송비</span>
<span class="priceSum__itemPrice">
<span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.rlDlvyAmtRefundAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</div>
</c:if>
<c:if test="${ reTotAmt.totReturnDlvyAmt > 0}">
<div class="priceSum__operator">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
viewBox="0 0 16 16" fill="none">
<g clip-path="url(#clip0_160_29539)">
<path
d="M8.99824 7.00176V0H7.00176V7.00176H0V8.99824H7.00176V16H8.99824V8.99824H16V7.00176H8.99824Z"
fill="black" />
</g>
<defs>
<clipPath id="clip0_160_29539">
<rect width="16" height="16" fill="white" />
</clipPath>
</defs>
</svg>
</div>
<div class="priceSum__item priceSum__item--misc">
<span class="priceSum__itemTitle">환불배송비</span>
<span class="priceSum__itemPrice">
<span class="comma priceSum__itemNum"><c:out value="${ reTotAmt.totReturnDlvyAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</div>
</c:if>
<div class="priceSum__equals">
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28"
viewBox="0 0 28 28" fill="none">
<path d="M3.5 17.5H24.5V19.8333H3.5V17.5Z" fill="black" />
<path d="M3.5 8.16699H24.5V10.5003H3.5V8.16699Z" fill="black" />
</svg>
</div>
<div class="priceSum__item priceSum__item--misc" style="align-items: unset;">
<div class="priceSum__total">
<span class="priceSum__totalTitle">총 환불금액</span>
<div class="priceSum__itemPrice">
<span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</div>
</div>
<div class="priceSum__total">
<span class="priceSum__totalTitle">실 환불금액</span>
<div class="priceSum__totalPrice">
<span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>
<span class="priceUnit">${curUnit}</span>
</div>
<span class="priceSum__itemPrice">
[<span class="comma"><c:out value="${ reTotAmt.realWonRefundAmt }"/></span>
<span class="priceUnit">${krUnit}</span>]
</span>
</div>
</div>
</div>
</div>
</div>
</c:if>
<%--환불 내역 종료--%>
<div class="sub-right-content__section">
<h3 class="sub-right-content__title">구독서비스 주문상세내역</h3>
@@ -1494,7 +1135,7 @@
<c:when test="${order.ordrSttusCd == 25}">
<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
</c:when>
<c:when test="${(order.orderReInnb == null || order.orderReInnb eq '') && order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
<c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
<a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn gray2">구독취소</a>
</c:when>
</c:choose>
@@ -1571,7 +1212,7 @@
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 12%;">
<%-- <col style="width: 10%;">--%>
<col style="width: 10%;">
<col style="width: 10%;">
</colgroup>
<thead>
@@ -1581,7 +1222,7 @@
<th>상품금액</th>
<th>할인금액</th>
<th>할인적용금액</th>
<%-- <th>적립금</th>--%>
<th>적립금</th>
<th>처리상태</th>
</tr>
</thead>
@@ -1623,12 +1264,12 @@
<span class="priceUnit">${curUnit}</span>
</span>
</td>
<%--<td>
<td>
<span class="cartItem__mileage">
<span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span>
<span class="priceUnit">점</span>
</span>
</td>--%>
</td>
<td>
<a class="orderList__status">
<c:choose>
@@ -1727,8 +1368,7 @@
</tbody>
</table>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>개인정보 보호법에 의하여 6개월이 지난 주문의 개인정보는 삭제처리됩니다.</p><br>
<%-- <p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>--%>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 이메일로 발송됩니다.</p>
<p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>
</div>
</div>
@@ -1766,7 +1406,7 @@
</c:if>
<tr>
<th>결제금액</th>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.wonSetleAmt}</span>${krUnit}</td>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
<tr>
@@ -1787,6 +1427,45 @@
</td>
</tr>
</c:if>
<c:if test="${setle.reqstDvCd ne '04'}">
<c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
<tr>
<th>현금영수증</th>
<td>
<c:choose>
<c:when test="${order.salesPosbleRegistAt eq 'N'}">
<span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
</c:when>
<c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
<span class="orderDetail__waiting">미신청</span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
</c:when>
<c:otherwise>
<span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
<span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
<c:if test="${ !empty setle.cshRciptDelngNb }">
<%-- 현:현금영수증 --%>
<button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
'<c:out value="${ setle.sopmalCd }" />'
,'<c:out value="${ setle.pgInnb }" />'
,'<c:out value="${ setle.pgCmpnyNm }" />'
,'<c:out value="${ setle.cshRciptDelngNb }" />'
,'<c:out value="${ setle.reqstDvCd }" />'
,'<c:out value="${ setle.setleTyCd }" />'
,'<c:out value="${ setle.ordrSetleInnb }" />'
,'<c:out value="${ setle.ordrInnb }" />'
,'<c:out value="${ setle.mid }" />'
,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
보기
</button>
</c:if>
</c:otherwise>
</c:choose>
</td>
</tr>
</c:if>
</c:if>
</tbody>
</table>
</c:forEach>
@@ -1798,6 +1477,44 @@
</div>
</c:otherwise>
</c:choose>
<c:set var="total" value="${data.total}"/>
<div class="orderDetail__orderPrice">
<ul class="cartOrderBox__list">
<li>
<span class="cartOrderBox__th">총 주문금액</span>
<span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li>
<li>
<span class="cartOrderBox__th">할인금액</span>
<span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span class="comma"><fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}">
<li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}">
<span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span>
<span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li>
</c:if>
</c:forEach>
<li>
<span class="cartOrderBox__th">배송비</span>
<span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}">
<li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}">
<span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span>
<span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li>
</c:if>
</c:forEach>
</ul>
<div class="cartOrderBox__total">
<span class="cartOrderBox__totalTh">결제금액</span>
<span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</div>
</div>
</div>
</div>
@@ -1809,64 +1526,64 @@
</c:forEach>
<%-- <c:if test="${not empty data.refundList }">--%>
<%-- <c:if test="${showSection}">--%>
<%-- <div class="sub-right-content__section">--%>
<%-- <h3 class="sub-right-content__title">무효/취소/반품 내역</h3>--%>
<%-- <div class="sub-right-content__section">--%>
<%-- <div class="table-wrapper">--%>
<%-- <table class="table vertical">--%>
<%-- <caption>구독서비스 주문상세내역</caption>--%>
<%-- <colgroup>--%>
<%-- <col style="width: auto;">--%>
<%-- <col style="width: 20%;">--%>
<%-- <col style="width: 20%;">--%>
<%-- <col style="width: 12%;">--%>
<%-- <col style="width: 12%;">--%>
<%-- <col style="width: 12%;">--%>
<%-- </colgroup>--%>
<%-- <thead>--%>
<%-- <tr>--%>
<%-- <th>무효/취소/반품</th>--%>
<%-- <th>접수일시</th>--%>
<%-- <th>처리일시</th>--%>
<%-- <th>처리수량</th>--%>
<%-- <th>처리금액</th>--%>
<%-- <th>처리상태</th>--%>
<%-- <th>보기</th>--%>
<%-- </tr>--%>
<%-- </thead>--%>
<%-- <tbody>--%>
<%-- <c:forEach var="refund" items="${data.refundList}">--%>
<%-- <c:if test="${ refund.useAt eq 'Y' }">--%>
<%-- <tr>--%>
<%-- <td> <c:out value="${refund.refundTyNm}"/></td>--%>
<%-- <td><c:out value="${refund.refundReqstDt}"/></td>--%>
<%-- <td><c:out value="${refund.refundComptDt}"/></td>--%>
<%-- <td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>--%>
<%-- <td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>--%>
<%-- <td>--%>
<%-- <c:out value="${refund.refundProcsSttusNm }"/>--%>
<%-- </td>--%>
<%-- <td>--%>
<%-- <c:if test = "${order.ordrSttusCd ne '95'}">--%>
<%-- <button type="button" class="btn sm outline"--%>
<%-- onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">--%>
<%-- 상세보기--%>
<%-- </button>--%>
<%-- </c:if>--%>
<%-- </td>--%>
<%-- </tr>--%>
<%-- </c:if>--%>
<%-- </c:forEach>--%>
<%-- </tbody>--%>
<%-- </table>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </c:if>--%>
<c:if test="${showSection}">
<div class="sub-right-content__section">
<h3 class="sub-right-content__title">무효/취소/반품 내역</h3>
<div class="sub-right-content__section">
<div class="table-wrapper">
<table class="table vertical">
<caption>구독서비스 주문상세내역</caption>
<colgroup>
<col style="width: auto;">
<col style="width: 20%;">
<col style="width: 20%;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 12%;">
</colgroup>
<thead>
<tr>
<th>무효/취소/반품</th>
<th>접수일시</th>
<th>처리일시</th>
<th>처리수량</th>
<th>처리금액</th>
<th>처리상태</th>
<th>보기</th>
</tr>
</thead>
<tbody>
<c:forEach var="refund" items="${data.refundList}">
<c:if test="${ refund.useAt eq 'Y' }">
<tr>
<td> <c:out value="${refund.refundTyNm}"/></td>
<td><c:out value="${refund.refundReqstDt}"/></td>
<td><c:out value="${refund.refundComptDt}"/></td>
<td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>
<td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>
<td>
<c:out value="${refund.refundProcsSttusNm }"/>
</td>
<td>
<c:if test = "${order.ordrSttusCd ne '95'}">
<button type="button" class="btn sm outline"
onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">
상세보기
</button>
</c:if>
</td>
</tr>
</c:if>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
</c:if>
<div class="sub-bottom-btn-container">
<a href="javascript:void(0);" id="btnSubsvcOrdrList" class="btn xl outline theme">주문 목록</a>
<a href="javascript:void(0);" id="btnOrdrList" class="btn xl outline theme">주문 목록</a>
</div>
</div>
</div>

22
src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp
View File

@@ -1833,6 +1833,25 @@
$(form).find('input[name="dlvylcAdresDtl"]').val(data.dtlAdres);
$(form).find('input[name="dlvylcAdres"]').val('01' === $(form).find('input[name="dlvylcAdresDvCd"]').val() ? $(form).find('input[name="dlvylcRnmAdres"]').val() : $(form).find('input[name="dlvylcLnbAdres"]').val());
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
// localStorage.setItem("dlvylcAreaCd", dlvylcAreaCd);
//
//
// setle['sopmalCd'] = $('#sopmalCd').val();
// setle['dlvylc'] = JSON.parse(localStorage.getItem('dlvylc'));
// setle['goodsList'] = JSON.parse(localStorage.getItem('goodsList'));
// setle['enuri'] = JSON.parse(localStorage.getItem('enuri'));
// setle['dlvylcZip'] = localStorage.getItem('dlvylcZip');
// setle['dlvylcAreaCd'] = localStorage.getItem('dlvylcAreaCd');
// setle['prefcd'] = localStorage.getItem('prefcd');
// setle['multiOrdrDlvylc'] = JSON.parse(localStorage.getItem('multiOrdrDlvylc'));
// setle['ordrTyCd'] = $('input[name="ordrTy"]:checked').val();
// 배송지 정보 세팅 이후 결제예정금액 재계산
fn_get_setle_amt();
}
@@ -2741,9 +2760,6 @@
order['dlvylcAreaCd'] = localStorage.getItem('dlvylcAreaCd');
order['prefcd'] = localStorage.getItem('prefcd');
// order['subsvcInnb'] = 0;
// order['subsvcAt'] = 'N';
/* 여러곳 배송 > 배송지별 정합성 검사 시작 */
if (ordrTyCd === '05') { // 여러곳 배송

6
src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp
View File

@@ -52,11 +52,7 @@
* 초기 설정
**********************************************************/
const fn_init = function() {
const recentSearches = localStorage.getItem('recentSearches');
localStorage.clear();
if (recentSearches !== null){
localStorage.setItem('recentSearches', recentSearches);
}
fn_get_spbk_goods_list();
}
@@ -1470,7 +1466,7 @@
<li>
<span class="cartOrderBox__th">배송비</span>
<%-- <span class="cartOrderBox__td"><span class="comma" id="dlvyAmtSapn">0</span><span class="priceUnit">${curUnit}</span></span>--%>
<span class="cartOrderBox__td"><span class="priceUnit">Calculated at next step</span></span>
<span class="cartOrderBox__td"><span class="comma" id="dlvyAmtSapn">0</span><span class="priceUnit">Calculated at next step</span></span>
</li>
<li>
<span class="cartOrderBox__th">총 할인금액</span>

4549
src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp
View File

File diff suppressed because it is too large Load Diff

11
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistC.jsp
View File

@@ -331,12 +331,11 @@
<input type = "hidden" id = "bbsInfo" value = "<c:out value = '${bbsInfo.bbsInfo}'/>" name = "bbsInfo"/>
<input type = "hidden" id = "bbscttSndngMthCd" value = "<c:out value = '${bbsInfo.bbscttSndngMthCd}'/>" name = "bbscttSndngMthCd"/>
<input type = "hidden" id = "regusrDvCd" value = "<c:out value = '${bbscttVO.regusrDvCd}'/>" name = "regusrDvCd"/>
<%--구독취소 유의사항--%>
<%-- <div class="refund-clause ck-content">--%>
<%-- <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>--%>
<%-- <br><br>--%>
<%-- <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>--%>
<%-- </div>--%>
<div class="refund-clause ck-content">
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
<br><br>
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
</div>
<div class="userForm">
<div class="userForm__inputBox">
<div class="userForm__inputBox__item">

2
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp
View File

@@ -296,13 +296,11 @@
<div class="microModal__inner">
<form id="bbsRegForm">
<input type='hidden' name='bbsTyCd' id='bbsTyCd' value='<c:out value="${bbsInfo.bbsTyCd}"/>'>
<c:if test="${bbsInfo.bbsTyCd eq '12'}">
<div class="refund-clause ck-content">
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
<br><br>
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
</div>
</c:if>
<div class="userForm">
<div class="userForm__inputBox">
<div class="userForm__inputBox__item">

20
src/main/webapp/WEB-INF/views/sopmal_m/main/SubscribeR.jsp
View File

@@ -58,9 +58,6 @@
default:
break;
}
// 화면 최상단으로 스크롤
$("html, body").animate({ scrollTop: 0 }, 400);
}
});
}
@@ -89,14 +86,14 @@
</header>
<!-- 하단 탭바 -->
<%-- <jsp:include page="/WEB-INF/views/comm/mobile/TabBar.jsp"/>--%>
<jsp:include page="/WEB-INF/views/comm/mobile/TabBar.jsp"/>
<!-- 메인 컨텐츠 -->
<div class="content-wrap">
<main class="main">
<div class="sub-page">
<div class="sub-box">
<div class="ck-content" style="background-color: #f8f9fB;">
<div class="ck-content">
<c:out value="${ resultMap.sopmalInfo[0].subsvcGuidanceWords }" escapeXml="false"/>
</div>
</div>
@@ -140,13 +137,16 @@
</dl>
</div>
</div>
<div class="bottomFixedControls">
<div class="bottomFixedControls__inner">
<button type="button" class="btn outline theme" onclick="openModal('product-option-sheet')">
<div class="productDetailInfo">
<div class="productDetailInfo__body">
<button type="button" class="btn full md gray" onclick="openModal('product-option-sheet')">
옵션선택
</button>
<button type="button" id="subscribeBtn" class="btn theme">구독하기</button>
</div>
</div>
<div class="productDetailInfo">
<div class="productDetailInfo__body">
<button type="button" class="btn full theme">구매하기</button>
</div>
</div>
</div>

16
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GiftListFormR.jsp
View File

@@ -114,9 +114,9 @@
loading.remove();
},
error:function (request) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
loading.remove();
}
@@ -249,9 +249,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -301,9 +301,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -654,8 +654,8 @@
onSuccess();
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}

8
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/IndvdlSetleR.jsp
View File

@@ -56,9 +56,9 @@
loading.remove();
},
error: function (request) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
loading.remove();
}
@@ -93,9 +93,9 @@
loading.remove();
},
error:function (request) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
loading.remove();
}

12
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/NmbrOrdrDtlR.jsp
View File

@@ -109,9 +109,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -158,9 +158,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -259,8 +259,8 @@
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
$("#message.errorMsg").text(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
$("#message.errorMsg").text(message.errorMsg);
openModal2("custom_alert")
}
});

16
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp
View File

@@ -115,9 +115,9 @@
loading.remove();
},
error:function (request) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
loading.remove();
}
@@ -290,9 +290,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -345,9 +345,9 @@
fn_get_ordr_dlvy_list(1);
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -705,8 +705,8 @@
onSuccess();
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}

168
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp
View File

@@ -8,7 +8,6 @@
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<!DOCTYPE html>
<html lang="ko">
<head>
@@ -108,9 +107,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -160,9 +159,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -273,8 +272,6 @@
dlvylc['recpntNm'] = data.recpntNm;
dlvylc['recpntMbtlnb'] = data.mbtlnb;
dlvylc['dlvylcZip'] = data.postcode;
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
dlvylc['prefcd'] = data.prefcd;
dlvylc['dlvylcAdresDvCd'] = data.addressType;
dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
dlvylc['dlvylcRnmAdres'] = data.roadAddress;
@@ -295,8 +292,8 @@
onSuccess();
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}
@@ -1110,7 +1107,7 @@
</c:if>
<tr>
<th>결제금액</th>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.wonSetleAmt}</span>${krUnit}</td>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
<tr <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>>
@@ -1131,6 +1128,47 @@
</td>
</tr>
</c:if>
<c:if test="${setle.reqstDvCd ne '04'}">
<c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
<%--현금영수증 발급상태가 존재하고, 주문상태가 주문취소, 결제취소가 아닐 때 노출--%>
<tr style="border-bottom: 0.5px solid #e9ecef;">
<th>현금영수증</th>
<td>
<c:choose>
<c:when test="${order.salesPosbleRegistAt eq 'N'}">
<span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
</c:when>
<c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
<span class="orderDetail__waiting">미신청</span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
</c:when>
<c:otherwise>
<span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
<br/>
<span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
<c:if test="${ !empty setle.cshRciptDelngNb }">
<%-- 현:현금영수증 --%>
<button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
'<c:out value="${ setle.sopmalCd }" />'
,'<c:out value="${ setle.pgInnb }" />'
,'<c:out value="${ setle.pgCmpnyNm }" />'
,'<c:out value="${ setle.cshRciptDelngNb }" />'
,'<c:out value="${ setle.reqstDvCd }" />'
,'<c:out value="${ setle.setleTyCd }" />'
,'<c:out value="${ setle.ordrSetleInnb }" />'
,'<c:out value="${ setle.ordrInnb }" />'
,'<c:out value="${ setle.mid }" />'
,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
보기
</button>
</c:if>
</c:otherwise>
</c:choose>
</td>
</tr>
</c:if>
</c:if>
</tbody>
</table>
</c:forEach>
@@ -1193,7 +1231,7 @@
<tr>
<th>총 결제금액</th>
<td>
<span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${total.wonRlSetleAmt}</span>${krUnit}
<span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit}
</td>
</tr>
</tfoot>
@@ -1204,60 +1242,60 @@
</div>
</div>
<%-- <c:if test="${not empty data.refundList}">--%>
<%-- <div class="sub-box">--%>
<%-- <div class="orderDetailProduct">--%>
<%-- <div class="orderDetailProduct__top" role="button" tabindex="0">--%>
<%-- <span class="orderDetailProduct__top__title">무효/취소/반품 내역</span>--%>
<%-- <span class="orderDetailProduct__top__chevron"></span>--%>
<%-- </div>--%>
<%-- <div class="orderDetail__content">--%>
<%-- <div class="orderDetail__body">--%>
<%-- <div class="table-wrapper orderDetail__table orderDetail__table--price">--%>
<%-- <table class="table">--%>
<%-- <colgroup>--%>
<%-- <col style="width: 40%">--%>
<%-- <col style="width: auto">--%>
<%-- <col style="width: auto">--%>
<%-- </colgroup>--%>
<%-- <tbody>--%>
<%-- <c:forEach var="refund" items="${data.refundList}">--%>
<%-- <tr>--%>
<%-- <th colspan="2">--%>
<%-- <strong>--%>
<%-- <c:out value="${refund.refundTyNm}"/>--%>
<%-- (<c:out value="${refund.refundProcsSttusNm }"/> <c:out value="${refund.orderRefundInnb}"/>)--%>
<%-- </strong>--%>
<%-- </th>--%>
<%-- <td><c:if test = "${order.ordrSttusCd ne '95'}"><button type="button" class="orderListItem__top__more" onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">상세보기</button></c:if></td>--%>
<%-- </tr>--%>
<%-- <tr>--%>
<%-- <th>접수일시</th>--%>
<%-- <td colspan="2"><c:out value="${refund.sumRefundReqstDt}"/></td>--%>
<%-- </tr>--%>
<%-- <c:if test = "${not empty refund.sumRefundComptDt}">--%>
<%-- <tr>--%>
<%-- <th> 처리일시</th>--%>
<%-- <td colspan="2"><c:out value="${refund.sumRefundComptDt}"/></td>--%>
<%-- </tr>--%>
<%-- </c:if>--%>
<%-- <tr>--%>
<%-- <th>처리수량</th>--%>
<%-- <td colspan="2"><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/>개</td>--%>
<%-- </tr>--%>
<%-- <tr style="border-bottom: 1px solid #e9ecef;">--%>
<%-- <th>처리금액</th>--%>
<%-- <td colspan="2"><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/>${curUnit}</td>--%>
<%-- </tr>--%>
<%-- </c:forEach>--%>
<%-- </tbody>--%>
<%-- </table>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </c:if>--%>
<c:if test="${not empty data.refundList}">
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">무효/취소/반품 내역</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<div class="table-wrapper orderDetail__table orderDetail__table--price">
<table class="table">
<colgroup>
<col style="width: 40%">
<col style="width: auto">
<col style="width: auto">
</colgroup>
<tbody>
<c:forEach var="refund" items="${data.refundList}">
<tr>
<th colspan="2">
<strong>
<c:out value="${refund.refundTyNm}"/>
(<c:out value="${refund.refundProcsSttusNm }"/> <c:out value="${refund.orderRefundInnb}"/>)
</strong>
</th>
<td><c:if test = "${order.ordrSttusCd ne '95'}"><button type="button" class="orderListItem__top__more" onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">상세보기</button></c:if></td>
</tr>
<tr>
<th>접수일시</th>
<td colspan="2"><c:out value="${refund.sumRefundReqstDt}"/></td>
</tr>
<c:if test = "${not empty refund.sumRefundComptDt}">
<tr>
<th> 처리일시</th>
<td colspan="2"><c:out value="${refund.sumRefundComptDt}"/></td>
</tr>
</c:if>
<tr>
<th>처리수량</th>
<td colspan="2"><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/>개</td>
</tr>
<tr style="border-bottom: 1px solid #e9ecef;">
<th>처리금액</th>
<td colspan="2"><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/>${curUnit}</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</c:if>
<div class="fullBtnSection">
<button type="button" onclick="fn_go_ordr_list('${order.sopmalCd}', '${order.ordrInnb}')" class="btn md outline full">목록</button>
</div>

4
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp
View File

@@ -286,9 +286,9 @@
$("#btnSetleCancl").prop('disabled',false);
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnSetleCancl").prop('disabled',false);
}
}).done( function (data) {

4
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RefundRegistPopupC.jsp
View File

@@ -385,9 +385,9 @@
$("#btnReturnRegist").prop("disabled",false);
},
error : function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
$("#btnReturnRegist").prop("disabled",false);
}
});

10
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RtngudCanclRefndDtlR.jsp
View File

@@ -200,7 +200,6 @@
<div class="sub-page">
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<div class="orderDetail">
<c:if test="${ not empty resultMap.result.refnd.refundComptDt }">
<div class="detailTop">
@@ -687,12 +686,6 @@
<span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>${curUnit}
</td>
</tr>
<tr>
<th>실 환불금액</th>
<td>
<span class="comma"><c:out value="${ reTotAmt.realRefundAmt }"/></span>${curUnit} [<span class="comma"><c:out value="${ reTotAmt.realWonRefundAmt }"/></span>${krUnit}]
</td>
</tr>
</tfoot>
</table>
</div>
@@ -720,9 +713,6 @@
<input type="hidden" id="pageIndex" name="pageIndex" value="${ paramVO.pageIndex }"/>
<input type="hidden" id="recordCountPerPage" name="recordCountPerPage" value="${ paramVO.recordCountPerPage }"/>
<input type="hidden" id="pageUnit" name="pageUnit" value="${ paramVO.pageUnit }"/>
<input type="hidden" name="srchwrd" id="srchwrd" value="${ paramVO.srchwrd }"/>
<input type="hidden" name="bgnDt" id="bgnDt" value="${ paramVO.bgnDt }"/>
<input type="hidden" name="endDt" id="endDt" value="${ paramVO.endDt }"/>
</form>
<!-- 푸터 -->

30
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RtngudCanclRefndListFormR.jsp
View File

@@ -28,8 +28,6 @@
$(document).ready(function (){
fn_set_param();
const title = '반품/환불 내역';
fn_set_header_title(title);
@@ -72,34 +70,6 @@
}
/******************************************************************
* 검색조건 세팅
******************************************************************/
const fn_set_param = function() {
const params = ${paramVO};
const keys = Object.keys(params);
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
let data = params[key];
if ('bgnDt' == key || 'endDt' == key) {
if (!fn_is_empty(data)) {
for (let i = 0; i < data.length; i++) {
$('#' + key).val(data);
}
}
}
if ('dateRange' == key) {
$('#'+ data).trigger('click');
}
if ('srchwrd' == key) {
$('#' + key).val(data);
}
}
}
/**********************************************************

32
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp
View File

@@ -31,7 +31,7 @@
* 초기 설정
**********************************************************/
const fn_init = function() {
$('.header').find('h1.header__title').text('구독서비스 진행 현황');
$('.header').find('h1.header__title').text('구독서비스 주문/배송');
fn_get_ordr_dlvy_list(1);
}
@@ -115,9 +115,9 @@
loading.remove();
},
error:function (request) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
loading.remove();
}
@@ -142,28 +142,28 @@
div += ' <div class="orderListItem">';
div += ' <div class="orderListItem__top">';
div += ' <span class="orderListItem__top__date"><span class="misc">'+ row.ordrDt +'(' + row.ordrInnb +') ';
div += ' <span className="orderList__dot">·</span> 구독서비스';
div += ' <span className="orderList__dot">·</span> ' + row.ordrTyCdNm;
div += ' </span></span>';
div += ' <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__top__more">상세보기</a>';
div += ' </div>';
div += ' <div class="orderListItem__body">';
div += ' <div class="orderListItem__image">';
div += ' <a href="/sopmal/goods/selectGoodsDtl?sopmalCd=' + row.sopmalCd + '&goodsInnb=' + row.goodsInnb + '">';
div += ' <img src="' + cdnurl + row.goodsImageUrl + '" onerror="this.src=\'/pc/images/image_placeholder.png\'" alt="' + row.goodsNm + '">';
div += ' </a>';
div += ' </div>';
div += ' <div class="orderListItem__right">';
div += ' <div class="orderListItem__info">';
if (row.refundSttusNm == null || row.refundSttusNm == ''){
div += ' <p class="orderListItem__info__status">' + row.ordrSttusNm;
}else{
div += ' <p class="orderListItem__info__status">' + row.refundSttusNm;
}
if (!fn_is_empty(row.giftSttusCd)) {
div += ' (' + row.giftSttusCdNm + ')';
}
div += ' </p>';
div += ' <a href="javascript:void(0);" onclick="fn_go_subsvc_dtl(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="orderListItem__info__name">' + row.goodsNm + '</a>';
<%--div += ' <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';--%>
div += ' <p class="orderListItem__info__quantity">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';
if (row.optnNm != null) {
div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>';
}
div += ' <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';
div += ' </p>';
div += ' </div>';
div += ' </div>';
@@ -290,9 +290,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -345,9 +345,9 @@
fn_get_ordr_dlvy_list(1);
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -705,8 +705,8 @@
onSuccess();
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}

588
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp
View File

@@ -8,7 +8,6 @@
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
<!DOCTYPE html>
<html lang="ko">
<head>
@@ -108,9 +107,9 @@
}
},
error:function(request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -160,9 +159,9 @@
}
},
error:function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message);
alert(message.errorMsg);
}
});
}
@@ -272,7 +271,6 @@
dlvylc['recpntNm'] = data.recpntNm;
dlvylc['recpntMbtlnb'] = data.mbtlnb;
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
dlvylc['dlvylcZip'] = data.postcode;
dlvylc['dlvylcAdresDvCd'] = data.addressType;
dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
@@ -291,20 +289,11 @@
data: JSON.stringify(dlvylc),
dataType: 'json',
success: function (data) {
let result = JSON.parse(data.resBody.result);
if (result != null) {
if(result.status == 0) {
onSuccess();
} else {
$("#customAlertCn").text(result.message);
closeModal('confirm_updt_alert');
openModal2("custom_alert");
}
}
},
error: function (request, status, error) {
let message = JSON.parse(request.responseText).resBody.result;
alert(message);
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
alert(message.errorMsg);
}
});
}
@@ -433,8 +422,8 @@
form.submit();
}
/* 구독서비스 주문배송 목록 이동 */
const fn_go_subsvc_ordr_list = function (sopmalCd, ordrInnb) {
/* 주문배송 목록 이동 */
const fn_go_ordr_list = function (sopmalCd, ordrInnb) {
const form = $("#newForm");
form.submit();
}
@@ -670,7 +659,7 @@
<input type="hidden" id="orderReInnb" name="orderReInnb"/>
<input type="hidden" id="refundOrdrInnb" name="ordrInnb"/>
</form>
<form id="newForm" method="post" action="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm">
<form id="newForm" method="post" action="/sopmal/mpage/ordr/selectMbrOrdrListInqire">
<input type = "hidden" name = "bgnDt" value = "<c:out value = "${vo.bgnDt}"/>" />
<input type = "hidden" name = "endDt" value = "<c:out value = "${vo.endDt}"/>" />
<input type = "hidden" name = "srchwrd" value = "<c:out value = "${vo.srchwrd}"/>" />
@@ -681,294 +670,13 @@
<c:set var="setle" value="${data.setleList[0]}" />
<c:set var="setleTyCd" value="${setle.setleTyCd}" />
</c:if>
<%--환불 내역 시작--%>
<c:if test="${order.orderReInnb != null && order.orderReInnb ne ''}">
<div class="orderDetail">
<c:if test="${ not empty resultMap.result.refnd.refundComptDt }">
<div class="detailTop">
<p class="detailTop__title"><em>반품/환불 완료</em> <c:out value="${ resultMap.result.refnd.refundComptDt }"/></p>
</div>
</c:if>
<div class="orderDetailTop">
<span class="orderDetailTop__date">
<span class="misc">접수일 : </span><c:out value="${ resultMap.result.refnd.registDt }"/>
</span>
<span class="orderDetailTop__num">주문번호 <c:out value="${ resultMap.result.refnd.ordrInnb }"/></span>
</div>
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title"><c:if test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">반품/</c:if>환불 정보</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<div class="table-wrapper orderDetail__table">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 40%">
<col style="width: 60%">
</colgroup>
<tbody>
<tr>
<th><c:if test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">반품/</c:if>환불 상태</th>
<td>
<c:choose>
<c:when test="${ not empty resultMap.result.refnd.returnProcsSttusCd }">
<c:out value="${ resultMap.result.refnd.returnProcsSttusCdNm }"/>
</c:when>
<c:otherwise>
<c:out value="${ resultMap.result.refnd.refundProcsSttusCdNm }"/>
</c:otherwise>
</c:choose>
</td>
</tr>
<tr>
<th>반품/환불 번호</th>
<td>
<c:out value="${ resultMap.result.refnd.orderRefundInnb }"/>
</td>
</tr>
<tr>
<th>환불 종류</th>
<td><c:out value="${ resultMap.result.refnd.refundTyCdNm }"/></td>
</tr>
<c:if test="${ not empty resultMap.result.refnd.returnRceptDt}">
<tr>
<th>반품 접수일</th>
<td><c:out value="${ resultMap.result.refnd.returnRceptDt }"/></td>
</tr>
</c:if>
<tr>
<th>환불 접수일</th>
<td><c:out value="${ resultMap.result.refnd.refundReqstDt }"/></td>
</tr>
<c:if test="${ not empty resultMap.result.refnd.returnComptDt}">
<tr>
<th>반품 완료일</th>
<td><c:out value="${ resultMap.result.refnd.returnComptDt }"/></td>
</tr>
</c:if>
<c:if test = "${not empty resultMap.result.refnd.refundComptDt }">
<tr>
<th>환불 완료일</th>
<td><c:out value="${ resultMap.result.refnd.refundComptDt }"/></td>
</tr>
</c:if>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<c:if test="${ not empty resultMap.result.refnd.returnRceptDt }">
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">회수지 정보</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<div class="table-wrapper orderDetail__table">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 40%">
<col style="width: 60%">
</colgroup>
<tbody>
<tr>
<th>회수방법</th>
<td>
<c:out value="${ resultMap.result.refnd.returnMthCdNm }"/>
</td>
</tr>
<tr>
<th>주소</th>
<td>
<c:if test="${ not empty resultMap.result.refnd.senderZip }">
(<c:out value="${ resultMap.result.refnd.senderZip }"/>)
</c:if>
<c:choose>
<c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '01'}">
<c:out value="${ resultMap.result.refnd.senderRnmAdres }"/>
</c:when>
<c:when test="${ resultMap.result.refnd.senderAdresDvCd eq '02'}">
<c:out value="${ resultMap.result.refnd.senderLnbAdres }"/>
</c:when>
</c:choose>
<c:out value="${ resultMap.result.refnd.senderAdresDtl }"/>
</td>
</tr>
<tr>
<th>휴대폰 번호</th>
<td>
<c:out value="${ resultMap.result.refnd.returnCstmrMbtlnb }"/>
</td>
</tr>
<tr>
<th>반품 사유</th>
<td>
<c:out value="${ resultMap.result.refnd.returnResnCdNm }"/>
</td>
</tr>
<tr>
<th>상세 사유</th>
<td>
<c:out value="${ resultMap.result.refnd.returnResnCn }"/>
</td>
</tr>
<tr>
<th>배송비 입금</th>
<td>
<c:if test="${ not empty resultMap.result.refnd.returnDlvyRcpmnyAcntnb }">
<c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyAcntnb }"/><br>(예금주: <c:out value="${ resultMap.result.refnd.returnDlvyRcpmnyNm }"/>)
</c:if>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</c:if>
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">환불정보</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<div class="table-wrapper orderDetail__table">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 40%">
<col style="width: 60%">
</colgroup>
<tbody>
<tr>
<th>환불은행</th>
<td><c:out
value="${ resultMap.result.refnd.refundAcntBnnkNm }"/></td>
</tr>
<tr>
<th>예금주</th>
<td><c:out
value="${ resultMap.result.refnd.refundAcntDpstrNm }"/></td>
</tr>
<tr>
<th>계좌번호</th>
<td><c:out
value="${ resultMap.result.refnd.refundAcntnb }"/></td>
</tr>
<tr>
<th>환불사유내용</th>
<td><c:out
value="${ resultMap.result.refnd.refundResnCn }"/></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">환불 금액</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<c:set var="reTotAmt" value="${ resultMap.result.totRefundDscntAmt }"/>
<div class="table-wrapper orderDetail__table orderDetail__table--price">
<table class="table">
<caption>해당 테이블에 대한 설명</caption>
<!-- 각 열 width 설정 -->
<colgroup>
<col style="width: 40%">
<col style="width: 60%">
</colgroup>
<tbody>
<tr>
<th>총 상품금액</th>
<td>
<span class="orderDetail__table__productPrice">
<span class="comma"><c:out value="${ reTotAmt.refundAmtQySum }"/></span>${curUnit}
</span>
</td>
</tr>
<tr>
<th>총 배송비</th>
<td><span class="comma"><c:out value="${ reTotAmt.rlDlvyAmt }"/></span>${curUnit}</td>
</tr>
<tr>
<th>마일리지</th>
<td><span class="comma"><c:out value="${ reTotAmt.totRefundMlgAmt }"/></span>점</td>
</tr>
<tr>
<th>쿠폰</th>
<td><span class="comma"><c:out value="${ reTotAmt.totRefundCouponAmt }"/></span>${curUnit}</td>
</tr>
<c:if test="${ reTotAmt.totReturnDlvyAmt > 0}">
<tr>
<th>환불배송비</th>
<td><span class="comma"><c:out value="${ reTotAmt.totReturnDlvyAmt }"/></span>${curUnit}</td>
</tr>
</c:if>
<tr>
<th>총 차감금액</th>
<td>-<c:out value="${ reTotAmt.rlDlvyAmtRefundAmt }"/>${curUnit}</td>
</tr>
<c:if test="${ reTotAmt.rlDlvyAmtRefundAmt > 0}">
<tr class="orderDetail__table__discountSub">
<th><span>반품배송비</span></th>
<td>-<c:out value="${ reTotAmt.rlDlvyAmtRefundAmt }"/>${curUnit}</td>
</tr>
</c:if>
</tbody>
<tfoot class="orderDetail__table__sum">
<tr>
<th>총 환불금액</th>
<td>
<span class="comma"><c:out value="${ reTotAmt.rlRefundAmt }"/></span>${curUnit}
</td>
</tr>
<tr>
<th>실 환불금액</th>
<td>
<span class="comma"><c:out value="${ reTotAmt.realRefundAmt }"/></span>${curUnit} [<span class="comma"><c:out value="${ reTotAmt.realWonRefundAmt }"/></span>${krUnit}]
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</c:if>
<%--환불 내역 종료--%>
<div class="detailTop">
<p class="detailTop__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p>
<c:choose>
<c:when test="${order.ordrSttusCd == 25}">
<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
</c:when>
<c:when test="${(order.orderReInnb == null || order.orderReInnb eq '') && order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
<c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 71}">
<a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn gray2">구독취소</a>
</c:when>
</c:choose>
@@ -1106,6 +814,66 @@
</div>
</c:forEach>
</c:if>
<%--주문취소, 결제취소시 미노출--%>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">
적립금<%--<span class="misc">(최대 390원)</span>--%>
</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<div class="table-wrapper orderDetail__table">
<table class="table">
<colgroup>
<col style="width: 40%">
<col style="width: 60%">
</colgroup>
<tbody>
<tr>
<th>구매확정 시 적립예정</th>
<td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td>
</tr>
<tr>
<th>리뷰작성 시 적립예정</th>
<td>
<c:forEach var="ntc" items="${data.mlgAccmlNtcList}" varStatus="status">
<c:choose>
<c:when test="${'06' == ntc.bbsTyCd}">
<c:if test="${not empty ntc.gnrlRvwAmt}">
일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립
</c:if>
<c:if test="${not empty ntc.photoRvwAmt}">
<br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립
</c:if>
</c:when>
<c:otherwise>
<br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립
</c:otherwise>
</c:choose>
<c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}">
<fmt:parseDate value="${ntc.bgnDe}" var="bgnDeDate" pattern="yyyyMMdd"/>
<fmt:formatDate value="${bgnDeDate}" var="bgnDe" pattern="yyyy-MM-dd"/>
<fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/>
<fmt:formatDate value="${endDeDate}" var="endDe" pattern="yyyy-MM-dd"/>
<br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>점</i> 추가 적립)
</c:if>
</c:forEach>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</c:if>
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
@@ -1234,7 +1002,7 @@
</c:if>
<tr>
<th>결제금액</th>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit} / <span class="comma">${setle.wonSetleAmt}</span>${krUnit}</td>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
<tr <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>>
@@ -1255,6 +1023,47 @@
</td>
</tr>
</c:if>
<c:if test="${setle.reqstDvCd ne '04'}">
<c:if test="${not empty setle.issuSttusCd && order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
<%--현금영수증 발급상태가 존재하고, 주문상태가 주문취소, 결제취소가 아닐 때 노출--%>
<tr style="border-bottom: 0.5px solid #e9ecef;">
<th>현금영수증</th>
<td>
<c:choose>
<c:when test="${order.salesPosbleRegistAt eq 'N'}">
<span class="orderDetail__waiting"><c:out value="${setle.crtnb eq '0100001234' ? '미신청' : setle.crtnb}"/></span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','update');">정보수정</button>
</c:when>
<c:when test="${order.salesPosbleRegistAt eq 'Y' && setle.crtnb eq '0100001234'}">
<span class="orderDetail__waiting">미신청</span>
<button type="button" class="btn xsm gray2" onclick="fn_regist_popopen('<c:out value="${setle.selngPrufInnb}"/>','regist');">신청하기</button>
</c:when>
<c:otherwise>
<span class="orderDetail__waiting" id='ctrnb'><script>$("#ctrnb").text('${setle.issuSttusNm} ('+fn_format_mbtlnb('${setle.crtnb}')+')');</script></span>
<br/>
<span class="orderDetail__deduction"><c:out value="${setle.issuTrgetDvCd eq '01' ? '개인소득공제' : '사업자지출증빙'}"/></span>
<c:if test="${ !empty setle.cshRciptDelngNb }">
<%-- 현:현금영수증 --%>
<button type="button" class="btn xsm gray2" onclick="fn_open_selng_pruf_inqire_modal(
'<c:out value="${ setle.sopmalCd }" />'
,'<c:out value="${ setle.pgInnb }" />'
,'<c:out value="${ setle.pgCmpnyNm }" />'
,'<c:out value="${ setle.cshRciptDelngNb }" />'
,'<c:out value="${ setle.reqstDvCd }" />'
,'<c:out value="${ setle.setleTyCd }" />'
,'<c:out value="${ setle.ordrSetleInnb }" />'
,'<c:out value="${ setle.ordrInnb }" />'
,'<c:out value="${ setle.mid }" />'
,'<fmt:parseNumber value="${ setle.setleAmt }"/>'); return false;">
보기
</button>
</c:if>
</c:otherwise>
</c:choose>
</td>
</tr>
</c:if>
</c:if>
</tbody>
</table>
</c:forEach>
@@ -1264,63 +1073,126 @@
</div>
</div>
</div>
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">결제금액</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<c:set var="total" value="${data.total}"/>
<div class="table-wrapper orderDetail__table orderDetail__table--price">
<table class="table">
<colgroup>
<col style="width: 40%">
<col style="width: 60%">
</colgroup>
<tbody>
<tr>
<th>총 상품금액</th>
<td>
<span class="orderDetail__table__productPrice">
<span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span>${curUnit}
</span>
</td>
</tr>
<tr>
<th>할인금액</th>
<td>-<fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>${curUnit}</td>
</tr>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}">
<tr class="orderDetail__table__discountSub">
<th><span><c:out value="${dscnt.dscntDvNm}"/></span></th>
<td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</td>
</tr>
</c:if>
</c:forEach>
<tr>
<th>배송비</th>
<td><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}">
<tr class="orderDetail__table__discountSub">
<th><span><c:out value="${dscnt.dscntDvNm}"/></span></th>
<td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</td>
</tr>
</c:if>
</c:forEach>
</tbody>
<tfoot class="orderDetail__table__sum">
<tr>
<th>총 결제금액</th>
<td>
<span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit}
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
</div>
</div>
<%-- <c:if test="${not empty data.refundList}">--%>
<%-- <div class="sub-box">--%>
<%-- <div class="orderDetailProduct">--%>
<%-- <div class="orderDetailProduct__top" role="button" tabindex="0">--%>
<%-- <span class="orderDetailProduct__top__title">무효/취소/반품 내역</span>--%>
<%-- <span class="orderDetailProduct__top__chevron"></span>--%>
<%-- </div>--%>
<%-- <div class="orderDetail__content">--%>
<%-- <div class="orderDetail__body">--%>
<%-- <div class="table-wrapper orderDetail__table orderDetail__table--price">--%>
<%-- <table class="table">--%>
<%-- <colgroup>--%>
<%-- <col style="width: 40%">--%>
<%-- <col style="width: auto">--%>
<%-- <col style="width: auto">--%>
<%-- </colgroup>--%>
<%-- <tbody>--%>
<%-- <c:forEach var="refund" items="${data.refundList}">--%>
<%-- <tr>--%>
<%-- <th colspan="2">--%>
<%-- <strong>--%>
<%-- <c:out value="${refund.refundTyNm}"/>--%>
<%-- (<c:out value="${refund.refundProcsSttusNm }"/> <c:out value="${refund.orderRefundInnb}"/>)--%>
<%-- </strong>--%>
<%-- </th>--%>
<%-- <td><c:if test = "${order.ordrSttusCd ne '95'}"><button type="button" class="orderListItem__top__more" onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">상세보기</button></c:if></td>--%>
<%-- </tr>--%>
<%-- <tr>--%>
<%-- <th>접수일시</th>--%>
<%-- <td colspan="2"><c:out value="${refund.sumRefundReqstDt}"/></td>--%>
<%-- </tr>--%>
<%-- <c:if test = "${not empty refund.sumRefundComptDt}">--%>
<%-- <tr>--%>
<%-- <th> 처리일시</th>--%>
<%-- <td colspan="2"><c:out value="${refund.sumRefundComptDt}"/></td>--%>
<%-- </tr>--%>
<%-- </c:if>--%>
<%-- <tr>--%>
<%-- <th>처리수량</th>--%>
<%-- <td colspan="2"><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/>개</td>--%>
<%-- </tr>--%>
<%-- <tr style="border-bottom: 1px solid #e9ecef;">--%>
<%-- <th>처리금액</th>--%>
<%-- <td colspan="2"><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/>${curUnit}</td>--%>
<%-- </tr>--%>
<%-- </c:forEach>--%>
<%-- </tbody>--%>
<%-- </table>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </c:if>--%>
<c:if test="${not empty data.refundList}">
<div class="sub-box">
<div class="orderDetailProduct">
<div class="orderDetailProduct__top" role="button" tabindex="0">
<span class="orderDetailProduct__top__title">무효/취소/반품 내역</span>
<span class="orderDetailProduct__top__chevron"></span>
</div>
<div class="orderDetail__content">
<div class="orderDetail__body">
<div class="table-wrapper orderDetail__table orderDetail__table--price">
<table class="table">
<colgroup>
<col style="width: 40%">
<col style="width: auto">
<col style="width: auto">
</colgroup>
<tbody>
<c:forEach var="refund" items="${data.refundList}">
<tr>
<th colspan="2">
<strong>
<c:out value="${refund.refundTyNm}"/>
(<c:out value="${refund.refundProcsSttusNm }"/> <c:out value="${refund.orderRefundInnb}"/>)
</strong>
</th>
<td><c:if test = "${order.ordrSttusCd ne '95'}"><button type="button" class="orderListItem__top__more" onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">상세보기</button></c:if></td>
</tr>
<tr>
<th>접수일시</th>
<td colspan="2"><c:out value="${refund.sumRefundReqstDt}"/></td>
</tr>
<c:if test = "${not empty refund.sumRefundComptDt}">
<tr>
<th> 처리일시</th>
<td colspan="2"><c:out value="${refund.sumRefundComptDt}"/></td>
</tr>
</c:if>
<tr>
<th>처리수량</th>
<td colspan="2"><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/>개</td>
</tr>
<tr style="border-bottom: 1px solid #e9ecef;">
<th>처리금액</th>
<td colspan="2"><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/>${curUnit}</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</c:if>
<div class="fullBtnSection">
<button type="button" onclick="fn_go_subsvc_ordr_list('${order.sopmalCd}', '${order.ordrInnb}')" class="btn md outline full">목록</button>
<button type="button" onclick="fn_go_ordr_list('${order.sopmalCd}', '${order.ordrInnb}')" class="btn md outline full">목록</button>
</div>
</div>
</div>

10
src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp
View File

@@ -2488,16 +2488,6 @@
let setle = {};
let dlvylc = JSON.parse(localStorage.getItem('dlvylc'));
if (!fn_is_empty(dlvylc)) {
dlvylc = Object.assign({}, fn_get_dlvylc_data(), dlvylc);
} else {
dlvylc = fn_get_dlvylc_data();
}
order['shipping'] = dlvylc;
setle['sopmalCd'] = $('#sopmalCd').val();
setle['dlvylc'] = JSON.parse(localStorage.getItem('dlvylc'));
setle['goodsList'] = JSON.parse(localStorage.getItem('goodsList'));