Merge branch 'develop' into bin2107

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

@@ -117,17 +117,21 @@ public class TsfGiftcardService {
 			giftcard.setResultVal(result);  
 			giftcardDao.saveGiftcardApi(giftcard);
 			throw new IllegalArgumentException("시스템 오류입니다.");
-		} else if(result.equals("00")){
-			
-			giftcard.setResultVal(result);  
+		} else{
+					
+			giftcard.setResultVal("00");  
 			giftcardDao.saveGiftcardApi(giftcard);
 			
 			// 성공일 경우 tb_cust_giftcard insert
 			String[] param = result.split("[|]");
+			// [2021-04-01, 오전, 12:00:00]
+			String[] param2 = param[2].split(" ");
+			String[] param3 = param[3].split(" ");
 			
 			giftcard.setChgGfcdAmt(Integer.parseInt(param[1])); // 승인금액
-			giftcard.setUseStDate(param[2]);
-			giftcard.setUseExpDate(param[3]);
+			giftcard.setRmGfcdAmt(Integer.parseInt(param[1])); // 승인금액
+			giftcard.setUseStDate(param2[0]);
+			giftcard.setUseExpDate(param3[0]);
 			
 			giftcardDao.getGiftcardUseConfirm(giftcard);
 		}

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

@@ -76,7 +76,8 @@
 				 , CASE WHEN DATE_FORMAT(now(),'%Y%m%d') <![CDATA[<=]]> DATE_FORMAT(USE_EXP_DATE,'%Y%m%d') THEN 'Y' ELSE 'N' END AS USE_YN
 		 FROM TB_CUST_GIFTCARD CG 
 		 WHERE 1=1 
-		  AND CUST_NO = #{custNo}
+		  AND CG.CUST_NO = #{custNo}
+		ORDER BY CG.REG_DT DESC
 	</select>
 	
 	<insert id="saveGiftcardApi" parameterType="GiftCard">
@@ -124,8 +125,8 @@
 	         , #{chgGfcdAmt}
 	         , #{usGfcdAmt}
 	         , #{rmGfcdAmt}
