TB_GOODS_SAFE_NO 인증상태 추가

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

@@ -645,6 +645,7 @@ public class TsaGoodsService {
 				goodsSafeNo.setGoodsCd(goods.getGoodsCd());
 				goodsSafeNo.setCertDt(result.get("certDt").toString());
 				goodsSafeNo.setCertNum(result.get("certNum").toString());
+				goodsSafeNo.setCertState(result.get("certState").toString());
 				goodsSafeNo.setCertDiv(result.get("certDiv").toString());
 				goodsSafeNo.setRegNo(TsaSession.getInfo().getUserNo());
 				goodsSafeNo.setUpdNo(TsaSession.getInfo().getUserNo());

style24.admin/src/main/java/com/style24/persistence/domain/GoodsSafeNo.java

@@ -17,6 +17,7 @@ public class GoodsSafeNo extends TscBaseDomain {
 	private String goodsCd;
 	private String goodsNum;
 	private String certNum;
+	private String certState;
 	private String certDiv;
 	private String certDt;
 

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

@@ -3048,6 +3048,7 @@
 		    GOODS_CD
 		  , CERT_NUM
 		  , CERT_DIV
+		  , CERT_STATE
 		  , CERT_DT
 		  , REG_NO
 		  , REG_DT
@@ -3058,6 +3059,7 @@
 		    #{goodsCd}
 		  , #{certNum}
 		  , #{certDiv}
+		  , #{certState}
 		  , #{certDt}
 		  , #{regNo}
 		  , NOW()
@@ -3067,6 +3069,7 @@
 		ON DUPLICATE KEY UPDATE
 		       CERT_NUM = #{certNum}
 		     , CERT_DIV = #{certDiv}
+		     , CERT_STATE = #{certState}
 		     , CERT_DT = #{certDt}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

style24.batch/src/main/java/com/style24/batch/biz/service/TsbGoodsService.java

@@ -302,6 +302,7 @@ public class TsbGoodsService {
 					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);

style24.batch/src/main/java/com/style24/batch/biz/task/TsbGoodsTask.java

@@ -148,7 +148,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.infants.safe}")
-	//@Scheduled(fixedDelay = 3500000)
+	@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbGoodsInfantsSafeNoJob() throws Exception {
 		goodsInfantsSafeNoJob.run("cron.goods.infants.safe");

style24.batch/src/main/java/com/style24/persistence/domain/GoodsSafeNo.java

@@ -17,6 +17,7 @@ public class GoodsSafeNo extends TscBaseDomain {
 	private String goodsCd;
 	private String goodsNum;
 	private String certNum;
+	private String certState;
 	private String certDiv;
 	private String certDt;
 

style24.batch/src/main/java/com/style24/persistence/mybatis/shop/TsbGoods.xml

@@ -1008,6 +1008,8 @@
 		     , B.GOODS_NUM
 		     , A.ITEMKIND_CD 
 		     , C.CERT_NUM 
+		     , C.CERT_STATE
+		     , C.CERT_DIV
 		     , C.CERT_DT 
 		FROM TB_ITEMKIND A
 		INNER JOIN TB_GOODS B ON A.ITEMKIND_CD = B.ITEMKIND_CD AND B.SELF_GOODS_YN = 'Y'  /* 자사상품 */
@@ -1016,6 +1018,7 @@
 		                                   AND (CERT_NUM IS NULL
 		                                        <![CDATA[
 		                                        OR CERT_DT < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -5 YEAR), '%Y%m%d')  /*인증유효 5년 경과*/
+		                                        OR CERT_STATE <> '적합'
 		                                        ]]>
 		                                       )
 		WHERE A.NI_CLSF_CD = 'G004_23'  /*고시 유아용품*/
@@ -1027,6 +1030,7 @@
 		INSERT INTO TB_GOODS_SAFE_NO (
 		    GOODS_CD
 		  , CERT_NUM
+		  , CERT_STATE
 		  , CERT_DIV
 		  , CERT_DT
 		  , REG_NO
@@ -1037,6 +1041,7 @@
 		VALUES (
 		    #{goodsCd}
 		  , #{certNum}
+		  , #{certState}
 		  , #{certDiv}
 		  , #{certDt}
 		  , #{regNo}
@@ -1047,6 +1052,7 @@
 		ON DUPLICATE KEY UPDATE
 		       CERT_NUM = #{certNum}
 		     , CERT_DIV = #{certDiv}
+		     , CERT_STATE = #{certState}
 		     , CERT_DT = #{certDt}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

style24.core/src/main/java/com/style24/core/biz/thirdparty/SafetyKoreaApi.java

@@ -75,6 +75,7 @@ public class SafetyKoreaApi {
 		if (kcNo.getResultCode() != null && "2000".equals(kcNo.getResultCode())) { // 성공
 			result.set("certNum", kcNo.getResultData().iterator().next().getCertNum());
 			result.set("certDiv", kcNo.getResultData().iterator().next().getCertDiv());
+			result.set("certState", kcNo.getResultData().iterator().next().getCertState());
 			result.set("certDt", kcNo.getResultData().iterator().next().getCertDate());
 			return result;
 		}
@@ -106,6 +107,7 @@ public class SafetyKoreaApi {
 		if (kcNo.getResultCode() != null && "2000".equals(kcNo.getResultCode())) { // 성공
 			result.set("certNum", kcNo.getResultData().getCertNum());
 			result.set("certDiv", kcNo.getResultData().getCertDiv());
+			result.set("certState", kcNo.getResultData().getCertState());
 			result.set("certDt", kcNo.getResultData().getCertDate());
 			return result;
 		}