Просмотр исходного кода

안전인증 관련 배치 수정

eskim 5 лет назад
Родитель
Сommit
653e10e99e

+ 23 - 2
src/main/java/com/style24/batch/biz/service/TsbGoodsService.java

@@ -339,17 +339,38 @@ public class TsbGoodsService {
 	@Transactional("shopTxnManager")
 	public void saveGoodsSafeNo() {
 
-		// 1. 대상 상품 조회
+//		// 1. 대상 상품 조회
+//		Collection<GoodsSafeNo> goodsSafeNoList = goodsDao.getGoodsSafeNoList();
+//		// 2. 인증테이블 적용
+//		for (GoodsSafeNo goodsSafeNo : goodsSafeNoList) {
+//			try {
+//				GagaMap result = safetyKoreaApi.getKoreaCertifyNo(goodsSafeNo.getGoodsNum()); // 품번으로 처리
+//				if (result != null || !StringUtil.isNullOrEmpty(result.get("certNum").toString())) {
+//					goodsSafeNo.setCertDt(result.get("certDt").toString());
+//					goodsSafeNo.setCertNum(result.get("certNum").toString());
+//					goodsSafeNo.setCertDiv(result.get("certDiv").toString());
+//					goodsSafeNo.setCertState(result.get("certState").toString());
+//					goodsSafeNo.setRegNo(TsbConstants.REG_NO);
+//					goodsSafeNo.setUpdNo(TsbConstants.REG_NO);
+//					goodsDao.saveGoodsSafeNo(goodsSafeNo);
+//				}
+//			} catch (Exception e) {
+//				// do nothing
+//			}
+//		}
+
+		// 1. 대상 상품 조회 - 인증번호가 있는 상품 조회(tb_goods_safe 변경)
 		Collection<GoodsSafeNo> goodsSafeNoList = goodsDao.getGoodsSafeNoList();
 		// 2. 인증테이블 적용
 		for (GoodsSafeNo goodsSafeNo : goodsSafeNoList) {
 			try {
-				GagaMap result = safetyKoreaApi.getKoreaCertifyNo(goodsSafeNo.getGoodsNum()); // 품번으로 처리
+				GagaMap result = safetyKoreaApi.getKoreaCertifyDetail(goodsSafeNo.getCertNum());
 				if (result != null || !StringUtil.isNullOrEmpty(result.get("certNum").toString())) {
 					goodsSafeNo.setCertDt(result.get("certDt").toString());
 					goodsSafeNo.setCertNum(result.get("certNum").toString());
 					goodsSafeNo.setCertDiv(result.get("certDiv").toString());
 					goodsSafeNo.setCertState(result.get("certState").toString());
+					goodsSafeNo.setCertOrganName(result.get("certOrganName").toString());
 					goodsSafeNo.setRegNo(TsbConstants.REG_NO);
 					goodsSafeNo.setUpdNo(TsbConstants.REG_NO);
 					goodsDao.saveGoodsSafeNo(goodsSafeNo);

+ 1 - 1
src/main/java/com/style24/batch/biz/task/TsbGoodsTask.java

@@ -170,7 +170,7 @@ public class TsbGoodsTask {
 	}
 
 	/**
-	 * 영유아상품 인증번호 수신 : 일배치 - 매일 3시 5분
+	 * 영유아상품 인증번호 수신 : 일회성배치
 	 *
 	 * @throws Exception
 	 */

+ 11 - 0
src/main/java/com/style24/persistence/domain/GoodsSafeNo.java

@@ -14,11 +14,22 @@ import lombok.Data;
 @Data
 public class GoodsSafeNo extends TscBaseDomain {
 
+//	private String goodsCd;
+//	private String goodsNum;
+//	private String certNum;
+//	private String certState;
+//	private String certDiv;
+//	private String certDt;
+
 	private String goodsCd;
 	private String goodsNum;
+	private String certTargetGb;
+	private String certFormGb;
+	private String certType;
 	private String certNum;
 	private String certState;
 	private String certDiv;
+	private String certOrganName;
 	private String certDt;
 
 }

+ 14 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsbGoods.xml

@@ -1139,9 +1139,21 @@
 		WHERE A.GOODS_CD = GS.GOODS_CD
 	</insert>
 	
-	<!--  안전인증대상 상품 조회 -->
+	<!--  안전인증대상 상품 조회 - 오픈후 1회성 작업 -->
 	<select id="getGoodsSafeNoList"   resultType="GoodsSafeNo">
 		/* TsbGoods.getGoodsSafeNoList */
+		SELECT GOODS_CD
+		     , CERT_NUM 
+		FROM TB_GOODS_SAFE_NO 
+		WHERE CERT_TARGET_GB = 'G083_1'  -- 인증대상
+		-- AND CERT_FORM_GB = 'G084_3'   -- 어린이제품
+		AND CERT_TYPE IN ('G081_1', 'G081_2')  -- 안전인증, 안전확인 
+		AND NULLIF(CERT_NUM, '') IS NOT NULL
+	</select>
+
+	<!--  안전인증대상 상품 조회 -->
+	<select id="getGoodsSafeNoList_org"   resultType="GoodsSafeNo">
+		/* TsbGoods.getGoodsSafeNoList_org */
 		SELECT B.GOODS_CD
 		     , B.GOODS_NUM
 		     , A.ITEMKIND_CD 
@@ -1161,7 +1173,7 @@
 		                                       )
 		WHERE A.NI_CLSF_CD = 'G004_23'  /*고시 유아용품*/
 	</select>
-	
+		
 	<!--  상품 안전인증번호 저장 -->
 	<insert id="saveGoodsSafeNo"  parameterType="GoodsSafeNo">
 		/* TsbGoods.saveGoodsSafeNo */