자사상품등록 고시정보 적용

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

@@ -23,6 +23,6 @@ public class GoodsNotiInfo extends TscBaseDomain {
 	private String reqYn;
 
 	private String niItemNm;
-	private String supplyCompCd;
+	private String supplyVendorCd;
 
 }

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

@@ -629,7 +629,7 @@
 		     , A.REQ_YN
 		FROM TB_GOODS_NOTI_INFO C
 		INNER JOIN TB_GOODS B ON C.GOODS_CD = B.GOODS_CD
-        INNER JOIN TB_SUPPLY_COMPANY D ON B.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
+		INNER JOIN TB_SUPPLY_COMPANY D ON B.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
 		INNER JOIN TB_NOTI_INFO A ON C.NI_CLSF_CD = A.NI_CLSF_CD
 		                          AND C.NI_ITEM_CD = A.NI_ITEM_CD
 		                          AND A.SUPPLY_VENDOR_CD = CASE D.SUPPLY_VENDOR_CD

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -1109,7 +1109,7 @@ public class TssGoodsService {
 			return goods.getGoodsStat();  //continue
 		}
 
-		// 상품고시정보
+		// 상품고시정보 - 항목및 기본값
 		Collection<GoodsNotiInfo> goodsNotiList = goodsDao.getItemkindNotiInfoList(goods);
 		if (goodsNotiList == null || goodsNotiList.isEmpty()) {
 			goods.setGoodsRegMsg("품목의 고시정보 없음");
@@ -1148,8 +1148,13 @@ public class TssGoodsService {
 			goodsDao.updateGoodsMainColorCd(goodsColorSize); // 대표색상 설정
 		}
 
+		int index = 0;
 		// 자사 상품 등록시 고시정보 처리
 		for (GoodsNotiInfo goodsNotiInfo : goodsNotiList) {
+			if (!StringUtils.isEmpty(gagaMap.getString("niContent" + (index + 1)))) {
+				goodsNotiInfo.setNiContent(gagaMap.getString("niContent" + (index + 1)));
+			}
+
 			if ("G005_003".equals(goodsNotiInfo.getNiItemCd())) {	// 색상
 				if (!StringUtils.isEmpty(goodsColorSize.getOpt1Str())) {
 					goodsNotiInfo.setNiContent(goodsColorSize.getOpt1Str());
@@ -1178,8 +1183,10 @@ public class TssGoodsService {
 					goodsNotiInfo.setNiContent(goods.getItemkindNm());
 				}
 			}
+			index++;
 		}
 
+		log.info("[goodsNotiList goodsNotiList goodsNotiList ]={}", goodsNotiList);
 		//고시항목 필수값 확인
 		goods = this.getGoodsNotiCheck(goods, goodsNotiList, gagaMap, procJob);
 
@@ -1555,13 +1562,14 @@ public class TssGoodsService {
 	 * @since 2021. 01. 12
 	 */
 	private Goods getGoodsNotiCheck(Goods goods, Collection<GoodsNotiInfo> goodsNotiList, GagaMap excelMap, String procJob) {
-
+		log.info("[getGoodsNotiCheck goodsNotiList] =>{}", goodsNotiList);
 		// 고시항목 필수값 입력 확인
 		int index = 0;
 
 		if ("createSelfGoods".equals(procJob)) {
 			for (GoodsNotiInfo goodsNotiInfo : goodsNotiList) {
 				if ("Y".equals(goodsNotiInfo.getReqYn()) && StringUtils.isEmpty(goodsNotiInfo.getNiContent())) {
+					log.info("[goodsNotiInfo] =>{}", goodsNotiInfo);
 					goods.setGoodsRegMsg("고시항목 오류");
 					goods.setGoodsStat("G008_20");
 					return goods;

src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -6,7 +6,6 @@ import java.util.Collection;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.style24.persistence.TscPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.InputStreamResource;
@@ -25,6 +24,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
@@ -269,7 +269,6 @@ public class TssGoodsController extends TssBaseController {
 					//고시정보
 					GoodsNotiInfo goodsNotiInfo = new GoodsNotiInfo();
 					goodsNotiInfo.setGoodsCd(tmpGoods.getGoodsCd());
-					goodsNotiInfo.setSupplyCompCd(tmpGoods.getSupplyCompCd());
 					goodsNotiInfo.setNiClsfCd(tmpGoods.getNiClsfCd());
 					Collection<GoodsNotiInfo> goodsNotiInfoList = goodsService.getGoodsNotiInfoList(goodsNotiInfo);
 					if (goodsNotiInfoList == null || goodsNotiInfoList.isEmpty()) {
@@ -497,7 +496,6 @@ public class TssGoodsController extends TssBaseController {
 		GoodsNotiInfo goodsInfo = new GoodsNotiInfo();
 		goodsInfo.setGoodsCd(goods.getGoodsCd());
 		goodsInfo.setNiClsfCd(goods.getNiClsfCd());
-		goodsInfo.setSupplyCompCd(goods.getSupplyCompCd());
 
 		return goodsService.getGoodsNotiInfoList(goodsInfo);
 	}