이태영 - 20210503 장바구니 적립예정포인트 판매가 계산 > 다다익선 할인가 계산으로 변경

src/main/java/com/style24/front/biz/service/TsfCartService.java

@@ -488,6 +488,11 @@ public class TsfCartService {
 				if (cart.getTmtbDcAmt() == 0) {
 					cart.setTmtbDcAmt(cart.getCurrPrice());
 				}
+				if(cart.getPntRate() > 0) {
+					cart.setSavePntAmt((int) (cart.getTmtbDcAmt() * cart.getPntRate() / 100.0));
+				} else {
+					cart.setSavePntAmt(0);
+				}
 			}
 		}
 

src/main/java/com/style24/persistence/mybatis/shop/TsfCart.xml

@@ -464,7 +464,8 @@
 		                   FROM   TB_TMTB_SECTION TS
 		                   WHERE  TS.DEL_YN = 'N'
 		                   GROUP  BY TS.TMTB_SQ) TS
-		ON TC.TMTB_SQ = TS.TMTB_SQ
+		ON     TC.TMTB_SQ = TS.TMTB_SQ
+		AND    TC.SECTION_VAL = TS.SECTION_VAL
 		WHERE  1=1
 		AND	   TC.DEL_YN = 'N'
 		AND	   TV.DEL_YN = 'N'
@@ -510,8 +511,7 @@
 		     , (Z.CURR_PRICE + SUM(Z.OPT_ADD_PRICE)) * Z.GOODS_QTY AS CURR_PRICE
 		     , (Z.LIST_PRICE + SUM(Z.OPT_ADD_PRICE)) * Z.GOODS_QTY AS LIST_PRICE
 		     , Z.SOLDOUT_YN
-		     , CASE WHEN #{frontGb} = 'P' THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_PRATE/100)
-		            ELSE (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100) END AS SAVE_PNT_AMT
+		     , CASE WHEN #{frontGb} = 'P' THEN Z.PNT_PRATE ELSE Z.PNT_MRATE END AS PNT_RATE
 		     , SYS_IMG_NM
 		FROM   (SELECT C.CART_SQ
 		             , C.GOODS_CD
@@ -695,7 +695,7 @@
 		     , CURR_PRICE
 		     , LIST_PRICE
 		     , Z.SOLDOUT_YN
-		     , SAVE_PNT_AMT
+		     , PNT_RATE
 		     , SYS_IMG_NM
 		ORDER  BY Z.DELV_FEE_CD DESC
 		     , Z.GOODS_CD DESC

src/main/webapp/WEB-INF/views/web/cart/CartDelvFeeSaveGoodsPopupWeb.html

@@ -33,7 +33,7 @@
 								</div>
 							</div>
 							<!-- Add Scrollbar -->
-							<div class="swiper-scrollbar"></div>
+							<div class="swiper-scrollbar" th:if="${goodsList.size() > 5}"></div>
 							<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
 						</div>
 					</div>

src/main/webapp/WEB-INF/views/web/cart/CartTmtbSalesGoodsPopupWeb.html

@@ -41,7 +41,7 @@
 							</div>
 						</div>
 						<!-- Add Scrollbar -->
-						<div class="swiper-scrollbar" style="opacity: 0; transition-duration: 400ms;"><div class="swiper-scrollbar-drag" style="width: 514.104px; transform: translate3d(0px, 0px, 0px);"></div></div>
+						<div class="swiper-scrollbar" th:if="${goodsList.size() > 5}" style="opacity: 0; transition-duration: 400ms;"><div class="swiper-scrollbar-drag" style="width: 514.104px; transform: translate3d(0px, 0px, 0px);"></div></div>
 						<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span></div>
 				</div>
 				<!-- -->