Merge branch 'develop' into bin2107

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

@@ -1432,10 +1432,13 @@ public class TsfMypageController extends TsfBaseController {
 	 */
 	@GetMapping("/quick/down/coupon/list")
 	@ResponseBody
-	public Collection<Coupon> getQuickDownCouponList() {
+	public GagaMap getQuickDownCouponList() {
+		GagaMap result = new GagaMap();
 		Coupon coupon = new Coupon();
 		Collection<Coupon> ownCouponList = couponService.getQuickCouponDownList(coupon);
-		return ownCouponList;
+		result.set("ownCouponList", ownCouponList);
+		result.set("couponCount",couponService.getMypageCouponInfo(coupon));
+		return result;
 	}
 	
 	/**

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

@@ -738,27 +738,22 @@
 	<select id="getMypageCouponInfo" resultType="Coupon" parameterType="Coupon">
 		/* TsfCoupon.getMypageCouponInfo*/
 		SELECT COUNT(*) AS ALL_COUPON_CNT
-			,(  SELECT COUNT(*) AS USE_COUPON
-				FROM tb_coupon A INNER JOIN tb_cust_coupon B ON A.CPN_ID = B.CPN_ID 
-				WHERE 1=1
-				  AND A.CPN_ID = B.CPN_ID 
-				  AND B.CUST_NO = #{custNo}
-				  AND A.CPN_STAT = 'G232_11'
-				  AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT ) AS USE_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
-				FROM tb_coupon A INNER JOIN tb_cust_coupon B ON A.CPN_ID = B.CPN_ID 
-				WHERE 1=1
-				  AND A.CPN_ID = B.CPN_ID 
-				  AND B.CUST_NO = #{custNo}
-				  AND A.CPN_STAT = 'G232_11'
-				  AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT 
-				  AND NOW() BETWEEN DATE_ADD(A.AVAIL_EDDT , INTERVAL -7 DAY) AND A.AVAIL_EDDT ) AS EXPIRE_COUPON_CNT
-		FROM tb_coupon A INNER JOIN tb_cust_coupon B ON A.CPN_ID = B.CPN_ID 
+		        FROM TB_CUST_COUPON 
+		        WHERE 1=1
+		        AND CUST_NO = #{custNo}
+		        AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT 
+		        AND USED_DT IS NULL) AS USE_COUPON_CNT
+		    ,(  SELECT COUNT(*) AS USE_COUPON
+		        FROM TB_CUST_COUPON 
+		        WHERE 1=1
+		        AND CUST_NO = #{custNo}
+		        AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT 
+		        AND NOW() BETWEEN DATE_ADD(AVAIL_EDDT , INTERVAL -7 DAY) AND AVAIL_EDDT ) AS EXPIRE_COUPON_CNT
+		FROM TB_CUST_COUPON 
 		WHERE 1=1
-		  AND A.CPN_ID = B.CPN_ID 
-		  AND B.CUST_NO = #{custNo}
-		  AND A.CPN_STAT = 'G232_11'
-		  AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT
+		  AND CUST_NO = #{custNo}
+		  AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT
 	</select>
 	
 	<select id="getCouponDetailInfo" resultType="Coupon" parameterType="Coupon">
@@ -775,7 +770,7 @@
 		     , Z.AVAIL_EDDT                            /*유효종료일자*/
 		     , Z.CPN_CNT                               /*보유쿠폰수*/
 		     , Z.EXPIRE_YN                             /*만료여부*/
-		 --     , GROUP_CONCAT(Z.TGT_CONDITION) AS TGT_CONDITION
+		     , GROUP_CONCAT(Z.TGT_CONDITION) AS TGT_CONDITION
 		FROM
 		(
 		WITH TAB_COUPON AS (
@@ -1101,6 +1096,7 @@
 	</select>
 	
 	<select id="getQuickCouponDownList"  parameterType="Coupon" resultType="Coupon">
+		/*TsfCoupon.getQuickCouponDownList*/
 		SELECT C.CPN_ID 
 		      ,C.CPN_NM 
 		      ,C.CPN_DESC       
@@ -1158,5 +1154,5 @@
 		ORDER BY  C.AVAIL_EDDT,
 		CASE WHEN DC_WAY LIKE '%' THEN DC_VAL END DESC LIMIT 10
 	</select>
-
+	
 </mapper>

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

@@ -1250,11 +1250,12 @@
 		}else{
 			$.getJSON('/mypage/quick/down/coupon/list'
 					, function(result, status) {
-						if (status == 'success'){ 
+						if (status == 'success'){
+							$('#quick04').find('span').html(result.ownCouponList.length + result.couponCount.useCouponCnt);
 							let tag = '';
-							if(result.length>0){
+							if(result.ownCouponList.length>0){
 								tag += '<ul class="coupon_list">';
-								$.each(result, function (idx, item) {
+								$.each(result.ownCouponList, function (idx, item) {
 									tag += '	<li>';
 									tag += '		<div class="coupon">';
 									tag += '			<div>';
@@ -1352,7 +1353,7 @@
 	// 쿠폰다운로드 콜백
 	var fnQuickCouponCallBack = function(result){
 		if (result.status == "200"){
-			mcxDialog.alert(result.message);
+			//mcxDialog.alert(result.message);
 		}			
 		issueCouponBtn();
 		

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

@@ -265,8 +265,7 @@
 		let giftcardOwnList = result.giftcardOwnList;
 
 		let tmtbHtml2 = "";
-
-		if (giftcardOwnList == null) {
+		if (giftcardOwnList.length <=0) {
 			tmtbHtml2 += '<div class="nodata">';
 			tmtbHtml2 += '<div class="txt_box">';
 			tmtbHtml2 += '<p>보유한 상품권이 없습니다.<br></p>';