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

장바구니 및 구매패이지 원화 추가(1)

Browse Source
This commit is contained in:
김현욱
2026-03-10 15:36:44 +09:00
parent 89d0978728
commit da9076981c
7 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -671,6 +671,8 @@ public interface BOOrdrMapper {
*/
public DataMap selectBOSpbkGiftMultiDlvyAt(BOSpbkVO spbkVO);
public BigDecimal selectBuyRate(DataMap param);
/**
* 사용자 > 상품 > 장바구니 > 장바구니 상품 삭제
* @param goodsVO

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

@@ -3047,6 +3047,7 @@ public class BOOrdrService{
put("useCashMlgAmt", 0);
put("dscntAmt", 0);
put("setleAmt", 0);
put("setleAmtKr", 0);
put("accmlMlgAmt", 0);
}};
@@ -3069,6 +3070,7 @@ public class BOOrdrService{
BigDecimal dftDlvyAmt = new BigDecimal(0);
BigDecimal setleAmt = new BigDecimal(0);
BigDecimal setleAmtKr = new BigDecimal(0);
BigDecimal stdrGoodsSetleAmt = new BigDecimal(0); // 상품 금액만 계산한 기준 금액
BigDecimal lmttUseMlg = new BigDecimal(0); // 사용 한도 마일리지
BigDecimal lmttUseCashMlg = new BigDecimal(0); // 사용 한도 충전형 마일리지
@@ -3082,6 +3084,8 @@ public class BOOrdrService{
BigDecimal enuriStdrAmt = new BigDecimal(0); // 애누리 적용 기준 금액
BigDecimal cashMlgStdrAmt = new BigDecimal(0); // 캐쉬 적용 기준 금액
BigDecimal buyRate = mapper.selectBuyRate(param);
String mlgMxmmUseDv = ""; // 마일리지 사용한도 최대 조건
BigDecimal mlgAccmlAmtSum = new BigDecimal(0); // 최종 구매 확정시 적립 마일리지
@@ -3803,6 +3807,9 @@ public class BOOrdrService{
rlDscntAmt = evtDscntAmt.add(goodsCouponDscntAmt).add(dlvyCouponDscntAmt).add(cartCouponDscntAmt).add(enuriAmt).add(useMlgAmt).add(useCashMlgAmt);
log.debug(" 마일리지 먹이기 전 : {}", setleAmt);
setleAmt = setleAmt.add(dlvyAmt).subtract(dlvyCouponDscntAmt).subtract(enuriAmt).subtract(useMlgAmt).subtract(useCashMlgAmt).compareTo(BigDecimal.ZERO) > 0 ? setleAmt.add(dlvyAmt).subtract(dlvyCouponDscntAmt).subtract(enuriAmt).subtract(useMlgAmt).subtract(useCashMlgAmt) : BigDecimal.ZERO;
// 환율계산
setleAmtKr = setleAmt.multiply(buyRate);
setleAmtKr = setleAmtKr.setScale(0,RoundingMode.HALF_UP);
lmttUseMlg = goodsAmt.subtract(dscntAmt.add(cartCouponDscntAmt));
log.debug(" 결제 예정 금액 : {}", setleAmt);
@@ -3821,6 +3828,7 @@ public class BOOrdrService{
setleExpectAmtMap.put("dscntAmt", rlDscntAmt.intValue());
setleExpectAmtMap.put("viewCartDscntAmt", dscntAmt.intValue());
setleExpectAmtMap.put("setleAmt", setleAmt.intValue());
setleExpectAmtMap.put("setleAmtKr", setleAmtKr.intValue());
setleExpectAmtMap.put("stdrGoodsSetleAmt", stdrGoodsSetleAmt.intValue());
setleExpectAmtMap.put("lmttUseMlg", lmttUseMlg.intValue());
setleExpectAmtMap.put("lmttUseCashMlg", lmttUseCashMlg.intValue());

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

@@ -4276,6 +4276,7 @@
AND FC.CART_DV_CD = #{cartDvCd}
ORDER BY FC.REGIST_DT DESC
</select>
<!--사용자 > 상품 > 장바구니 목록 > 선물하기,여러곳배송 버튼 활성화 여부 -->
<select id="selectBOSpbkGiftMultiDlvyAt" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOSpbkVO" resultType="dataMap">
SELECT GS.SOPMAL_CD
@@ -4286,6 +4287,14 @@
AND GS.SOPMAL_CD= #{sopmalCd}
</select>
<!--살때 환율 조회 -->
<select id="selectBuyRate" parameterType="dataMap" resultType="BigDecimal">
SELECT GS.BUY_RATE
FROM GC_SHOP GS
WHERE 1=1
AND GS.SOPMAL_CD= #{sopmalCd}
</select>
<!--장바구니 상태 변경 -->
<update id="updateBOSpbkCartDvCd" parameterType="dataMap">
UPDATE

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

@@ -2572,6 +2572,7 @@
$('#accmlMlgAmtSapn').text((data.accmlMlgAmt).toLocaleString());
$('#setleAmtSapn').text((data.setleAmt).toLocaleString());
$('#setleAmtKrSapn').text((data.setleAmtKr).toLocaleString());
let li = '';
@@ -2654,6 +2655,7 @@
$('#enuriForm').find('#stdrGoodsSetleAmt').val(data.stdrGoodsSetleAmt);
$('#enuriForm').find('#cartCoupondlvyAmt').val(data.dlvyAmt);
$('#setleForm').find('#rlSetleAmt').val(data.setleAmt);
$('#setleForm').find('#wonRlSetleAmt').val(data.setleAmtKr);
}
if (!fn_is_empty(data.lmttUseMlg)) {
@@ -4054,6 +4056,7 @@
<form id="setleForm">
<input type="hidden" name="rlSetleAmt" id="rlSetleAmt" value="">
<input type="hidden" name="wonRlSetleAmt" id="wonRlSetleAmt" value="">
<input type="hidden" name="lmttUseMlg" id="lmttUseMlg" value="">
<input type="hidden" name="lmttUseCashMlg" id="lmttUseCashMlg" value="">
<input type="hidden" name="siteCdMid" id="siteCdMid" value="<c:out value="${payInfo.kcpMid}"/>">
@@ -4426,9 +4429,13 @@
<span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span id="dscntAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
</li>
</ul>
<div class="cartOrderBox__total">
<div class="cartOrderBox__total" style="margin-bottom: 5px;">
<span class="cartOrderBox__totalTh">총 결제금액</span>
<span class="cartOrderBox__totalTd"><span id="setleAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
<span class="cartOrderBox__td"><span id="setleAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
</div>
<div class="cartOrderBox__total" style="margin-top: 5px;">
<span class="cartOrderBox__totalTh"></span>
<span class="cartOrderBox__totalTd"><span id="setleAmtKrSapn" class="comma">0</span><span class="priceUnit">원</span></span>
</div>
<%--광고 수신 동의 여부가 null 일 시 --%>
<c:if test="${empty purchsr.marktRecptnAgreAt}">

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

@@ -465,6 +465,7 @@
$(ul).find('#dscntAmtSapn').text((data.dscntAmt).toLocaleString());
$('#setleAmtSapn').text((data.setleAmt).toLocaleString());
$('#setleAmtKrSapn').text((data.setleAmtKr).toLocaleString());
let li = '';
@@ -1477,9 +1478,13 @@
<span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span id="dscntAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
</li>
</ul>
<div class="cartOrderBox__total">
<div class="cartOrderBox__total" style="margin-bottom: 5px;">
<span class="cartOrderBox__totalTh">결제예정금액</span>
<span class="cartOrderBox__totalTd"><span id="setleAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
<span class="cartOrderBox__td"><span id="setleAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
</div>
<div class="cartOrderBox__total" style="margin-top: 5px;">
<span class="cartOrderBox__totalTh"></span>
<span class="cartOrderBox__totalTd"><span id="setleAmtKrSapn" class="comma">0</span><span class="priceUnit">원</span></span>
</div>
<div class="">
<span class="text">&#8251; 쿠폰 적용가는 최종 결제창에서 확인 가능합니다.</span>

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

@@ -2587,6 +2587,7 @@
$('#accmlMlgAmtSapn').text((data.accmlMlgAmt).toLocaleString() + curUnit);
$('.setleAmtSapn').text((data.setleAmt).toLocaleString());
$('.setleAmtKrSapn').text((data.setleAmtKr).toLocaleString());
let tr = '';
@@ -4510,7 +4511,7 @@
<div class="bottomFixedControls__inner">
<dl class="bottomFixedControls__totalPrice">
<dt>총 금액</dt>
<dd><span class="setleAmtSapn comma"></span><span class="priceUnit">${curUnit}</span></dd>
<dd><span class="setleAmtSapn comma"></span><span class="priceUnit">${curUnit}</span> / <span class="setleAmtKrSapn comma"></span><span class="priceUnit">원</span></dd>
</dl>
</div>
<div class="bottomFixedControls__inner">

5
src/main/webapp/WEB-INF/views/sopmal_m/ordr/SpbkPtinR.jsp
View File

@@ -442,6 +442,9 @@
$(ul).find('#dscntAmtSapn').text((data.dscntAmt).toLocaleString());
$('#setleAmtSapn, #totalAmtSapn').text((data.setleAmt).toLocaleString());
// $('#setleAmtKrSapn, #totalAmtKrSapn').text((data.setleAmtKr).toLocaleString());
$('#totalAmtKrSapn').text((data.setleAmtKr).toLocaleString());
let li = '';
@@ -1439,7 +1442,7 @@
<div class="bottomFixedControls__inner">
<dl class="bottomFixedControls__totalPrice">
<dt>총 금액</dt>
<dd><span id="totalAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></dd>
<dd><span id="totalAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span> / <span id="totalAmtKrSapn" class="comma">0</span><span class="priceUnit">원</span></dd>
</dl>
</div>
<div class="bottomFixedControls__inner">