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

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -402,24 +402,31 @@ public class TsaGoodsService {
 
 		if ("Y".equals(goodsSearch.getImageViewYn())) {
 			// 헤더 title 설정
-			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "자사즉시할인가", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부"};
+			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목",
+				"전시재고", "상품상태", "스타일년도", "시즌", "정상가", "판매가", "자사즉시할인가", "가격변경일",
+				"포인트적립율(PC)", "포인트적립율(MO)", "선포인트적용여부(PC)", "선포인트적용여부(MO)", "선물포장여부", "1인당최대구매수량", "최수주문수량", "신규고객주문가능일시",
+				"ERP재고연동여부", "정상이월구분", "반품가능여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
 			String[] cellNames = {"SYS_IMG_NM", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
-				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE",
-				"BENEFIT_PRICE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
+				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT",
+				"PNT_PRATE", "PNT_MRATE", "PRE_PPNT_USABLE_YN", "PRE_MPNT_USABLE_YN", "GIFT_PACK_YN", "DAY_MAX_ORD_QTY", "MIN_ORD_QTY", "NEW_CUST_ORD_DT",
+				"ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
 
-			String[] cellTypes = {GagaExcelConstants.CellType.IMAGE.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name()};
+			String[] cellTypes = {
+					GagaExcelConstants.CellType.IMAGE.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+					GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			String targetPath = env.getProperty("upload.goods.view");
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch); // map형식으로 조회
@@ -444,22 +451,31 @@ public class TsaGoodsService {
 
 		} else {
 			// 헤더 title 설정
-			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "자사즉시할인가", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부"};
+			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목",
+				"전시재고", "상품상태", "스타일년도", "시즌", "정상가", "판매가", "자사즉시할인가", "가격변경일",
+				"포인트적립율(PC)", "포인트적립율(MO)", "선포인트적용여부(PC)", "선포인트적용여부(MO)", "선물포장여부", "1인당최대구매수량", "최수주문수량", "신규고객주문가능일시",
+				"ERP재고연동여부", "정상이월구분", "반품가능여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
-			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM", "STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR",
-				"SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
+			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
+				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT",
+				"PNT_PRATE", "PNT_MRATE", "PRE_PPNT_USABLE_YN", "PRE_MPNT_USABLE_YN", "GIFT_PACK_YN", "DAY_MAX_ORD_QTY", "MIN_ORD_QTY", "NEW_CUST_ORD_DT",
+				"ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {
+				GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch);
 

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

@@ -218,5 +218,7 @@ public class Goods extends TscBaseDomain {
 	private int pageNo = 1;
 	private int pageSize = 50;
 	private int pageUnit = 10;
+	
+	private String newCustOrdDt;	// 신규고객주문가능일시
 
 }

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

@@ -480,7 +480,6 @@
 		              , G.CHANGEABLE_YN
 		              , G.RETURNABLE_YN
 		              , G.NEW_CUST_ORD_YN
-		              , G.GIFT_PACK_YN
 		              , G.DELV_LOC_CD
 		              , G.DELV_FEE_CD
 		              , G.MAIN_COLOR_CD
@@ -500,6 +499,19 @@
 		              , 0 AS TMP_DISP_ORD
 		                  </otherwise>
 		              </choose>
+		              , G.PNT_PRATE                              /*PC포인트적립율*/
+		              , G.PNT_MRATE                              /*모바일포인트적립율*/
+		              , G.PRE_PPNT_USABLE_YN                     /*PC선포인트적용여부*/
+		              , G.PRE_MPNT_USABLE_YN                     /*모바일선포인트적용여부*/
+		              , G.GIFT_PACK_YN                           /*선물포장여부*/
+		              , G.DAY_MAX_ORD_QTY                        /*ID당1일최대구매수량*/
+		              , G.MIN_ORD_QTY                            /*최수주문수량*/
+		              , CASE WHEN G.NEW_CUST_ORD_STDT IS NOT NULL AND G.NEW_CUST_ORD_EDDT IS NOT NULL THEN
+		                         CONCAT(DATE_FORMAT(G.NEW_CUST_ORD_STDT,'%Y-%m-%d %H:%i:%S'),
+		                                ' ~ ',
+		                                DATE_FORMAT(G.NEW_CUST_ORD_EDDT,'%Y-%m-%d %H:%i:%S'))
+		                     ELSE ''
+		                END                   AS NEW_CUST_ORD_DT /*신규고객주문가능일시*/
 		        FROM TB_GOODS G
 		       -- JOIN ( SELECT @rownum := 0) R
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
@@ -856,13 +868,13 @@
 		           , G.GOODS_NM
 		           , G.GOODS_TYPE
 		           , FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
-		           , G.LIST_PRICE
-		           , G.CURR_PRICE
+		           , FORMAT(G.LIST_PRICE,0)               AS LIST_PRICE
+		           , FORMAT(G.CURR_PRICE,0)               AS CURR_PRICE
 		          -- , G.DC_RATE
 		           , G.SELF_GOODS_YN
-		           , FN_GET_CODE_NM('G009', G.FORMAL_GB) AS FORMAL_GB
+		           , FN_GET_CODE_NM('G009', G.FORMAL_GB)  AS FORMAL_GB
 		           , G.STYLE_YEAR
-		           , FN_GET_CODE_NM('G006', G.SEASON_CD) AS SEASON_CD
+		           , FN_GET_CODE_NM('G006', G.SEASON_CD)  AS SEASON_CD
 		           , G.ERP_STOCK_LINK_YN
 		           , G.CHANGEABLE_YN
 		           , G.RETURNABLE_YN
@@ -887,6 +899,19 @@
 		           , 0 AS TMP_DISP_ORD
 		           </otherwise>
 		           </choose>
+		           , G.PNT_PRATE                                    /*PC포인트적립율*/
+		           , G.PNT_MRATE                                    /*모바일포인트적립율*/
+		           , G.PRE_PPNT_USABLE_YN                           /*PC선포인트적용여부*/
+		           , G.PRE_MPNT_USABLE_YN                           /*모바일선포인트적용여부*/
+		           , G.GIFT_PACK_YN                                 /*선물포장여부*/
+		           , FORMAT(G.DAY_MAX_ORD_QTY,0) AS DAY_MAX_ORD_QTY /*ID당1일최대구매수량*/
+		           , FORMAT(G.MIN_ORD_QTY,0)     AS MIN_ORD_QTY     /*최수주문수량*/
+		           , CASE WHEN G.NEW_CUST_ORD_STDT IS NOT NULL AND G.NEW_CUST_ORD_EDDT IS NOT NULL THEN
+		                      CONCAT(DATE_FORMAT(G.NEW_CUST_ORD_STDT,'%Y-%m-%d %H:%i:%S'),
+		                             ' ~ ',
+		                             DATE_FORMAT(G.NEW_CUST_ORD_EDDT,'%Y-%m-%d %H:%i:%S'))
+		                  ELSE ''
+		             END                         AS NEW_CUST_ORD_DT /*신규고객주문가능일시*/
 		      FROM TB_GOODS G
 		      INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		      INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD

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

@@ -505,11 +505,32 @@
 				}
 			}
 		},
