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

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

@@ -94,6 +94,9 @@ public class TsfCouponService {
 				} else if ("N".equals(myCpn.getAvailYn())) {
 					cpn.setResult("지급 받으신 쿠폰의 유효기간이 아닙니다.");
 					return cpn;
+				} else if (!StringUtils.isEmpty(myCpn.getRdCpnNm()) && myCpn.getCnt() < 1) {
+					cpn.setResult("동일 쿠폰을 " + myCpn.getRdCpnNm() + "으로 지급 받으셨습니다.<br/>해당 쿠폰을 사용해주세요.");
+					return cpn;
 				}
 			} else {
 				/* 다운받은 쿠폰이 아닐 경우 (tb_cust_coupon insert) */

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

@@ -28,11 +28,16 @@
 		     , CP.CPN_NM
 		     , CP.CUST_PUB_LIMIT_QTY
 		     , CP.APPLY_SCOPE
+		     , RC.RD_CPN_NM
+		     , CASE WHEN #{rdCpnNm} = RC.RD_CPN_NM THEN 1 ELSE 0 END AS CNT
 		     , DATE_FORMAT(CC.AVAIL_STDT, '%Y.%m.%d %H:%i') AS AVAIL_STDT_TIME
 		     , DATE_FORMAT(CC.AVAIL_EDDT, '%Y.%m.%d %H:%i') AS AVAIL_EDDT_TIME
 		FROM   TB_COUPON CP
 		INNER  JOIN TB_CUST_COUPON CC
 		ON     CC.CPN_ID = CP.CPN_ID
+		LEFT   OUTER JOIN TB_RANDOM_COUPON RC
+		ON     RC.CPN_ID = CC.CPN_ID
+		AND    CC.CUST_NO = RC.CUST_NO
 		WHERE  1=1
 		AND    CC.CPN_ID = #{cpnId}
 		AND    CC.CUST_NO = #{custNo}

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

@@ -346,6 +346,7 @@
 		    ON ODI.ITEM_CD = G2.GOODS_CD
 		 INNER JOIN TB_PAYMENT P
 		    ON P.ORD_NO = O.ORD_NO
+		   AND P.PAY_STAT = 'G016_30'
 		  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
 		                        , SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
 		                     FROM TB_ORDER_CHANGE_DETAIL OCD

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -585,7 +585,7 @@
 			cfnAddCart(compsList);*/
 
 			if([[${!order.shotCanYn.equals('Y')}]]) {
-				//$(".shotDelvSelect").hide();
+				$(".shotDelvSelect").hide();
 			}
 
 			$("#cartListForm .area_salecoupon .coupon_box").hide();
@@ -678,6 +678,11 @@
 				currPrices.push($(this).parents(".cartInfo").find("input[name=tmtbDcAmt]").val());
 			});
 
+			if(!$("#cartListForm #serialCpnNm").val()) {
+				mcxDialog.alert("할인코드를 입력해주세요.");
+				return false;
+			}
+
 			let data = {
 				rdCpnNm : $("#cartListForm #serialCpnNm").val(),
 				cartSqArr : cartArr,