Merge branch 'sowon' into develop

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/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);
 						});
 			}
 		});