eskim 5 лет назад
Родитель
Сommit
6ddd9335f6

+ 6 - 6
src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -843,10 +843,10 @@ public class TssGoodsService {
 		stock.setUpdNo(goods.getUpdNo());
 		stock.setRegNo(goods.getRegNo());
 		goodsDao.createStockHst(stock);
-		log.info("saveStock goods={}", goods);
+		//log.info("saveStock goods={}", goods);
 		for (String optCd : goods.getOptCd()) {
-			log.info("saveStock index={}", index);
-			log.info("saveStock optCd={}", optCd);
+			//log.info("saveStock index={}", index);
+			//log.info("saveStock optCd={}", optCd);
 			Option goodsStock = new Option();
 			goodsStock.setGoodsCd(goods.getCompsGoodsCd()[index]); // 구성상품 코드
 			goodsStock.setOptCd(optCd);
@@ -1016,7 +1016,7 @@ public class TssGoodsService {
 				e.printStackTrace();
 				throw new IllegalStateException(message.getMessage("상품상세공지 저장 중 오류로 인해 저장되지 않았습니다."));
 			}
-			log.info("noticeGoodsList: {}", noticeGoodsList);
+			//log.info("noticeGoodsList: {}", noticeGoodsList);
 			for (NoticeGoods noticeGoods : noticeGoodsList) {
 				noticeGoods.setNoticeSq(notice.getNoticeSq());
 				noticeGoods.setRegNo(TssSession.getInfo().getUserNo());
@@ -2272,7 +2272,7 @@ public class TssGoodsService {
 		}
 
 		// 상품상세 (html, as-is/입점)
-		if (!UPDATE_NO_PATTERN.equals(goodsMass.getGoodsContent().trim())) {
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getGoodsContent().trim()) && "G056_N".equals(goodsOrigin.getGoodsType())) {
 			if (goodsMass.getGoodsContent().toLowerCase().indexOf("script") >= 0) {
 				goods.setGoodsRegMsg("상품상세 html script 선언 오류");
 				goods.setGoodsStat("10");
@@ -2312,7 +2312,7 @@ public class TssGoodsService {
 		}
 
 		//상품 상세 변경여부 와 촬영업체가 아닌경우
-		if ("Y".equals(goods.getChkDescKeep()) && !"G001_E000".equals(TssSession.getInfo().getRoleCd())) {
+		if ("Y".equals(goods.getChkDescKeep()) && !"G001_E000".equals(TssSession.getInfo().getRoleCd()) && "G056_N".equals(goodsOrigin.getGoodsType())) {
 			GoodsDesc goodsDesc = new GoodsDesc();
 			goodsDesc.setGoodsCd(goods.getGoodsCd());
 			goodsDesc.setRegNo(goods.getRegNo());

+ 4 - 4
src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -676,17 +676,17 @@ public class TssGoodsController extends TssBaseController {
 
 				File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(goodsUploadPath, newFilename)));
 				File newFile = new File(GagaFileUtil.getConcatenationPath(goodsUploadPath, uniqueFile.getName()));
-				log.info("newFile.getPath(): {}", newFile.getPath());
+				//log.info("newFile.getPath(): {}", newFile.getPath());
 
 				// resizing 처리 시 오류가 발생할 경우 삭제하기 위해 설정
 				errorFileList.add(newFile);
 
 				File oldFile = new File(GagaFileUtil.getConcatenationPath(dextUploadPath, goodsImg.getSysImgNm()));
-				log.info("oldFile.getPath(): {}", oldFile.getPath());
+				//log.info("oldFile.getPath(): {}", oldFile.getPath());
 
 				File path = new File(goodsUploadPath);
 				if (!path.exists()) {
-					log.info("mkdir ={}", goodsUploadPath);
+					//log.info("mkdir ={}", goodsUploadPath);
 					path.mkdir();
 				}
 
@@ -709,7 +709,7 @@ public class TssGoodsController extends TssBaseController {
 		// 2.dx5에서 삭제한 파일 실제 삭제 처리
 		for (GoodsImg goodsImg : goodsImgList) {
 			if (goodsImg.getMode().equals("D")) {
-				log.info("Original file to delete: {}", GagaFileUtil.getConcatenationPath(goodsTargetPath, goodsImg.getSysImgUrl(), goodsImg.getSysImgNm()));
+				//log.info("Original file to delete: {}", GagaFileUtil.getConcatenationPath(goodsTargetPath, goodsImg.getSysImgUrl(), goodsImg.getSysImgNm()));
 
 				// 상품이미지 삭제
 				GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(goodsTargetPath, goodsImg.getSysImgUrl(), goodsImg.getSysImgNm()));