Merge branch 'develop' into jmh

src/main/java/com/style24/persistence/domain/Statistics.java

@@ -87,6 +87,10 @@ public class Statistics extends TscBaseDomain {
 	private String optCd2;				// 옵션코드2
 	private String itemkindCd;			// 품목코드
 	private String itemkindNm;			// 품목명
+	private String itemkindNm1;			// 품목명1
+	private String itemkindNm2;			// 품목명2
+	private String itemkindNm3;			// 품목명3
+	private String itemkindNm4;			// 품목명4
 	private int mallPrice;				// 몰판매가
 	private int sellPrice;				// 판매가(정산판매가적용)
 	private int sellAmt;				// 판매금액(CPN1_DC_AMT가 빠진 금액이 들어가 있음)

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

@@ -5317,6 +5317,20 @@
 		                                      )
 		                   )
 		</if>
+		<if test="multiBrand != null and multiBrand != ''">
+		AND A.GOODS_CONTENTS_SQ IN (
+		                    SELECT GOODS_CONTENTS_SQ
+		                    FROM TB_GOODS_CONTENTS_DATA
+		                    WHERE GOODS_CD IN (
+		                                       SELECT GOODS_CD
+		                                       FROM TB_GOODS
+		                                       WHERE BRAND_CD IN
+		                                       <foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
+		                                           #{item}
+		                                       </foreach>
+		                                      )
+		                   )
+		</if>
 		ORDER  BY A.GOODS_CONTENTS_SQ DESC
 	</select>
 

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

@@ -34,6 +34,22 @@
 		     , ODIH.OPT_CD2                                                               /*옵션코드2*/
 		     , ODIH.ITEMKIND_CD                                                           /*품목코드*/
 		     , ODIH.ITEMKIND_NM                                                           /*품목명*/
+		     , SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',1)          AS ITEMKIND_NM1           /*품목명1*/
+		     , CASE WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',1),'>',-1) = SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',2),'>',-1) THEN
+		                NULL
+		            ELSE
+		                SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',2),'>',-1)
+		       END                                              AS ITEMKIND_NM2           /*품목명2*/
+		     , CASE WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',2),'>',-1) = SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',3),'>',-1) THEN
+		                NULL
+		            ELSE
+		                SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',3),'>',-1)
+		       END                                              AS ITEMKIND_NM3           /*품목명3*/
+		     , CASE WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',3),'>',-1) = SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',4),'>',-1) THEN
+		                ''
+		            ELSE
+		                SUBSTRING_INDEX(SUBSTRING_INDEX(ODIH.ITEMKIND_NM,'>',4),'>',-1)
+		       END                                              AS ITEMKIND_NM4           /*품목명4*/
 		     , ODIH.MALL_PRICE                                                            /*몰판매가*/
 		     , ODIH.SELL_PRICE                                                            /*판매가*/
 		     , ODIH.SELL_QTY                                                              /*판매수량*/

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.admin.biz.dao.TsaStockDao">
-	
+
 	<!-- 상품 목록 조건 정보 -->
 	<sql id="getGoodsListCondition_sql">
 		        <if test='conditionList != null and conditionList.length>0'>
@@ -9,7 +9,7 @@
 		              <when test='search != null and search == "searchGoodsCd"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               G.GOODS_CD LIKE CONCAT(#{item},'%') 
+		               G.GOODS_CD LIKE CONCAT(#{item},'%')
 		              </foreach>
 		             )
 		              </when>
@@ -100,7 +100,7 @@
 		        AND G.STYLE_YEAR = #{styleYear}
 		        </if>
 		        <if test="multiStyleYear != null and multiStyleYear != ''">
-		        AND G.STYLE_YEAR IN  
+		        AND G.STYLE_YEAR IN
 		            <foreach collection="multiStyleYear" item="item" index="index"  open="(" close=")" separator=",">
 		            #{item}
 		            </foreach>
@@ -134,7 +134,7 @@
 		        </if>
 		        <if test='soldOutYn != null and soldOutYn == "Y"'>
 		        AND EXISTS (
-		                    SELECT GOODS_CD 
+		                    SELECT GOODS_CD
 		                    FROM VW_STOCK
 		                    WHERE SOLDOUT_YN = 'Y'
 		                    AND GOODS_CD = G.GOODS_CD
@@ -142,7 +142,7 @@
 		        </if>
 		        <if test='soldOutYn != null and soldOutYn == "N"'>
 		        AND NOT EXISTS (
-		                    SELECT GOODS_CD 
+		                    SELECT GOODS_CD
 		                    FROM VW_STOCK
 		                    WHERE SOLDOUT_YN = 'Y'
 		                    AND GOODS_CD = G.GOODS_CD
@@ -219,7 +219,7 @@
 		        AND G.AGE_GRP_CD = #{ageGrpCd}
 		        </if>
 	</sql>
-	
+
 	<!-- 목록 페이징 정보 -->
 	<sql id="getListPagingCondition_sql">
 		<choose>
@@ -235,13 +235,13 @@
 		</otherwise>
 		</choose>
 	</sql>
-	
+
 	<!-- 목록 페이징 정보 LIMIT 용 -->
 	<sql id="getListLimitPagingCondition_sql">
 		<choose>
 		<when test="pageable != null">
 		    ) A
-		)Z 
+		)Z
 		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
 		</when>
 		<otherwise>
@@ -250,7 +250,7 @@
 		</otherwise>
 		</choose>
 	</sql>
-	
+
 	<!-- 상품 사이즈별 재고 현황 목록 건수 -->
 	<select id="getGoodsSizeStockCount" parameterType="GoodsSearch" resultType="int">
 		/* TsaStock.getGoodsSizeStockCount */
@@ -296,7 +296,7 @@
 		                              GROUP BY SEARCH_CD) T
 		                      ) SD
 		                   ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
-		                        OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')) 
+		                        OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%'))
 		                        <if test="mdNo != null and mdNo != ''">
 		                        AND G.BRAND_CD IN (
 		                                           SELECT DISTINCT BRAND_CD
@@ -320,7 +320,7 @@
 		                              GROUP BY SEARCH_CD, DUMMY1) T
 		                      ) SD
 		                   ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
-		                        OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')) 
+		                        OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%'))
 		                        <if test="mdNo != null and mdNo != ''">
 		                        AND G.BRAND_CD IN (
 		                                           SELECT DISTINCT BRAND_CD
@@ -337,7 +337,7 @@
 		            <if test="searchGb == null or searchGb =='BASIC'">
 		            <include refid="getGoodsListCondition_sql"/>
 		            </if>
-		            
+
 		           ) Y
 		      ) X
 		WHERE 1 = 1
@@ -349,7 +349,7 @@
 		    <![CDATA[
 		AND X.STOCK_QTY <= #{stockQtyEd}
 		    ]]>
-		    </if> 
+		    </if>
 		</if>
 	</select>
 
@@ -358,20 +358,20 @@
 		/* TsaStock.getGoodsSizeStockList */
 		<include refid="getGoodsSizeStockList_sql"/>
 	</select>
-	
+
 	<!-- 사이즈별재고현황 - 엑셀다운로드 -->
 	<select id="getGoodsSizeStockExcelList" parameterType="GoodsSearch" resultType="paramMap">
 		/* TsaStock.getGoodsSizeStockExcelList */
 		<include refid="getGoodsSizeStockList_sql"/>
 	</select>
-	
+
 	<!--  사이즈별 재고현황 정보 -->
 	<sql id="getGoodsSizeStockList_sql">
 		SELECT Z.*
 		    , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = Z.ITEMKIND_CD) AS ITEMKIND_NM
 		    , FN_GET_CODE_NM('G008', Z.GOODS_STAT) AS GOODS_STAT_NM
 		FROM (
-		    SELECT A.* -- , @rownum := @rownum + 1  RNUM 
+		    SELECT A.* -- , @rownum := @rownum + 1  RNUM
 		    FROM (
 		        SELECT  X.GOODS_CD
 		              , X.BRAND_ENM
@@ -392,7 +392,7 @@
 		              , X.ABLE_STOCK_QTY /*판매가능재고*/
 		              , X.REG_DT
 		        FROM (
-		              
+
 		                    SELECT
 		                            G.GOODS_CD
 		                          , B.BRAND_ENM
@@ -447,7 +447,7 @@
 		                                      GROUP BY SEARCH_CD) T
 		                              ) SD
 		                           ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
-		                                OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')) 
+		                                OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%'))
 		                                <if test="mdNo != null and mdNo != ''">
 		                                AND G.BRAND_CD IN (
 		                                                   SELECT DISTINCT BRAND_CD
@@ -471,7 +471,7 @@
 		                                      GROUP BY SEARCH_CD, DUMMY1) T
 		                              ) SD
 		                           ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
-		                                OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')) 
+		                                OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%'))
 		                                <if test="mdNo != null and mdNo != ''">
 		                                AND G.BRAND_CD IN (
 		                                                   SELECT DISTINCT BRAND_CD
@@ -499,11 +499,11 @@
 		        AND X.CURR_STOCK_QTY <= #{stockQtyEd}
 		            ]]>
 		            </if>
-		        ORDER BY X.GOODS_CD, X.OPT_CD, X.REG_DT DESC
+		        ORDER BY X.GOODS_CD, X.REG_DT DESC
 		        </if>
 		<include refid="getListLimitPagingCondition_sql"/>
 	</sql>
-	
+
 	<!-- 상품 사이즈별 품절여부 변경 -->
 	<update id="updateStockSoldOut" parameterType="Option">
 		/* TsaStock.updateStockSoldOut */
@@ -515,5 +515,5 @@
 		WHERE GOODS_CD = #{goodsCd}
 		AND OPT_CD = #{optCd}
 	</update>
-	
+
 </mapper>

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

@@ -105,6 +105,10 @@
 			headerName: "품목", field: "itemkindNm", width: 200,
 			cellRenderer: function (params) { return gagajf.isNull(params.value) ? '' : params.value.replaceAll('>','>'); }
 		},
+		{ headerName: "품목1", field: "itemkindNm1", width: 100 },
+		{ headerName: "품목2", field: "itemkindNm2", width: 100 },
+		{ headerName: "품목3", field: "itemkindNm3", width: 100 },
+		{ headerName: "품목4", field: "itemkindNm4", width: 100 },
 		{
 			headerName: "판매가", field: "sellPrice", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -350,8 +350,8 @@
 			ordChgQty = ordChgQty + result.dataList[idx].chgQty;
 		});
 		
-		// 전체 회수 완료 일 때. 제휴몰일때 
-		if (result.dataList.length == confirmCnt || result.dataList[0].mallGb == 'G011_20') {
+		// 전체 회수 완료 일 때
+		if (result.dataList.length == confirmCnt ) {
 			setReadOnly(true);
 			$('#pgBtn').hide();
 			$('#divRefundInfo').hide();