fix : 구독서비스 주문/배송
This commit is contained in:
이대환
@@ -1823,7 +1823,7 @@ public class BOOrdrService{
|
|||||||
if(resultList == null || resultList.size() == 0){
|
if(resultList == null || resultList.size() == 0){
|
||||||
ordrDlvyVO.getPaginationInfo().setTotalRecordCount(0);
|
ordrDlvyVO.getPaginationInfo().setTotalRecordCount(0);
|
||||||
}else{
|
}else{
|
||||||
ordrDlvyVO.getPaginationInfo().setTotalRecordCount(Integer.parseInt((String)resultList.get(0).get("totCnt")));
|
ordrDlvyVO.getPaginationInfo().setTotalRecordCount(Integer.parseInt(String.valueOf(resultList.get(0).get("totCnt"))));
|
||||||
}
|
}
|
||||||
|
|
||||||
return resultList;
|
return resultList;
|
||||||
|
|||||||
@@ -157,18 +157,18 @@ public class MyOrdrController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 목록 조회 화면 이동
|
* 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 목록 조회 화면 이동
|
||||||
* @return SubsvcOrdrDlvyListR.jsp
|
* @return SubsvcOrdrDlvyListRForm.jsp
|
||||||
*/
|
*/
|
||||||
@Policy(AuthPolicy.RESTRICTED)
|
@Policy(AuthPolicy.RESTRICTED)
|
||||||
@RequestMapping(value="/selectMbrSubsvcOrdrListInqire")
|
@RequestMapping(value="/selectMbrSubsvcOrdrListInqireRForm")
|
||||||
public String selectMbrSubsvcOrdrListInqire(HttpServletRequest request, ModelMap model, MyOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
|
public String selectMbrSubsvcOrdrListInqireForm(HttpServletRequest request, ModelMap model, MyOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
|
||||||
model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
|
model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
|
||||||
|
|
||||||
// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
|
// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
|
||||||
Map<String, Object> content = selectBOMpageInfoInqire(vo);
|
Map<String, Object> content = selectBOMpageInfoInqire(vo);
|
||||||
model.addAttribute("mpageResultMap", content);
|
model.addAttribute("mpageResultMap", content);
|
||||||
|
|
||||||
return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListR";
|
return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListRForm";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -182,7 +182,7 @@ public class MyOrdrController {
|
|||||||
|
|
||||||
Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
|
Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
|
||||||
model.addAttribute("data", content);
|
model.addAttribute("data", content);
|
||||||
return "sopmal/mpage/ordr/SubsvcOrdrDlvyListRList";
|
return "sopmal/mpage/ordr/SubsvcOrdrDlvyListR";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,122 +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"%>
|
|
||||||
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
|
|
||||||
|
|
||||||
<c:choose>
|
|
||||||
<c:when test="${not empty data.resultList}">
|
|
||||||
<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_ordr_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> ${order.ordrTyCdNm}</span>
|
|
||||||
</div>
|
|
||||||
<a href="javascript:void(0);" onclick="fn_go_ordr_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.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:choose>
|
|
||||||
<c:if test="${ order.ordrTyCd == '04'}">
|
|
||||||
<br/>
|
|
||||||
<c:choose>
|
|
||||||
<c:when test="${order.giftSttusCd == '01' }">
|
|
||||||
<span class="orderList__status">(<c:out value="${order.giftSttusCdNm}"/>)</span>
|
|
||||||
</c:when>
|
|
||||||
<c:when test="${order.giftSttusCd == '02' }">
|
|
||||||
<span class="orderList__status delivery">(<c:out value="${order.giftSttusCdNm}"/>)</span>
|
|
||||||
</c:when>
|
|
||||||
<c:when test="${order.giftSttusCd == '03' }">
|
|
||||||
<span class="orderList__status cancel">(<c:out value="${order.giftSttusCdNm}"/>)</span>
|
|
||||||
</c:when>
|
|
||||||
<c:when test="${order.giftSttusCd == '04' }">
|
|
||||||
<span class="orderList__status cancel">(<c:out value="${order.giftSttusCdNm}"/>)</span>
|
|
||||||
</c:when>
|
|
||||||
</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' }">--%>
|
|
||||||
<%--<%– <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>–%>--%>
|
|
||||||
<%-- <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>
|
|
||||||
</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>
|
|
||||||
<div class="pagination__container" style="margin-top: 20px">
|
|
||||||
<ui:pagination paginationInfo="${data.paginationInfo}" type="image" jsFunction="fn_get_ordr_dlvy_list"/>
|
|
||||||
</div>
|
|
||||||
Reference in New Issue
Block a user