Просмотр исходного кода

이태영 - 20210512 장바구니 브랜드명 수정

xodud lee 5 лет назад
Родитель
Сommit
2423d37acc

+ 9 - 9
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1267,13 +1267,13 @@ public class TsfOrderService {
 					String[] arr3 = arr2[j].split("=");
 
 					if (arr3.length > 1) {
-						if (arr3[0].indexOf("id") > -1) {
+						if (arr3[0].contains("id")) {
 							if ("".equals(goodsCdStr)) {
 								goodsCdStr = goodsCdStr + arr3[1];
 							} else {
 								goodsCdStr = goodsCdStr + "," + arr3[1];
 							}
-						} else if (arr3[0].indexOf("optionManageCodes") > -1) {
+						} else if (arr3[0].contains("optionManageCodes")) {
 							if ("".equals(optionManageCodesStr)) {
 								optionManageCodesStr = optionManageCodesStr + arr3[1];
 							} else {
@@ -1298,7 +1298,7 @@ public class TsfOrderService {
 			String goodsImgUrl		= env.getProperty("upload.goods.view");				// 상품 이미지 경로
 			int totPrice			= 0;												// 전체 주문 금액
 
-			/*for (int i=0; i<goodsCdArr.length; i++) {
+			for (int i=0; i<goodsCdArr.length; i++) {
 				Order item = new Order();
 
 				item.setGoodsCd(goodsCdArr[i]);
@@ -1306,13 +1306,13 @@ public class TsfOrderService {
 				//shopInfo.setDevice(CommonCodeConstant.DEIVCE_WEB);		//WEB
 
 				// 9.상품 옵션
-				String optionManageCodesArrStr = CryptoManager.simpleDecode(optionManageCodesArr[i]);
+				String optionManageCodesArrStr = coreOrderService.simpleDecode(optionManageCodesArr[i]);
 				String [] arr = optionManageCodesArrStr.split("_");
 				item.setOptCd1(arr[0]);
 
-				arr[1] = CryptoManager.simpleDecode(arr[1]);
+				arr[1] = coreOrderService.simpleDecode(arr[1]);
 
-				shopInfo = shopService.shopData(shopInfo);
+				/*shopInfo = shopService.shopData(shopInfo);
 
 				Ship shipInfoVo = new Ship();
 				shipInfoVo.setCompany_mng_idx(shopInfo.getCompany_mng_idx());
@@ -1388,7 +1388,7 @@ public class TsfOrderService {
 				sb.append("</value>");
 				sb.append("</optionItem>");
 
-				String goodsSizeStr = CryptoManager.decodeStr(arr[1]);
+				String goodsSizeStr = coreOrderService.decodeStr(arr[1]);
 
 				// 9.1 옵션 아이템정보 사이즈
 				sb.append("<optionItem>");
@@ -1445,8 +1445,8 @@ public class TsfOrderService {
 
 				sb.append("</shippingPolicy>");
 
-				sb.append("</product>");
-			}*/
+				sb.append("</product>");*/
+			}
 			sb.append("</products>");
 			//for end
 

+ 6 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfCart.xml

@@ -513,6 +513,7 @@
 		     , Z.SOLDOUT_YN
 		     , CASE WHEN #{frontGb} = 'P' THEN Z.PNT_PRATE ELSE Z.PNT_MRATE END AS PNT_RATE
 		     , SYS_IMG_NM
+		     , Z.BRAND_GROUP_NM
 		FROM   (SELECT C.CART_SQ
 		             , C.GOODS_CD
 		             , C.GOODS_QTY
@@ -573,6 +574,7 @@
 		             , CASE WHEN C.CUST_NO = 0 AND C.GOODS_QTY > G.DAY_MAX_ORD_QTY THEN 1 ELSE 0 END AS NOCUST_TODAY_ORD
 		             , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
 		            		ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM
+		             , (CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
 		        FROM   TB_CART C
 		        INNER  JOIN TB_CART_DETAIL CD
 		        ON     C.CART_SQ = CD.CART_SQ
@@ -582,6 +584,9 @@
 		        AND    G.GOODS_STAT <![CDATA[ <> ]]> 'G008_99'
 		        INNER  JOIN TB_BRAND BR
 		        ON     G.BRAND_CD = BR.BRAND_CD
+		        INNER  JOIN TB_BRAND_GROUP D
+		        ON     BR.BRAND_GROUP_NO = D.BRAND_GROUP_NO
+		        AND    D.USE_YN = 'Y'
 		        INNER  JOIN TB_DELV_FEE_POLICY DFP
 		        ON     G.DELV_FEE_CD = DFP.DELV_FEE_CD
 		        INNER  JOIN TB_OPTION O
@@ -700,6 +705,7 @@
 		     , Z.SOLDOUT_YN
 		     , PNT_RATE
 		     , SYS_IMG_NM
+		     , Z.BRAND_GROUP_NM
 		ORDER  BY Z.DELV_FEE_CD DESC
 		     , Z.GOODS_CD DESC
 	</select>

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfCoupon.xml

@@ -59,7 +59,7 @@
 		                                                             WHEN (SELECT COUNT(1) FROM TB_CATE_4SRCH WHERE CATE3_NO = CR.REF_VAL) > 0 THEN (SELECT CONCAT(CATE1_NM, ' > ', CATE2_NM) FROM TB_CATE_4SRCH WHERE CATE3_NO = CR.REF_VAL LIMIT 1)
 		                                                             WHEN (SELECT COUNT(1) FROM TB_CATE_4SRCH WHERE CATE4_NO = CR.REF_VAL) > 0 THEN (SELECT CONCAT(CATE1_NM, ' > ', CATE2_NM) FROM TB_CATE_4SRCH WHERE CATE4_NO = CR.REF_VAL LIMIT 1)
 		                                                             END    <!-- 카테고리명은 대 > 중 카테고리까지만 노출 20210330 정지혜과장님 확인 -->
-		                    WHEN CR.CPN_TARGET = 'G260_12' THEN (SELECT BRAND_KNM FROM TB_BRAND WHERE BRAND_CD = CR.REF_VAL AND USE_YN = 'Y')
+		                    WHEN CR.CPN_TARGET = 'G260_12' THEN (SELECT (CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END) FROM TB_BRAND BR INNER JOIN TB_BRAND_GROUP D ON BR.BRAND_GROUP_NO = D.BRAND_GROUP_NO AND D.USE_YN = 'Y' WHERE BR.BRAND_CD = CR.REF_VAL AND BR.USE_YN = 'Y')
 		                    WHEN CR.CPN_TARGET = 'G260_13' THEN (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = CR.REF_VAL AND USE_YN = 'Y' AND SUPPLY_STAT = 'G010_30')
 		               END AS REF_VAL
 		        FROM   TB_COUPON_REFVAL CR

+ 4 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -1827,10 +1827,13 @@
 		FROM   TB_GOODS G
 		INNER  JOIN (SELECT G.GOODS_CD
 		                  , MIN(VS.OPT_CD) AS OPT_CD
-		                  , MIN(BR.BRAND_ENM) AS BRAND_NM
+		                  , MIN(CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END) AS BRAND_NM
 		             FROM   TB_GOODS G
 		             INNER  JOIN TB_BRAND BR
 		             ON     G.BRAND_CD = BR.BRAND_CD
+		             INNER  JOIN TB_BRAND_GROUP D
+		             ON     BR.BRAND_GROUP_NO = D.BRAND_GROUP_NO
+		             AND    D.USE_YN = 'Y'
 		             INNER  JOIN TB_SUPPLY_COMPANY CM
 		             ON     G.SUPPLY_COMP_CD = CM.SUPPLY_COMP_CD
 		             INNER  JOIN VW_STOCK VS

+ 3 - 3
src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -121,7 +121,7 @@
 															<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" src="/" width="100%" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"  th:alt="${cart.sysImgNm}" alt="">
 														</span>
 														<p>
-															<span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
+															<span class="brand" th:text="${cart.brandGroupNm}"></span>
 														</p>
 														<p>
 															<span class="name" th:text="${cart.goodsNm}"></span>
@@ -235,7 +235,7 @@
 												<div class="gd_item">
 													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|">
 														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'" src="/" width="100%"  th:alt="${cart.sysImgNm}" alt=""></span>
-														<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
+														<p><span class="brand" th:text="${cart.brandGroupNm}"></span></p>
 														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
 													</a>
 												</div>
@@ -356,7 +356,7 @@
 												<div class="gd_item">
 													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|">
 														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'" src="/" width="100%"  th:alt="${cart.sysImgNm}" alt=""></span>
-														<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
+														<p><span class="brand" th:text="${cart.brandGroupNm}"></span></p>
 														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
 													</a>
 												</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1075,7 +1075,7 @@
 							quickShoppingBagHtml += '				<div class="itemPic">';
 							quickShoppingBagHtml += '					<img alt="BLACK-a" class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + info.sysImgNm + '?RS=120"/>';
 							quickShoppingBagHtml += '				</div>';
-							quickShoppingBagHtml += '				<p class="itemBrand">' + info.brandEnm + ' ' + info.brandKnm + '</p>';
+							quickShoppingBagHtml += '				<p class="itemBrand">' + info.brandGroupNm + '</p>';
 							quickShoppingBagHtml += '				<div class="itemName">' + info.goodsNm + '</div>';
 							for(let i = 0 ; i < info.itemNmArr.length ; i++) {
 								if(info.goodsType == "G056_S") {