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

fix : 구독서비스 주문/배송 - 적립금 관련 표시 제거

Browse Source 
fix : 주문결제 > 배송지 정보 세팅 - 배송지역코드 관련 로직 추가
This commit is contained in:
이대환
2026-02-13 17:48:33 +09:00
parent 2448e856ba
commit 40dc7f7c85
8 changed files with 124 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -2036,6 +2036,7 @@ public class BOOrdrService{
log.debug("param{}",param); log.debug("param{}",param);
paramVO.setRecpntNm((String) param.get("recpntNm")); paramVO.setRecpntNm((String) param.get("recpntNm"));
paramVO.setRecpntMbtlnb((String) param.get("recpntMbtlnb")); paramVO.setRecpntMbtlnb((String) param.get("recpntMbtlnb"));
paramVO.setDlvylcAreaCd((String) param.get("dlvylcAreaCd"));
paramVO.setDlvylcZip((String) param.get("dlvylcZip")); paramVO.setDlvylcZip((String) param.get("dlvylcZip"));
paramVO.setDlvylcAdresDvCd((String) param.get("dlvylcAdresDvCd")); paramVO.setDlvylcAdresDvCd((String) param.get("dlvylcAdresDvCd"));
paramVO.setDlvylcLnbAdres((String) param.get("dlvylcLnbAdres")); paramVO.setDlvylcLnbAdres((String) param.get("dlvylcLnbAdres"));
@@ -2050,11 +2051,20 @@ public class BOOrdrService{
AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
paramVO.setUpdusr(user.getUserInnb()); paramVO.setUpdusr(user.getUserInnb());
int cnt = mapper.updateDlvylcInfo(paramVO); /* 배송지정보 일치여부 확인 이후 업데이트 */
int cnt = mapper.selectDlvylcAreaCdInfo(paramVO);
if (cnt == 0) { if (cnt == 0) {
message.put("status", "1"); message.put("status", "1");
message.put("message", "배송지 수정을 실패하였습니다"); message.put("message", "배송지 국가는 변경할 수 없습니다.");
}
if(cnt > 0) {
cnt = mapper.updateDlvylcInfo(paramVO);
if (cnt == 0) {
message.put("status", "1");
message.put("message", "배송지 수정을 실패하였습니다");
}
} }
return message; return message;

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

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

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

@@ -2234,6 +2234,16 @@
]]> ]]>
</select> </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 id="updateDlvylcInfo" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO">
UPDATE GC_ORDER_SHIPPING FOS UPDATE GC_ORDER_SHIPPING FOS
@@ -2265,6 +2275,7 @@
WHERE FOS.SOPMAL_CD = #{sopmalCd} WHERE FOS.SOPMAL_CD = #{sopmalCd}
AND FOS.ORDR_INNB = #{ordrInnb} AND FOS.ORDR_INNB = #{ordrInnb}
AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb} AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
AND FOS.DLVYLC_AREA_CD = #{dlvylcAreaCd}
</update> </update>
<!-- 주문메모 목록 조회 --> <!-- 주문메모 목록 조회 -->

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

@@ -33,11 +33,11 @@
<div class="orderList__description__second"> <div class="orderList__description__second">
<span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span> <span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
</div> </div>
<div class="orderList__description__third"> <%-- <div class="orderList__description__third">--%>
<c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}"> <%-- <c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}">--%>
<span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span> <%-- <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>--%>
</c:if> <%-- </c:if>--%>
</div> <%-- </div>--%>
<div class="orderList__description__fourth"> <div class="orderList__description__fourth">
<c:choose> <c:choose>
<c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}"> <c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}">

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

