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

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

@@ -344,7 +344,7 @@ public class TsfOrderService {
 	public Payment orderPgPayResult(Payment param, HttpServletRequest request, HttpServletResponse response) {
 		Payment result = new Payment();
 
-		if(TscConstants.FrontGb.MOB.value().equals(TsfSession.getFrontGb()) && StringUtils.isEmpty(param.getPgGb())) {
+		if(!TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb()) && StringUtils.isEmpty(param.getPgGb())) {
 			param.setPgGb(TscConstants.PgGb.KCP.value());
 			param.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
 		}

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

@@ -1336,7 +1336,7 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("paymentId", paymentId);
 		mav.addObject("ordNo", TsfSession.getAttribute("ordNo"));
 
-		if (TscConstants.FrontGb.MOB.value().equals(TsfSession.getFrontGb()) && StringUtils.isNotBlank(resultCode) && "Fail".equals(resultCode)) {
+		if (!TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb()) && StringUtils.isNotBlank(resultCode) && "Fail".equals(resultCode)) {
 			mav.setViewName(super.getDeviceViewName("error/PaymentFail"));
 		} else {
 			mav.setViewName(super.getDeviceViewName("pg/NaverPaymentRequest"));

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

@@ -1843,19 +1843,11 @@
 		                 , G.REG_DT                                                 /*등록일시*/
 		            FROM   TB_CATE_4SRCH C4
 		                 , TB_CATE_GOODS CG
-		                 , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
+		                 , TB_GOODS G
 		                 , TB_GOODS_STOCK GS
 		                 , TB_BRAND B
 		                 , TB_BRAND_GROUP BG
 		            WHERE  C4.LEAF_CATE_NO = CG.CATE_NO
-		            <choose>
-		                <when test="brandGroupNo != null and brandGroupNo != ''">
-		            AND    B.BRAND_GROUP_NO = #{brandGroupNo}
-		                </when>
-		                <otherwise>
-		            AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
-		                </otherwise>
-		            </choose>
 		            AND    CG.GOODS_CD = G.GOODS_CD
 		            AND    CG.GOODS_CD = GS.GOODS_CD
 		            AND    G.BRAND_CD = B.BRAND_CD
@@ -1866,6 +1858,14 @@
 		            <if test="cate1No != null and cate1No != ''">
 		            AND    C4.CATE1_NO = #{cate1No}
 		            </if>
+		            <choose>
+		                <when test="brandGroupNo != null and brandGroupNo != ''">
+		            AND    B.BRAND_GROUP_NO = #{brandGroupNo}
+		                </when>
+		                <otherwise>
+		            AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
+		                </otherwise>
+		            </choose>
 		            <if test="exceptGoodsArr != null and exceptGoodsArr.length > 0">
 		            AND	   CG.GOODS_CD NOT IN
 		                <foreach collection="exceptGoodsArr" item="item" index="index"  open="(" close=")" separator=",">