-	         , #{useStDate}
-	         , #{useExpDate}
+	         , DATE_FORMAT(#{useStDate},'%Y%m%d') /**P*/
+	         , DATE_FORMAT(#{useExpDate},'%Y%m%d') /**P*/
 	         , #{regNo}
 	         , CURRENT_TIMESTAMP
 	         , #{updNo}

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

@@ -624,6 +624,8 @@
 		SELECT Z.*
 		     , 100 - ROUND((CURR_PRICE / LIST_PRICE) * 100 ,0) AS DC_RATE
 		     , FN_GET_GOODS_NM(GOODS_NM,GOODS_GB,FOREIGN_BUY_YN,PARALLEL_IMPORT_YN,ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = Z.GOODS_CD AND COLOR_CD = IFNULL(Z.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = Z.GOODS_CD AND COLOR_CD = IFNULL(Z.MAIN_COLOR_CD,'XX') AND MOUSEOVER_IMG_YN = 'Y') AS SYS_IMG_NM2
 		FROM (
 		      SELECT B.GOODS_CD 
 		           , G.GOODS_NM
@@ -633,13 +635,11 @@
 		           , G.ORDER_MADE_YN
 		           , G.GOODS_STAT
 		           , G.GOODS_TYPE
+		           , G.MAIN_COLOR_CD
 		           , G.MIN_ORD_QTY 
 		           , (CASE WHEN E.DISP_NM_LANG = 'EN' THEN E.BRAND_GROUP_ENM ELSE E.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
 		           , G.LIST_PRICE
 		           , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD, G.CURR_PRICE,#{custGb}) AS CURR_PRICE
-		           , G.MAIN_COLOR_CD
-		           , (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') AS SYS_IMG_NM
-		           ,  (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 MOUSEOVER_IMG_YN = 'Y') AS SYS_IMG_NM2
 		           , S.STOCK_QTY
 		           , S.SOLDOUT_YN
 		           , S.OPT_CD
@@ -649,7 +649,14 @@
 		           , V.VIDEO_VAL_S
 		           , (CASE WHEN W.GOODS_CD IS NULL THEN 'N' ELSE 'Y' END) AS WISH_YN
 		      FROM TB_TMTB A
-		      INNER JOIN TB_TMTB_APPLY_GOODS B ON a.TMTB_SQ  = B.TMTB_SQ
+		      INNER JOIN TB_TMTB_APPLY_GOODS B ON A.TMTB_SQ  = B.TMTB_SQ
+		                                       AND B.DEL_YN = 'N'
+		                                       AND B.GOODS_GB IN ( 'G800_10', 'G800_20')  -- 기본과 적용상품
+		      LEFT OUTER JOIN TB_TMTB_APPLY_GOODS BB ON B.TMTB_SQ  = BB.TMTB_SQ
+		                                       AND BB.DEL_YN = 'N'
+		                                       AND B.GOODS_CD = BB.GOODS_CD
+		                                       AND BB.GOODS_GB = 'G800_30'  -- 제외상품
+		                                       AND BB.GOODS_CD IS NULL
 		      INNER JOIN TB_GOODS G ON B.GOODS_CD = G.GOODS_CD
 		                            AND G.GOODS_STAT = 'G008_90'
 		                            AND G.SELF_MALL_YN = 'Y'
@@ -657,6 +664,9 @@
 		                            <if test='adminYn == null or adminYn != "Y"'>
 		                            AND G.GOODS_STAT = 'G008_90'
 		                            </if>
+		                            <![CDATA[
+		                            AND B.GOODS_CD <> #{goodsCd}  -- 자기상품은 제외
+		                            ]]>
 		      INNER JOIN TB_BRAND D ON G.BRAND_CD = D.BRAND_CD
 		                    AND D.USE_YN = 'Y'
 		      INNER JOIN TB_SITE_BRAND SB ON D.BRAND_CD  = SB.BRAND_CD
@@ -695,9 +705,9 @@
 		                              AND IFNULL(#{custNo}, 0) = W.CUST_NO
 		      WHERE NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
 		      AND A.TMTB_STAT ='G232_11'
-		      AND A.TMTB_SQ IN (SELECT TMTB_SQ FROM tb_tmtb_apply_goods WHERE GOODS_CD = #{goodsCd} AND DEL_YN = 'N')
-		      <![CDATA[
-		      AND B.GOODS_CD <> #{goodsCd}
+		       <![CDATA[
+		      AND A.TMTB_SQ IN (SELECT TMTB_SQ FROM TB_TMTB_APPLY_GOODS WHERE GOODS_CD = #{goodsCd} AND DEL_YN = 'N' AND GOODS_GB IN ( 'G800_10', 'G800_20')) -- 기본과 적용상품
+		      AND A.TMTB_SQ NOT IN (SELECT TMTB_SQ FROM TB_TMTB_APPLY_GOODS WHERE GOODS_CD = #{goodsCd} AND DEL_YN = 'N' AND GOODS_GB = 'G800_30') -- 제외상품
 		       ]]>
 		      ORDER BY A.TMTB_SQ 
 		) Z

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

@@ -1385,19 +1385,19 @@
 		params.goodsOtherGb = "together";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-		fnGoodsTogetherSearch(params);
+		//fnGoodsTogetherSearch(params);
 		
 		// 추천 상품(ajax html)
 		params.goodsOtherGb = "recommend";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-		fnGoodsRecommendSearch(params);
+		//fnGoodsRecommendSearch(params);
 		
 		// 비슷한 상품(ajax html)
 		params.goodsOtherGb = "like";
 		params.ithrCd = "tmtb";
 		params.contentsLoc = "tmtb";
-		fnGoodsLikeSearch(params);
+		//fnGoodsLikeSearch(params);
 	
 		
 		// 상품 대표설명 > 좌측 상품썸네일 navi, 우측 상품정보 고정 

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

@@ -32,7 +32,7 @@
 					<div class="item_prod">
 						<div class="item_state">
 							<button type="button" class="itemLike" th:classappend="${goodsInfo.wishYn == 'Y'}? 'active' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsInfo.goodsCd}, ithrCd=${params.ithrCd}, contentsLoc=${params.contentsLoc}, planDtlSq=''">관심상품 추가</button>
-							<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail([[${goodsInfo.goodsCd}]], '',[[${params.ithrCd}]],'[[${params.contentsLoc}]]','','pc_detail');" class="itemLink" >
+							<a href="javascript:void(0);" th:onclick="cfnGoToGoodsDetail([[${goodsInfo.goodsCd}]], '',[[${params.ithrCd}]],[[${params.contentsLoc}]],'','pc_detail');" class="itemLink" >
 								<div class="itemPic">
 									<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm +'?RS=300'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 									

src/main/webapp/WEB-INF/views/web/mypage/MypageGiftcardFormWeb.html

@@ -120,7 +120,7 @@
 		</div>
 		<!-- // CONT-BODY -->
 		</div>
-	</div>
+
 <script th:inline="javascript">
 	let date = [[${date}]];
 	let year = date[0].year;
@@ -346,7 +346,8 @@
 				gagajf.ajaxJsonSubmit(
 						'/mypage/gift/use/confirm', jsonData,
 						function() {
-							cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
+							$("#gift_input").val('');
+							//cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
 						});
 			}
 		});