@@ -576,6 +576,7 @@
dlvylc['recpntNm'] = data.recpntNm; dlvylc['recpntNm'] = data.recpntNm;
dlvylc['recpntMbtlnb'] = data.mbtlnb; dlvylc['recpntMbtlnb'] = data.mbtlnb;
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
dlvylc['dlvylcZip'] = data.postcode; dlvylc['dlvylcZip'] = data.postcode;
dlvylc['dlvylcAdresDvCd'] = data.addressType; dlvylc['dlvylcAdresDvCd'] = data.addressType;
dlvylc['dlvylcLnbAdres'] = data.jibunAddress; dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
@@ -589,10 +590,14 @@
data:JSON.stringify(dlvylc), data:JSON.stringify(dlvylc),
dataType:'json', dataType:'json',
success:function(data) { success:function(data) {
if (data.resBody != null) { let result = JSON.parse(data.resBody.result);
alert('<spring:message code="success.common.update"/>'); if (result != null) {
if(result.status == 0) {
location.reload(); alert('<spring:message code="success.common.update"/>');
location.reload();
} else {
alert(result.message);
}
} }
}, },
error:function(request, status, error) { error:function(request, status, error) {
@@ -1212,7 +1217,7 @@
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 12%;"> <col style="width: 12%;">
<col style="width: 10%;"> <%-- <col style="width: 10%;">--%>
<col style="width: 10%;"> <col style="width: 10%;">
</colgroup> </colgroup>
<thead> <thead>
@@ -1222,7 +1227,7 @@
<th>상품금액</th> <th>상품금액</th>
<th>할인금액</th> <th>할인금액</th>
<th>할인적용금액</th> <th>할인적용금액</th>
<th>적립금</th> <%-- <th>적립금</th>--%>
<th>처리상태</th> <th>처리상태</th>
</tr> </tr>
</thead> </thead>
@@ -1264,12 +1269,12 @@
<span class="priceUnit">${curUnit}</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <%--<td>
<span class="cartItem__mileage"> <span class="cartItem__mileage">
<span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span> <span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span>
<span class="priceUnit">점</span> <span class="priceUnit">점</span>
</span> </span>
</td> </td>--%>
<td> <td>
<a class="orderList__status"> <a class="orderList__status">
<c:choose> <c:choose>

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

@@ -163,7 +163,8 @@
if (row.optnNm != null) { if (row.optnNm != null) {
div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>'; 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 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}';
div += ' </p>'; div += ' </p>';
div += ' </div>'; div += ' </div>';
div += ' </div>'; div += ' </div>';

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

@@ -271,6 +271,7 @@
dlvylc['recpntNm'] = data.recpntNm; dlvylc['recpntNm'] = data.recpntNm;
dlvylc['recpntMbtlnb'] = data.mbtlnb; dlvylc['recpntMbtlnb'] = data.mbtlnb;
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
dlvylc['dlvylcZip'] = data.postcode; dlvylc['dlvylcZip'] = data.postcode;
dlvylc['dlvylcAdresDvCd'] = data.addressType; dlvylc['dlvylcAdresDvCd'] = data.addressType;
dlvylc['dlvylcLnbAdres'] = data.jibunAddress; dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
@@ -289,7 +290,16 @@
data: JSON.stringify(dlvylc), data: JSON.stringify(dlvylc),
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
onSuccess(); 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) { error: function (request, status, error) {
let message = JSON.parse(JSON.parse(request.responseText).resBody.message); let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
@@ -815,64 +825,65 @@
</c:forEach> </c:forEach>
</c:if> </c:if>
<%--주문취소, 결제취소시 미노출--%> <%--주문취소, 결제취소시 미노출--%>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"> <%--적립금 표시 제거--%>
<div class="sub-box"> <%-- <c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">--%>
<div class="orderDetailProduct"> <%-- <div class="sub-box">--%>
<div class="orderDetailProduct__top" role="button" tabindex="0"> <%-- <div class="orderDetailProduct">--%>
<span class="orderDetailProduct__top__title"> <%-- <div class="orderDetailProduct__top" role="button" tabindex="0">--%>
적립금<%--<span class="misc">(최대 390원)</span>--%> <%-- <span class="orderDetailProduct__top__title">--%>
</span> <%-- 적립금&lt;%&ndash;<span class="misc">(최대 390원)</span>&ndash;%&gt;--%>
<span class="orderDetailProduct__top__chevron"></span> <%-- </span>--%>
</div> <%-- <span class="orderDetailProduct__top__chevron"></span>--%>
<div class="orderDetail__content"> <%-- </div>--%>
<div class="orderDetail__body"> <%-- <div class="orderDetail__content">--%>
<div class="table-wrapper orderDetail__table"> <%-- <div class="orderDetail__body">--%>
<table class="table"> <%-- <div class="table-wrapper orderDetail__table">--%>
<colgroup> <%-- <table class="table">--%>
<col style="width: 40%"> <%-- <colgroup>--%>
<col style="width: 60%"> <%-- <col style="width: 40%">--%>
</colgroup> <%-- <col style="width: 60%">--%>
<tbody> <%-- </colgroup>--%>
<tr> <%-- <tbody>--%>
<th>구매확정 시 적립예정</th> <%-- <tr>--%>
<td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td> <%-- <th>구매확정 시 적립예정</th>--%>
</tr> <%-- <td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td>--%>
<tr> <%-- </tr>--%>
<th>리뷰작성 시 적립예정</th> <%-- <tr>--%>
<td> <%-- <th>리뷰작성 시 적립예정</th>--%>
<c:forEach var="ntc" items="${data.mlgAccmlNtcList}" varStatus="status"> <%-- <td>--%>
<c:choose> <%-- <c:forEach var="ntc" items="${data.mlgAccmlNtcList}" varStatus="status">--%>
<c:when test="${'06' == ntc.bbsTyCd}"> <%-- <c:choose>--%>
<c:if test="${not empty ntc.gnrlRvwAmt}"> <%-- <c:when test="${'06' == ntc.bbsTyCd}">--%>
일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립 <%-- <c:if test="${not empty ntc.gnrlRvwAmt}">--%>
</c:if> <%-- 일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립--%>
<c:if test="${not empty ntc.photoRvwAmt}"> <%-- </c:if>--%>
<br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립 <%-- <c:if test="${not empty ntc.photoRvwAmt}">--%>
</c:if> <%-- <br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립--%>
</c:when> <%-- </c:if>--%>
<c:otherwise> <%-- </c:when>--%>
<br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립 <%-- <c:otherwise>--%>
</c:otherwise> <%-- <br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립--%>
</c:choose> <%-- </c:otherwise>--%>
<c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}"> <%-- </c:choose>--%>
<fmt:parseDate value="${ntc.bgnDe}" var="bgnDeDate" pattern="yyyyMMdd"/> <%-- <c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}">--%>
<fmt:formatDate value="${bgnDeDate}" var="bgnDe" pattern="yyyy-MM-dd"/> <%-- <fmt:parseDate value="${ntc.bgnDe}" var="bgnDeDate" pattern="yyyyMMdd"/>--%>
<fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/> <%-- <fmt:formatDate value="${bgnDeDate}" var="bgnDe" pattern="yyyy-MM-dd"/>--%>
<fmt:formatDate value="${endDeDate}" var="endDe" 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> <%-- <br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>점</i> 추가 적립)--%>
</c:forEach> <%-- </c:if>--%>
</td> <%-- </c:forEach>--%>
</tr> <%-- </td>--%>
</tbody> <%-- </tr>--%>
</table> <%-- </tbody>--%>
</div> <%-- </table>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
</c:if> <%-- </div>--%>
<%-- </c:if>--%>
<div class="sub-box"> <div class="sub-box">
<div class="orderDetailProduct"> <div class="orderDetailProduct">