Merge remote-tracking branch 'TSIT/ST24PRJ-703' into develop

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

@@ -1299,7 +1299,17 @@
 		                SELECT 1
 		                FROM TB_COUPON X, TB_CUST_COUPON Y
 		                WHERE X.CPN_ID = Y.CPN_ID
-		                    AND Y.CUST_CPN_SQ = B.GOODS_CPN_SQ -- B.CPN1_CPN_SQ, B.CART_CPN_SQ (쿠폰종류에따라 설정)
+				<choose>
+					<when test="cpnType == 'G230_11'">
+						AND Y.CUST_CPN_SQ = B.GOODS_CPN_SQ
+					</when>
+					<when test='cpnType == "G230_20"'>
+						AND Y.CUST_CPN_SQ = B.CART_CPN_SQ
+					</when>
+		    	<otherwise>
+					 AND Y.CUST_CPN_SQ = B.CPN1_CPN_SQ
+				</otherwise>
+			  </choose>
 		                    AND X.CPN_ID = #{cpnId} -- 쿠폰번호변수
 		            )
 		            GROUP BY C.BRAND_CD, C.GOODS_CD, A.CUST_NO

src/main/webapp/WEB-INF/views/statistics/CouponTradingForm.html

@@ -58,6 +58,7 @@
 				<input name="startDt">
 				<input name="endDt">
 				<input name="cpnId">
+				<input name="cpnType">
 			</form>
 		</div>
 		<!-- 검색조건 영역 -->
@@ -177,6 +178,9 @@
 			$("#detailSearchForm input[name=startDt]").val($("#searchForm input[name=startDt]").val());
 			$("#detailSearchForm input[name=endDt]").val($("#searchForm input[name=endDt]").val());
 			$("#detailSearchForm input[name=cpnId]").val(params.cpnId);
+			$("#detailSearchForm input[name=cpnType]").val(params.cpnType);
+			console.log(params.cpnId);
+			console.log(params.cpnType);
 			$("#couponNmTxt").text(params.cpnNm);
 			gagaAgGrid.fetch($('#detailSearchForm').prop('action'), detailGridOptions, '#detailSearchForm', fnDetailCreateTotal);
 		}