Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

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

@@ -82,6 +82,8 @@ public class TsfCartService {
 			login.setCustGrade("G110");
 		}
 
+		result.put("custNo", login.getCustNo());
+
 		String goodsType = params.iterator().next().getGoodsType();
 		String cartGb = params.iterator().next().getCartGb();
 		if(StringUtils.isEmpty(goodsType)) {
@@ -281,7 +283,6 @@ public class TsfCartService {
 		result.put("goodsType", goodsType);
 		result.put("cartGb", cartGb);
 		result.put("message", "SUCCESS");
-		result.put("custNo", login.getCustNo());
 
 		return result;
 	}
@@ -319,6 +320,7 @@ public class TsfCartService {
 		}
 
 		cart.setJsessionId(TscSession.getSessionId());
+		boolean chkGoOrderForm = false;
 
 		List<String> sendCartSqList = new ArrayList<String>();
 		for (Cart carts : params) {
@@ -363,7 +365,11 @@ public class TsfCartService {
 				} else {
 					cart.setCartGb(TscConstants.CartGb.MOB_ORDER.value());
 				}
+				if("O".equals(cartInfos.iterator().next().getCartGb())) {
+					chkGoOrderForm = true;
+				}
 			} else if (!StringUtils.isEmpty(cartInfos.iterator().next().getCartGb()) && "G".equals(cartInfos.iterator().next().getCartGb())) {
+				chkGoOrderForm = true;
 				cart.setCartGb(TscConstants.CartGb.GIFT.value());
 			} else {
 				cart.setCartGb(TscConstants.CartGb.CREATE_ORDER.value());
@@ -408,8 +414,9 @@ public class TsfCartService {
 			cartSqComma.append(cartSq);
 			i++;
 		}
-
-		TsfSession.setAttribute("cartSqArr", cartSqComma.toString());
+		if(chkGoOrderForm) {
+			TsfSession.setAttribute("cartSqArr", cartSqComma.toString());
+		}
 	}
 
 	@Transactional("shopTxnManager")
@@ -483,8 +490,9 @@ public class TsfCartService {
 			cartSqComma.append(cartSq);
 			i++;
 		}
-
-		TsfSession.setAttribute("cartSqArr", cartSqComma.toString());
+		if (!StringUtils.isEmpty(params.iterator().next().getCartGb()) && ("O".equals(params.iterator().next().getCartGb()) || "G".equals(params.iterator().next().getCartGb()))) {
+			TsfSession.setAttribute("cartSqArr", cartSqComma.toString());
+		}
 	}
 
 	// 장바구니 상품 리스트 조회 서비스

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

