Merge remote-tracking branch 'origin/develop' into card007

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

@@ -20,6 +20,7 @@ import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscCommonService;
 import com.style24.core.biz.thirdparty.NaverLowestPriceApi;
 import com.style24.core.biz.thirdparty.SafetyKoreaApi;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.AdKeyword;
 import com.style24.persistence.domain.AdKeywordGoods;
@@ -1916,7 +1917,7 @@ public class TsaGoodsService {
 			idx++;
 		}
 	}
-	
+
 	/**
 	 * 상품예약판매 출고예정일수정
 	 *
@@ -1932,8 +1933,6 @@ public class TsaGoodsService {
 			goodsDao.updateGoodResSellDelvResDt(item);
 		}
 	}
-	
-	
 
 	/**
 	 * 상품 상세공지 목록
@@ -2721,7 +2720,7 @@ public class TsaGoodsService {
 				goodsImg.setRegNo(TsaSession.getInfo().getUserNo());
 				goodsDao.createGoodsImage(goodsImg);
 			}
-			
+
 			// "정보부족"인 상태의 상품 중 기본이미지가 생성될 경우 승인대기상태로 변경
 			if (goodsImg.getMode().equals("C") && goodsImg.getDefaultImgYn().equals("Y")) {
 				goods = new Goods();
@@ -3963,7 +3962,7 @@ public class TsaGoodsService {
 		goods.setDistributionGb(distributionGb);
 
 		//출고처 코드
-		goods.setDelvLocCd("DL001"); // 자사상품 출고처 코드 고정		
+		goods.setDelvLocCd(TscConstants.WMS_DELV_LOC_CD); // 자사상품 출고처 코드 고정
 
 		// 기본정보 생성
 		goodsDao.createGoods(goods); // 상품기본 저장

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -1092,7 +1092,7 @@ public class TsaGoodsController extends TsaBaseController {
 		} else { // 대표이미지와 마우스오버이미지가 없으면
 			mav.addObject("goodsImgList", new ArrayList<GoodsImg>());
 			mav.addObject("defaultImgOrd", "1");
-			mav.addObject("mouseoverImgOrd", "1");
+			mav.addObject("mouseoverImgOrd", "2");
 		}
 
 		GoodsImg goodsModelInfo = goodsService.getGoodsModelInfo(goodsImg);

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

@@ -5064,11 +5064,11 @@
 		FROM TB_GOODS B 
 		INNER JOIN TB_STOCK_SYNC_BASE C ON B.BRAND_CD = C.BRAND_CD
 		                                AND C.STOCK_SYNC_YN = 'Y'
-		                                AND C.DELV_LOC_CD = 'DL001'    -- WMS 매장코드
+		                                AND C.DELV_LOC_CD = 'ST0001'    -- WMS 매장코드
 		INNER JOIN TB_DELIVERY_LOC D ON B.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
 		                             AND C.DELV_LOC_CD = D.DELV_LOC_CD
 		                             AND D.USE_YN = 'Y'
-		                             AND D.DELV_LOC_CD = 'DL001'    -- WMS 매장코드
+		                             AND D.DELV_LOC_CD = 'ST0001'    -- WMS 매장코드
 		INNER JOIN TB_WMS_COLOR_MAPPING F ON B.SUPPLY_COMP_CD = F.SUPPLY_COMP_CD
 		                                  AND #{wmsColorCd} = F.WMS_COLOR_CD
 		                                  AND F.USE_YN ='Y' 

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

@@ -45,7 +45,7 @@ let cfnGetDaumRoadAddr = function(data) {
 	}
 
 	// 건물명이 있고, 공동주택일 경우 추가한다.
-	if (data.buildingName !== '' && data.apartment === 'Y') {
+	if (data.buildingName !== '') {
 		extraRoadAddr += (extraRoadAddr !== '' ? ', ' + data.buildingName : data.buildingName);
 	}