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

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

@@ -881,7 +881,6 @@ public class TsfOrderController extends TsfBaseController {
 		payment.setUpdNo(custNo);
 
 		// 2. 결재정보등록(TB_PAYMENT)
-		
 		Payment result = orderService.kakaoPayResult(payment);
 		// Payment result = coreKakaoPayService.approveKakaoPayment(payment);
 
@@ -907,7 +906,7 @@ public class TsfOrderController extends TsfBaseController {
 			orderService.deleteCartOrdNo(order);
 		}
 
-		// TODO 5. 2021.05.10 보증보험 API 연동
+		// 5. 2021.05.10 보증보험 API 연동
 		orderService.updateInsurance(order);
 
 		// 2021.03.16 주문완료화면이동처리
@@ -970,7 +969,7 @@ public class TsfOrderController extends TsfBaseController {
 			orderService.deleteCartOrdNo(order);
 		}
 
-		// TODO 5. 2021.05.10 보증보험 API 연동
+		// 5. 2021.05.10 보증보험 API 연동
 		orderService.updateInsurance(order);
 
 		// 2021.03.16 주문완료화면이동처리
@@ -1034,19 +1033,18 @@ public class TsfOrderController extends TsfBaseController {
 			return mav;
 		}
 		
-		// TODO 2021.05.31 알림톡전송 주문완료정보
-		/*
-		if (StringUtils.isNotBlank(orderInfo.getCellPhnno())) {
+		// TODO 2021.05.31 알림톡전송 주문완료정보		
+		if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
 			Integer userNo = orderInfo.getCustNo();
 			try {
 				orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
+				orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
 				kakaotalkService.sendOrderComplete(orderInfo, userNo);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
-		*/
 		
 		// 2021.04.27 마일리지, 제휴할인정보
 		Order payOrder = orderService.getPaymentInfoForMypage(order);

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

@@ -1452,7 +1452,7 @@
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TMP_CONTENTS_GOODS CTG
-		                    , TB_GOODS G
+		                    , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
@@ -1469,7 +1469,7 @@
 		                <otherwise>
 		                    FROM   TB_CATE_4SRCH C4
 		                    , TB_CATE_GOODS CG
-		                    , TB_GOODS G 
+		                    , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
@@ -1675,7 +1675,7 @@
 		        	<when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		        		FROM	TB_CONTENTS CT
 		        		, TMP_CONTENTS_GOODS CTG
-		        		, TB_GOODS G USE INDEX (IX_GOODS_11)
+		        		, TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		        		, TB_GOODS_STOCK S
 		        		, TB_BRAND B
 		        		, TB_BRAND_GROUP BG
@@ -1692,7 +1692,7 @@
 		        	<otherwise>
 		        		FROM   TB_CATE_4SRCH C4
 		        		, TB_CATE_GOODS CG
-		        		, TB_GOODS G USE INDEX (IX_GOODS_11)
+		        		, TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		        		, TB_GOODS_STOCK S
 		        		, TB_BRAND B
 		        		, TB_BRAND_GROUP BG
@@ -1773,7 +1773,6 @@
 		         , G.LIST_PRICE         /*정상가(최초판매가)*/
 		         , G.CURR_PRICE         /*현재판매가*/
 		         , G.REG_DT             /*등록일시*/
-		         , G.NUMB
 		    FROM   (
 		            SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
 		                            BG.BRAND_GROUP_ENM
@@ -1792,11 +1791,9 @@
 		                 , G.LIST_PRICE                                             /*정상가(최초판매가)*/
 		                 , G.CURR_PRICE                                             /*현재판매가*/
 		                 , G.REG_DT                                                 /*등록일시*/
-		                 , ROW_NUMBER() OVER(ORDER BY G.REG_DT DESC
-		                                            , G.GOODS_CD) AS NUMB
 		            FROM   TB_CATE_4SRCH C4
 		                 , TB_CATE_GOODS CG
-		                 , TB_GOODS G USE INDEX (IX_GOODS_11)
+		                 , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                 , TB_GOODS_STOCK GS
 		                 , TB_BRAND B
 		                 , TB_BRAND_GROUP BG
@@ -1834,11 +1831,12 @@
 		            AND    BG.USE_YN = 'Y'
 		           ) G
 		    WHERE  1=1
+		    ORDER BY G.REG_DT DESC, G.GOODS_CD
 		<if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
-			AND  G.NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
+			LIMIT #{pageable.limitStartRow} , #{pageable.pageSize}
 		</if>
 		<if test="maxRow != null and maxRow !=''">
-			AND  G.NUMB <![CDATA[<=]]> #{maxRow}
+			LIMIT #{maxRow}
 		</if>
 		)
 		SELECT G.BRAND_GROUP_NM
@@ -1984,7 +1982,7 @@
 		               , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		          FROM   TB_CATE_4SRCH C4
 		          INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		          INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		          INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		          INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		          INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		          INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2148,7 +2146,7 @@
 		             , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		         FROM   TB_CATE_4SRCH C4
 		         INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		         INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		         INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		         INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		         INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2320,7 +2318,7 @@
 		                , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		            FROM   TB_CATE_4SRCH C4
 		            INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		            INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		            INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		            INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		            INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		            INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2484,7 +2482,7 @@
 		               , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		         FROM   TB_CATE_4SRCH C4
 		         INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		         INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		         INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		         INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		         INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO