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

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/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/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();