상품목록 자사즉시할인가 노출

style24.admin/src/main/java/com/style24/persistence/domain/Goods.java

@@ -36,7 +36,7 @@ public class Goods extends TscBaseDomain {
 	private int currBprice;		//변경전현재판매가
 	private String priceUpdDt;		//가격변경일시
 	private float dcRate;		//할인율
-
+	private int benefitCurrPrice;		//즉시할인판매가
 	private String goodsStat;		//상품상태(공통코드G008)
 	private String selfMallYn;		//자사몰노출여부
 	private String goodsGb;		//해외구매대행/병행수입 상품일 경우 주문 시 통관부호 입력 란이 추가되어야 한다

style24.admin/src/main/java/com/style24/persistence/domain/GoodsSearch.java

@@ -73,7 +73,7 @@ public class GoodsSearch extends TscBaseDomain {
 	private int goodsPriceResSt;
 	private int goodsPriceResEd;
 	private String selfGoodsYn;
-
+	private String goodsPriceYn;
 	private String goodsType;
 	private String selfMallYn;
 

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -401,10 +401,12 @@
 		    , (CASE WHEN Z.GOODS_TYPE = 'G056_N' THEN (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Z.GOODS_CD) 
 		            ELSE (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Z.GOODS_CD) 
 		            END) AS STOCK_QTY_SUM
-		    , 0 AS STOCK_QTY_SUM
 		    , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = Z.ITEMKIND_CD ) AS ITEMKIND_NM
 		    , FN_GET_USER_NM(REG_NO) AS REG_NM
 		    , FN_GET_USER_NM(UPD_NO) AS UPD_NM
+		    <if test='goodsPriceYn != null and goodsPriceYn = "Y"'>
+		    , GB.CURR_PRICE AS BENEFIT_CURR_PRICE
+		    </if>
 		FROM (
 		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
 		        SELECT
@@ -729,11 +731,18 @@
 		<choose>
 		<when test="pageable != null">
 		    ) A
-		)Z WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
+		)Z
+		<if test='goodsPriceYn != null and goodsPriceYn = "Y"'>
+		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Z.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
+		</if> 
+		WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
 		</when>
 		<otherwise>
 		    ) A
 		)Z
+		<if test='goodsPriceYn != null and goodsPriceYn = "Y"'>
+		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Z.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
+		</if> 
 		</otherwise>
 		</choose>
 	</sql>

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -26,6 +26,8 @@
 		<form id="searchForm" name="searchForm" action="#" th:action="@{'/goods/list'}">
 		<input type="hidden" id="searchGb" name="searchGb" />
 		<input type="hidden" id="imageViewYn" name="imageViewYn" />
+		<input type="hidden" id="goodsPriceYn" name="goodsPriceYn" value="Y"/> <!-- 즉시할인판매가 조회 -->
+		
 	 		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
 			<!-- 검색조건 영역 -->
@@ -471,7 +473,16 @@
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 14, validType: 'numeric'}
 		},
-		{headerName: "할인율", field: "dcRate" , width: 90, cellClass: 'text-right'},
+		/*{headerName: "할인율", field: "dcRate" , width: 90, cellClass: 'text-right'},*/
+		{headerName: "자사즉시할인가", field: "benefitCurrPrice" , width: 120, cellClass: 'text-right'
+			,valueFormatter: function(params) {
+				if (params.value > 0) {
+					return params.value.addComma();
+				}else{
+					return '';
+				}
+			}
+		},
 		{headerName: "가격변경일", field: "priceUpdDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -23,6 +23,8 @@
 		</div>
 		<!-- //TITLE -->
 		<form id="goodsPopupForm" name="goodsPopupForm" action="#" th:action="@{'/goods/popup/list'}">
+		<input type="hidden" id="searchGb" name="searchGb" />
+		<input type="hidden" id="goodsPriceYn" name="goodsPriceYn" value="Y"/> <!-- 즉시할인판매가 조회 -->
 		<div class="panelContent">
 			<ul class="notice">
 				<li>아래 검색조건 중 <font color="red">업체, 키워드, 발생일</font>중 하나를 꼭 입력해 주세요.</li>
@@ -295,7 +297,16 @@
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 14, validType: 'numeric'}
 		},
-		{headerName: "할인율", field: "dcRate" , width: 90, cellClass: 'text-right'},
+		/*{headerName: "할인율", field: "dcRate" , width: 90, cellClass: 'text-right'},*/
+		{headerName: "자사즉시할인가", field: "benefitCurrPrice" , width: 120, cellClass: 'text-right'
+			,valueFormatter: function(params) {
+				if (params.value > 0) {
+					return params.value.addComma();
+				}else{
+					return '';
+				}
+			}
+		},
 		{headerName: "가격변경일", field: "priceUpdDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';