Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfGoodsService.java

@@ -468,7 +468,7 @@ public class TsfGoodsService {
 		boolean returnFlag = false;
 		//String[][] arrGoodsStoreList = null;	// 상품코드, 매장코드, 상품별 주문수량
 
-		log.info("[getGoodsSetStockQty] goodsStock = {}", goodsStock);
+		//log.info("[getGoodsSetStockQty] goodsStock = {}", goodsStock);
 
 		// 예약상품 여부 확인
 		int goodsResSellCount = goodsDao.getGoodsResSellCount(goodsStock.getGoodsCd());
@@ -477,7 +477,7 @@ public class TsfGoodsService {
 		for (String arrGoodsCd : goodsStock.getArrGoodsOption()) {	// [{goodsCd|optCd|qty},{goodsCd|optCd|qty}]
 
 			String[] goodsSizeInfo = arrGoodsCd.split("\\|");
-			log.info("[getGoodsSetStockQty] goodsSizeInfo = {}", goodsSizeInfo);
+			//log.info("[getGoodsSetStockQty] goodsSizeInfo = {}", goodsSizeInfo);
 			if (goodsSizeInfo.length == 3) {
 
 				GoodsStock tmpStock = new GoodsStock();
@@ -492,7 +492,7 @@ public class TsfGoodsService {
 					stockByGoodsSize = goodsDao.getGoodsStoreStockQty(tmpStock);
 				}
 				
-				log.info("[getGoodsSetStockQty] stockByGoodsSize = {}", stockByGoodsSize);
+				//log.info("[getGoodsSetStockQty] stockByGoodsSize = {}", stockByGoodsSize);
 				if (stockByGoodsSize <= 0) {
 					returnFlag = true;
 					break;
@@ -507,7 +507,7 @@ public class TsfGoodsService {
 						}
 					}
 				}
-				log.info("[getGoodsSetStockQty] ableOrderCnt = {}", ableOrderCnt);
+				//log.info("[getGoodsSetStockQty] ableOrderCnt = {}", ableOrderCnt);
 			} else {
 				returnFlag = true;
 				break;
@@ -579,8 +579,8 @@ public class TsfGoodsService {
 		if (tmtbSqList == null || tmtbSqList.isEmpty()) {
 			return result;
 		}
-		log.info("[tmtbSqList]={}",tmtbSqList);
-		log.info("[goods]={}",goods);
+		//log.info("[tmtbSqList]={}",tmtbSqList);
+		//log.info("[goods]={}",goods);
 		int rCount = 0;	//다다익선 조회수
 		int tCount = goods.getMaxRownum();	//리턴 잔여수
 		if (tCount == 0) tCount = 20;
@@ -774,7 +774,7 @@ public class TsfGoodsService {
 			measurementStyle.setGoodsCd(goods.getGoodsCd());
 			measurementStyle.setSizeCount(colSize);
 			
-			log.info("arrMeasurementList[0].length = {}", arrMeasurementList[0].length);
+			//log.info("arrMeasurementList[0].length = {}", arrMeasurementList[0].length);
 			for(int j=0; j<arrMeasurementList[0].length; j++) {
 				switch(j) {
 					case 0: measurementStyle.setTypecd(arrMeasurementList[i][j]); break;
@@ -803,7 +803,7 @@ public class TsfGoodsService {
 			measurementStyleList.add(measurementStyle);
 		}
 
-		log.info("measurementStyleList = {}", measurementStyleList);
+		//log.info("measurementStyleList = {}", measurementStyleList);
 	
 		return measurementStyleList;
 	}

src/main/java/com/style24/front/support/env/TsfConstants.java

@@ -51,6 +51,27 @@ public class TsfConstants {
 			return value;
 		}
 	}
+	
+	// 정산구분상태
+	public enum OrdDtlItemStat {
+		
+		SALE_PAYMENT_COMPLETE("G720_10"), 			// 판매-결제완료
+		SALE_SHIPPING("G720_20"),					// 판매-배송완료
+		SALE_RETURN_CANCEL("G720_30"), 				// 환입-취소완료
+		SALE_RETURN_SOLDOUT_CANCEL("G720_40"),		// 환입-품절취소
+		SALE_RETURN_RETURN_COMPLETE("G720_50"),		// 환입-반품완료
+		SALE_RETURN_EXCHANGE_COMPLETE("G720_60");	// 환입-교환완료
+
+		private String value;
+
+		private OrdDtlItemStat(String value) {
+			this.value = value;
+		}
+
+		public String value() {
+			return value;
+		}
+	}
 
 //	// 카테고리구분
 //	public enum CATE_GB {

src/main/webapp/WEB-INF/views/web/common/fragments/HeadWeb.html

@@ -77,12 +77,12 @@
 	<script src="https://www.google.com/recaptcha/api.js" async defer></script>
 
 	<!-- Global site tag (gtag.js) - Google Analytics -->
-<!-- 	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-168660512-1"></script> -->
+<!-- 	<script async src="https://www.googletagmanager.com/gtag/js?id=G-MQWD9VX4KH"></script> -->
 	<script>
 // 		window.dataLayer = window.dataLayer || [];
 // 		function gtag(){dataLayer.push(arguments);}
 // 		gtag('js', new Date());
-// 		gtag('config', 'UA-168660512-1');
+// 		gtag('config', 'G-MQWD9VX4KH');
 	</script>
 	
 	<th:block th:if="${sessionInfo != null}">