-		{headerName: "가격변경일", field: "priceUpdDt", width: 150, cellClass: 'text-center',
+		{
+			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") : '';
 			}
 		},
+		{
+			headerName: "포인트적립율(PC)", field: "pntPrate", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { return params.value + '%'; }
+		},
+		{
+			headerName: "포인트적립율(MO)", field: "pntMrate", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { return params.value + '%'; }
+		},
+		{ headerName: "선포인트적용여부(PC)", field: "prePpntUsableYn", width: 150, cellClass: 'text-center' },
+		{ headerName: "선포인트적용여부(MO)", field: "preMpntUsableYn", width: 150, cellClass: 'text-center' },
+		{ headerName: "선물포장여부", field: "giftPackYn", width: 120, cellClass: 'text-center' },
+		{
+			headerName: "1인당최대구매수량", field: "dayMaxOrdQty" , width: 150, cellClass: 'text-center',
+			valueFormatter: function(params) { return params.value.addComma(); }
+		},
+		{
+			headerName: "최수주문수량", field: "minOrdQty" , width: 120, cellClass: 'text-center',
+			valueFormatter: function(params) { return params.value.addComma(); }
+		},
+		{ headerName: "신규고객주문가능일시", field: "newCustOrdDt", width: 280, cellClass: 'text-center' },
 		{headerName: "ERP재고연동여부", field: "erpStockLinkYn", width: 120, cellClass: 'text-center'},
 		{headerName: "이월구분", field: "formalGb", width: 100, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(formalGbList) },