@@ -411,6 +411,7 @@ public class TsfDisplayService {
 			tempContents.setMaxRow(20);
 			tempContents.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
 			if ("SMM007".equals(data.getContentsLoc())) {
+				data.setFrontGb(TsfSession.getFrontGb());
 				data.setBannerList(displayDao.getContentsBannerList(data));
 			}
 			data.setGoodsList(goodsDao.getContentsCategoryGoodsList(tempContents));

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

@@ -29,7 +29,6 @@ import com.style24.front.biz.service.TsfCartService;
 import com.style24.front.biz.service.TsfOrderService;
 import com.style24.front.biz.thirdparty.NiceCertify;
 import com.style24.front.support.controller.TsfBaseController;
-import com.style24.front.support.env.TsfConstants;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.Order;
@@ -68,12 +67,6 @@ public class TsfOrderController extends TsfBaseController {
 	
 	@Autowired
 	private NiceCertify niceCertify;
-
-	@Autowired
-	private TscKakaoPayService coreKakaoPayService;
-
-	@Autowired
-	private TscNaverPayService coreNaverPayService;
 	
 	@Autowired
 	private TscKakaotalkService kakaotalkService;
@@ -90,7 +83,8 @@ public class TsfOrderController extends TsfBaseController {
 	public ModelAndView orderNoMember(Order order, @RequestParam(value = "sEncData", required = false) String sEncData
 			, @RequestParam(value = "authMethod", required = false) String authMethod) {
 		ModelAndView mav = new ModelAndView();
-		
+		TsfSession.removeAtrribute("cartSqArr");		// 2021.06.03 주문서 접근시 장바구니 등록 세션 제거
+
 		// 비회원 주문시 로직 정리
 		// @ WEB 인 경우에는 고객정보 입력 화면 후 주문서 이동 후 본인인중
 		// @ WEB 의 경우에는 입력한 고객정보와 인증받은 고객정보가 다른경우 고객정보 업데이트

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

@@ -61,7 +61,7 @@ public class TsfPgController extends TsfBaseController {
 				return null;
 			}
 
-			// TODO 2021.03.15 jsh77b 무통장입금 결제완료 처리
+			// 2021.03.15 jsh77b 무통장입금 결제완료 처리
 			Order order = new Order();
 			order.setOrdNo(Integer.parseInt(request.getParameter("order_no")));
 			order.setPgTid(request.getParameter("tno"));

src/main/java/com/style24/front/support/config/TsfRedisSessionConfig.java

@@ -94,7 +94,7 @@ public class TsfRedisSessionConfig extends AbstractHttpSessionApplicationInitial
 		String active = env.getProperty("spring.profiles.active");
 		// TODO : SSL 적용 후 주석 풀고 테스트 해야함 2021-04-13
 		// SSL인증서 적용 시 주석 제거
-		if ("run".equals(active) || "locd".equals(active)) {
+		if ("run".equals(active) || "locd".equals(active) || "style".equals(active)) {
 			serializer.setUseSecureCookie(true);
 			serializer.setSameSite("NONE");
 		}

src/main/java/com/style24/persistence/domain/Contents.java

@@ -75,6 +75,7 @@ public class Contents extends TscBaseDomain {
 	private String bannerGb;		// admin:수동설정, plan:기획전
 
 	private String pageGb;	// 호출페이지 구분(MALL:몰메인, BEST:베스트메인)
+	private String frontGb; // 몰메인 브랜드픽에서 사용
 
 	//private String contentsTitle;		// 메인 타이틀(md가 설정한)
 

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

@@ -719,44 +719,82 @@
 	<!-- 몰메인 브랜드픽 조회 -->
 	<select id="getContentsBannerList" parameterType="Contents" resultType="Contents">
 		/* TsfDisplay.getContentsBannerList */
-		SELECT   CASE B.M WHEN 1 THEN A.IMG_PATH1
-						  WHEN 2 THEN A.IMG_PATH2
-						  WHEN 3 THEN A.IMG_PATH3
-						  WHEN 4 THEN A.IMG_PATH4
-						  WHEN 5 THEN A.IMG_PATH5 END IMG_PATH1
-			 ,CASE B.M WHEN 1 THEN A.STR_VAR1
-					   WHEN 2 THEN A.STR_VAR2
-					   WHEN 3 THEN A.STR_VAR3
-					   WHEN 4 THEN A.STR_VAR4
-					   WHEN 5 THEN A.STR_VAR5 END STR_VAR1
-			 ,CASE B.M WHEN 1 THEN A.STR_TITLE1
-					   WHEN 2 THEN A.STR_TITLE2
-					   WHEN 3 THEN A.STR_TITLE3
-					   WHEN 4 THEN A.STR_TITLE4
-					   WHEN 5 THEN '' END STR_TITLE1
-			 ,CASE B.M WHEN 1 THEN A.SUB_TEXT1
-					   WHEN 2 THEN A.SUB_TEXT2
-					   WHEN 3 THEN A.SUB_TEXT3
-					   WHEN 4 THEN A.SUB_TEXT4
-					   WHEN 5 THEN '' END SUB_TEXT1
+		SELECT BRAND_GROUP_NO
+			 , IMG_PATH1
+			 , IMG_PATH2
+			 , STR_VAR1
+			 , STR_VAR2
+			 , STR_TITLE1
+			 , STR_TITLE2
+			 , SUB_TEXT1
+			 , SUB_TEXT2
 		FROM (
-			  (SELECT	BRAND_GROUP_NO
-					, IMG_PATH1 , IMG_PATH2 , IMG_PATH3 , IMG_PATH4, IMG_PATH5
-					, STR_VAR1 , STR_VAR2 , STR_VAR3 , STR_VAR4 , STR_VAR5
-					, STR_TITLE1 , STR_TITLE2 , STR_TITLE3 , STR_TITLE4
-					, SUB_TEXT1 , SUB_TEXT2 , SUB_TEXT3 , SUB_TEXT4
-			   FROM	TB_CONTENTS
-			   WHERE	CONTENTS_LOC = #{contentsLoc}
-				 AND		BRAND_GROUP_NO = #{brandGroupNo}
-			  ) A
-				 ,(
-			  SELECT 1 M
-			  UNION ALL SELECT 2
-			  UNION ALL SELECT 3
-			  UNION ALL SELECT 4
-			  UNION ALL SELECT 5
-				 ) B
-				 )
+				 SELECT BRAND_GROUP_NO
+					  , IMG_PATH1
+					  , IMG_PATH2
+					  , STR_VAR1
+					  , STR_VAR2
+					  , STR_TITLE1
+					  , STR_TITLE2
+					  , SUB_TEXT1
+					  , SUB_TEXT2
+				 FROM TB_CONTENTS
+				 WHERE 1 = 1
+				   AND CONTENTS_LOC = #{contentsLoc}
+				   AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+				   AND USE_YN = 'Y'
+				   AND BRAND_GROUP_NO = #{brandGroupNo}
+				 UNION ALL
+				 SELECT BRAND_GROUP_NO
+					  , IMG_PATH1
+					  , IMG_PATH2
+					  , STR_VAR1
+					  , STR_VAR2
+					  , STR_TITLE1
+					  , STR_TITLE2
+					  , SUB_TEXT1
+					  , SUB_TEXT2
+				 FROM (
+						  SELECT BRAND_CD                      AS BRAND_GROUP_NO
+							   , ORG_TNFILE_NM                 AS IMG_PATH1
+							   , ''                            AS IMG_PATH2
+							   , CONCAT('/display/lookbook/detail/form?lookbookGb=L&amp;lookbookSq=',LOOKBOOK_SQ ,'&amp;brandCd=',BRAND_CD) AS STR_VAR1
+							   , ''                            AS STR_VAR2
+							   , TITLE                         AS STR_TITLE1
+							   , ''                            AS STR_TITLE2
+							   , ''                            AS SUB_TEXT1
+							   , ''                            AS SUB_TEXT2
+						  FROM TB_LOOKBOOK
+						  WHERE 1 = 1
+							AND BRAND_CD = #{brandGroupNo}
+							AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+							AND DISP_YN = 'Y'
+						  ORDER BY REG_DT DESC
+						  LIMIT 1
+					  ) A
+				 UNION ALL
+				 SELECT PB.BRAND_GROUP_NO
+					  , P.MAIN_PIMG                                        AS IMG_PATH1
+					  , ''                                                 AS IMG_PATH2
+					  , CONCAT('/planning/detail/form?planSq=', P.PLAN_SQ) AS STR_VAR1
+					  , ''                                                 AS STR_VAR2
+					  , P.DTL_TITLE1                                       AS STR_TITLE1
+					  , P.DTL_TITLE2                                       AS STR_TITLE2
+					  , ''                                                 AS SUB_TEXT1
+					  , ''                                                 AS SUB_TEXT2
+				 FROM TB_PLAN P
+						  INNER JOIN TB_PLAN_BRAND PB ON P.PLAN_SQ = PB.PLAN_SQ AND PB.DISP_YN = 'Y'
+				 WHERE 1 = 1
+				   AND BRAND_GROUP_NO = #{brandGroupNo}
+				   AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+				   AND PLAN_GB = 'P'
+				   AND DEL_YN = 'N'
+				   AND OPEN_YN = 'Y'
+				<if test="frontGb != null and frontGb != ''">
+				   AND FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
+				</if>
+			 ) AS Z
+		LIMIT 5
 	</select>
 
 	<!-- 상품리스트 카테고리별 필터 목록 -->

src/main/resources/config/application-style.yml

@@ -26,7 +26,7 @@ spring:
                 172.30.90.112:6381
                 172.30.90.113:6381
 # SSL Server
-has-ssl: false
+has-ssl: true
 
 logging:
     config: classpath:log/logback-run.xml

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -112,8 +112,7 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
-												<p class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</p>
-												<p class="itemPrice">[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
+												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 													<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -110,9 +110,7 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
-												<p class="itemPrice">
-													<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
-													[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
+												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
 													<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
 												<div class="itemComment" th:text="${item.goodsTnm}">#주문 폭주 상품</div>

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -947,6 +947,11 @@
 			mcxDialog.alert("옵션을 선택해 주세요.");
 			return false;
 		}
+
+		if (btnType == "G" && targetSize > 1){
+			mcxDialog.alert("선물하기는 1개의 옵션만 선택하실 수 있습니다.");
+			return false;
+		}
 		
 		$target.each(function() {
 			
@@ -1288,6 +1293,11 @@
 		$(document).on('click','.pop_option_select .close',function(e){
 			$(".pop_option_select").hide();
 			$(".option_open").removeClass("on");
+			$('.form_field .select_custom.deal_opt_item').find('.combo .select').html('선택');
+			$('.form_field .select_custom.item_opt1').attr('disabled', true);
+			$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
+			$('.form_field .select_custom.item_opt2').attr('disabled', true);
+			$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 			 return false;
 		 })
 //			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업 ==> fnGoodsDealOptionOpen()대체

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -2106,6 +2106,12 @@
 			
 			if (goodsType == 'G056_N'){
 				let compsList = [];
+
+				if(btnType == "G" && targetSize > 1) {
+					mcxDialog.alert("선물하기는 1개의 옵션만 선택하실 수 있습니다.");
+					return false;
+				}
+
 				target.each(function() {
 
 					let ea = parseInt($(this).val());
@@ -2133,7 +2139,11 @@
 				cfnAddCart(compsList);
 
 			}else{ // 세트
-				
+				if(btnType == "G" && targetSize > 1) {
+					mcxDialog.alert("선물하기는 1개의 옵션만 선택하실 수 있습니다.");
+					return false;
+				}
+
 				target.each(function() {
 					let compsList = [];
 					let goodsList = {
@@ -2594,6 +2604,13 @@
 		$(document).on('click','.pop_option_select .close',function(e){
             $(".pop_option_select").hide();
 			$('.option_result .option_open').removeClass('on');
+			let target=$('.select_custom.item_opt1');
+			target.each(function(){ 
+				$('.form_field .select_custom.item_opt1.' +$(this).attr('id') ).find('.combo .select').html('선택');
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).attr('disabled', true);
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).find('.combo .select').html('선택');
+			});
+			
             return false;
         });
 

src/main/webapp/WEB-INF/views/mob/goods/GoodsInstockAlarmFormMob.html

@@ -35,8 +35,9 @@
 								</div>
 								<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">NBA 키즈</p>
 								<div class="itemName" th:text="${goodsInfo.goodsFullNm}">유니 삼단블록 플리스 집업 유니 삼단블록 플리스 집업 유니 삼단블록 플리스 집업</div>
-								<p class="itemPrice"><th:block th:text="${#numbers.formatInteger(goodsInfo.currPrice, 0,'COMMA')}"> 134,100</th:block>
+								<p class="itemPrice">
 									<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">149,000</span>
+									<th:block th:text="${#numbers.formatInteger(goodsInfo.currPrice, 0,'COMMA')}"> 134,100</th:block>
 									<span class="itemPercent" th:if="${goodsInfo.dcRate > 0}" th:text="|${#numbers.formatDecimal(goodsInfo.dcRate,0,0)}%|">30%</span>
 								</p>
 							</a>
@@ -47,13 +48,15 @@
 				<div class="select_blk" th:if="${goodsOption2List != null and !goodsOption2List.empty}" >
 					<h6>사이즈 선택</h6>
 					<div class="opt_size">
-						<div class="form_field">
-							<div th:each="goodsOption2, status : ${goodsOption2List}">
-								<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+						<div class="form_field size_select">
+							<th:block  th:each="goodsOption2, status : ${goodsOption2List}">
+							<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+							<div>
 								<input type="radio" name="opt" th:id="${'alarmSize'+goodsOption2.optCd}" th:value="${goodsOption2.optCd2}" th:attr="optCd=${goodsOption2.optCd}" >
 								<label th:for="${'alarmSize'+goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" >90</span></label>
-								</th:block>
 							</div>
+							</th:block>
+							</th:block>
 						</div>
 					</div>
 				</div>

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -539,7 +539,7 @@ window._eglqueue = window._eglqueue || [];
 _eglqueue.push(['setVar'	, 'cuid'		, eglqueueCuid]);
 _eglqueue.push(['setVar'	, 'orderId'		, [[${orderInfo.ordNo}]]]);
 _eglqueue.push(['setVar'	, 'orderPrice'	, [[${realOrdSumAmt}]]]);
-_eglqueue.push(['setVar'	, 'userId'		, [[${orderInfo.custId}]]]); // optional
+_eglqueue.push(['setVar'	, 'userId'		, hCustId]); // optional
 _eglqueue.push(['track'		, 'order']);
 
 (function (s, x) {

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -183,7 +183,7 @@
 															</div>
 															<p class=" itemBrand" th:text="${bestItemData.brandGroupNm}">BRAND NAME</p>
 															<div class=" itemName" th:text="${bestItemData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-															<p class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')} + 원]]
+															<p class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${#numbers.formatInteger(bestItemData.listPrice,3,'COMMA')}">89,000</span>
 																<span class=" itemPercent" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${(bestItemData.listPrice == 0 ? 0 : #numbers.formatDecimal((bestItemData.listPrice - bestItemData.currPrice) / (bestItemData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
@@ -337,7 +337,7 @@
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName" th:text="${goodsData.goodsNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 															<p class="itemPrice">
-																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
+																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,0,'COMMA')} + '원'"></span>
 																<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatDecimal(goodsData.dcRate,1,0)} + '%'"></span>
 																<!--<span class="itemPercent" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${(planningGoods.listPrice == 0 ? 0 : #numbers.formatDecimal((planningGoods.listPrice - planningGoods.currPrice) / (planningGoods.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>-->
@@ -456,7 +456,7 @@
 																<input type="hidden" name="bannerNote" th:value="${ContentsData.strTitle1}"/>
 															</p>
 															<!--<p>아우터 + 이너 단독세일</p>-->	<!-- br 태그 줄바꿈해야함-->
-															<button type="button" class="btn">VIEW MORE</button>
+<!--															<button type="button" class="btn">VIEW MORE</button>-->
 														</div>
 														<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
 													</div>
@@ -512,7 +512,7 @@
 																		</div>
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 																		<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
+																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>

src/main/webapp/WEB-INF/views/web/goods/GoodsInstockAlarmFormWeb.html

@@ -48,12 +48,14 @@
 					<h6>사이즈 선택</h6>
 					<div class="opt_size">
 						<div class="form_field">
-							<div th:each="goodsOption2, status : ${goodsOption2List}">
-								<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+							<th:block  th:each="goodsOption2, status : ${goodsOption2List}">
+							<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+							<div>
 								<input type="radio" name="opt" th:id="${'alarmSize'+goodsOption2.optCd}" th:value="${goodsOption2.optCd2}" th:attr="optCd=${goodsOption2.optCd}" >
 								<label th:for="${'alarmSize'+goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" >90</span></label>
-								</th:block>
 							</div>
+							</th:block>
+							</th:block>
 						</div>
 					</div>
 				</div>

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -440,7 +440,7 @@ window._eglqueue = window._eglqueue || [];
 _eglqueue.push(['setVar'	, 'cuid'		, eglqueueCuid]);
 _eglqueue.push(['setVar'	, 'orderId'		, [[${orderInfo.ordNo}]]]);
 _eglqueue.push(['setVar'	, 'orderPrice'	, [[${realOrdSumAmt}]]]);
-_eglqueue.push(['setVar'	, 'userId'		, [[${orderInfo.custId}]]]); // optional
+_eglqueue.push(['setVar'	, 'userId'		, hCustId]); // optional
 _eglqueue.push(['track'		, 'order']);
 
 (function (s, x) {

src/main/webapp/ux/style24_link.js

@@ -355,16 +355,16 @@ function cfnAddCart(cartList) {
 						$("#directOrderForm").submit();
 					}
 				} else if (result.cartGb == "G") {
-					if(result.custNo == 0) {
+					if(result.custNo != null && result.custNo != 0) {
+						let orderHtml = "";
+						for(let i = 0 ; i < result.cartSqList.length ; i++) {
+							orderHtml += '<input type="hidden" name="cartSqArr" value="' + result.cartSqList[i] + '" />';
+						}
+						$("#directOrderForm").html(orderHtml);
+						$("#directOrderForm").submit();
+					} else {
 						location.href="/signin";
 					}
-					
-					let orderHtml = "";
-					for(let i = 0 ; i < result.cartSqList.length ; i++) {
-						orderHtml += '<input type="hidden" name="cartSqArr" value="' + result.cartSqList[i] + '" />';
-					}
-					$("#directOrderForm").html(orderHtml);
-					$("#directOrderForm").submit();
 				} else if (result.cartGb == "N") {
 					buy_nc_req(result.cartSqList);
 				} else {