Merge branch 'develop' into jmh

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

@@ -7,6 +7,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import com.gagaframework.web.parameter.GagaParameterUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 장바구니 Service
  *
@@ -69,7 +72,7 @@ public class TsfCartService {
 	 * @param params
 	 */
 	@Transactional("shopTxnManager")
-	public GagaMap saveCartInfo(Collection<Cart> params) {
+	public GagaMap saveCartInfo(Collection<Cart> params, HttpServletRequest request) {
 		GagaMap result = new GagaMap();
 		List<Integer> cartSqList = new ArrayList<>();
 		String newCustCanYn = "Y";
@@ -198,7 +201,7 @@ public class TsfCartService {
 
 			// 2021.04.13 jsh77b 주문서에서 유효성 체크를 위해서 추가
 			if ("C".equals(checkGb)) {
-				saveSetTypeCartInfo(params, cartSqList);
+				saveSetTypeCartInfo(params, cartSqList, request);
 			}
 		} else {
 			for (Cart param : params) {
@@ -293,7 +296,7 @@ public class TsfCartService {
 			
 			// 2021.04.13 jsh77b 주문서에서 유효성 체크를 위해서 추가
 			if ("C".equals(checkGb)) {
-				saveNormalDealCartInfo(params, cartSqList);
+				saveNormalDealCartInfo(params, cartSqList, request);
 			}
 		}
 
@@ -322,7 +325,7 @@ public class TsfCartService {
 	}
 
 	@Transactional("shopTxnManager")
-	public void saveSetTypeCartInfo(Collection<Cart> params, List<Integer> cartSqs) {
+	public void saveSetTypeCartInfo(Collection<Cart> params, List<Integer> cartSqs, HttpServletRequest request) {
 		Cart cart = new Cart();
 		StringBuilder sb = new StringBuilder();
 		String cartGb = "";
@@ -404,6 +407,29 @@ public class TsfCartService {
 					cartDao.updateCartInfo(cart);               // 장바구니 정보 수정
 				}
 			} else {
+				if(request != null) {
+					GagaMap requestParam = GagaParameterUtil.getParameterMap(request);
+					if (org.apache.commons.lang3.StringUtils.isBlank(cart.getAfLinkCd())) {
+						cart.setAfLinkCd(requestParam.getString("afLinkCd"));
+					}
+					if (org.apache.commons.lang3.StringUtils.isBlank(cart.getContentsLoc())) {
+						cart.setAfLinkCd(requestParam.getString("contentsLoc"));
+					}
+					if (org.apache.commons.lang3.StringUtils.isBlank(cart.getIthrCd())) {
+						cart.setAfLinkCd(requestParam.getString("ithrCd"));
+					}
+				}
+
+				if (org.apache.commons.lang3.StringUtils.isBlank(cart.getAfLinkCd())) {
+					cart.setAfLinkCd(null);
+				}
+				if (org.apache.commons.lang3.StringUtils.isBlank(cart.getContentsLoc())) {
+					cart.setAfLinkCd(null);
+				}
+				if (org.apache.commons.lang3.StringUtils.isBlank(cart.getIthrCd())) {
+					cart.setAfLinkCd(null);
+				}
+
 				cartDao.insertCartInfo(cart);					// 장바구니 마스터 정보 저장
 
 				cartSqs.add(cart.getCartSq());
@@ -438,7 +464,7 @@ public class TsfCartService {
 	}
 
 	@Transactional("shopTxnManager")
-	public void saveNormalDealCartInfo(Collection<Cart> params, List<Integer> cartSqs) {
+	public void saveNormalDealCartInfo(Collection<Cart> params, List<Integer> cartSqs, HttpServletRequest request) {
 		Cart cart = new Cart();
 		// 로그인 정보
 		if(TsfSession.isLogin()) {
@@ -488,6 +514,29 @@ public class TsfCartService {
 					cartDao.updateCartInfo(item);
 				}
 			} else {
+				if(request != null) {
+					GagaMap requestParam = GagaParameterUtil.getParameterMap(request);
+					if (org.apache.commons.lang3.StringUtils.isBlank(item.getAfLinkCd())) {
+						item.setAfLinkCd(requestParam.getString("afLinkCd"));
+					}
+					if (org.apache.commons.lang3.StringUtils.isBlank(item.getContentsLoc())) {
+						item.setAfLinkCd(requestParam.getString("contentsLoc"));
+					}
+					if (org.apache.commons.lang3.StringUtils.isBlank(item.getIthrCd())) {
+						item.setAfLinkCd(requestParam.getString("ithrCd"));
+					}
+				}
+
+				if (org.apache.commons.lang3.StringUtils.isBlank(item.getAfLinkCd())) {
+					item.setAfLinkCd(null);
+				}
+				if (org.apache.commons.lang3.StringUtils.isBlank(item.getContentsLoc())) {
+					item.setAfLinkCd(null);
+				}
+				if (org.apache.commons.lang3.StringUtils.isBlank(item.getIthrCd())) {
+					item.setAfLinkCd(null);
+				}
+
 				cartDao.insertCartInfo(item);					// 장바구니 마스터 정보 저장
 				cartDao.insertCartDetailInfo(item);				// 장바구니 상세 저장
 
@@ -1335,7 +1384,7 @@ public class TsfCartService {
 	/**
 	 * 마이페이지 장바구니 담기 관련 정보 조회
 	 * 
-	 * @param Cart
+	 * @param cart
 	 * @return Collection<Cart>
 	 * @author card007
 	 * @since 2021. 03. 26
@@ -1346,7 +1395,7 @@ public class TsfCartService {
 
 	/**
 	 * 장바구니 주문하기 버튼 클릭시 재고 및 상태 체크
-	 * @param Order
+	 * @param param
 	 * @return Collection<Order>
 	 * @author xodud1202
 	 * @since 2021. 04. 01
@@ -1386,7 +1435,7 @@ public class TsfCartService {
 
 	/**
 	 * 장바구니 최소/최대 주문 수량으로 변경
-	 * @param Order
+	 * @param param
 	 * @return Collection<Order>
 	 * @author xodud1202
 	 * @since 2021. 04. 02

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

@@ -824,7 +824,7 @@ public class TsfOrderService {
 			// 유효성체크 목록 담기 1개 기준 체크
 			params.add(cart);
 			
-			GagaMap resultMap = cartService.saveCartInfo(params);
+			GagaMap resultMap = cartService.saveCartInfo(params, null);
 			
 			if (!"SUCCESS".equals(resultMap.get("message").toString())) {
 				resultStr = resultMap.get("message").toString();

src/main/java/com/style24/front/biz/web/TsfCartController.java

@@ -44,6 +44,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 장바구니 Controller
  *
@@ -128,7 +130,7 @@ public class TsfCartController extends TsfBaseController {
 	 * goodsQty : 장바구니 등록 수량
 	 * cartGb : O = 바로주문, C = 장바구니
 	 * afLinkCd : 제휴링크코드
-	 * ithr_cd : 유입경고
+	 * ithr_cd : 유입경로
 	 * contents_loc : 컨텐츠 위치
 	 * planDtlSq : 기획전상세번호
 	 * dealGoodsCd : 딜상품코드 (딜상품코드)
@@ -138,8 +140,8 @@ public class TsfCartController extends TsfBaseController {
 	 */
 	@ResponseBody
 	@PostMapping("/save")
-	public GagaMap createCart(@RequestBody Collection<Cart> params) {
-		GagaMap result = cartService.saveCartInfo(params);
+	public GagaMap createCart(HttpServletRequest request, @RequestBody Collection<Cart> params) {
+		GagaMap result = cartService.saveCartInfo(params, request);
 		String cartGb = String.valueOf(result.get("cartGb"));
 		if ("C".equals(cartGb) || cartGb.equals(TscConstants.CartGb.CART.value())) {
 			cartService.deleteOldCart();

src/main/webapp/ux/mo/css/layout_m.css

@@ -465,7 +465,8 @@
 .pd_detail > .inner.wide{padding-left:0!important; padding-right:0!important; padding-bottom:0;}
 .pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
 .pd_detail .movbox #prodMovBtn{background: rgb(246 55 55 / 0%);  position: absolute;top: 0;left: 0;width: 100%;height: 100%;border: none;color: transparent;font-size: 0.1rem;z-index: 2;}
-.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;}
+/* .pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;} */
+.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 300%;height: 100%;z-index: 1;left:-100%}
 .pd_detail .thumb_box{position: relative;}
 .pd_detail .thumb_box .thumb_list{position:relative;}
 .pd_detail .thumb_box .thumb_list .thumb{position:relative; width:100%; padding-bottom: 150%;; background-color:#f5f5f5; overflow: hidden;}

src/main/webapp/ux/pc/css/layout.css

@@ -2507,7 +2507,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_detail .thumb img,
 	.pd_detail .thumb video {position:absolute; left:0; top:50%; width:100%; transform:translateY(-50%) ; z-index:2;}
 	.pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
-	.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none;left: -83.45%;width: 185%;}
+	/* .pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none; left: -83.45%;width: 185%;} */
+	.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 300%;height: 100%;z-index: 1;pointer-events:none; left: -100%;}
 	.pd_detail .movbox iframe[src*="youtu"] {left:0; width: 100%;}
 	.pd_detail .btn_popup {display:inline-block; padding:0px; box-sizing:border-box;}
 	.pd_detail .btn_popup span {color:#888; font-size:12px; font-weight:200; border-bottom:1px solid #888;}