샵링커주문수집-상품코드 필수값제외 관련 수정건, 한개라도 실패시 전체실패로 등록되도록 수정관련(&실패사유 세팅위치수정)

src/main/java/com/style24/core/biz/service/TscOrderOcmService.java

@@ -109,8 +109,6 @@ public class TscOrderOcmService {
 
 					orderDetail.setUploadStat(TscConstants.ExtmallUploadStat.FAIL.value());	// 실패
 					orderDetail.setOrdNo(null);
-					orderDetail.setUploadFailCd(orderDetail.getUploadFailCd());
-					orderDetail.setUploadFailReason(orderDetail.getUploadFailReason());
 					orderOcmDao.updateExtmallOrder(orderDetail);
 
 				}else {
@@ -291,11 +289,13 @@ public class TscOrderOcmService {
 			// 주문등록 전체실패시 상태 업데이트
 			GagaMap vdMap;
 			for( ExtmallOrder orderDetail : order.getOrderDetailList()) {
-				vdMap = this.checkGoodsInfo(orderDetail);
+				
+				if("G022_70".equals(orderDetail.getUploadFailCd())) {
+					vdMap = this.checkGoodsInfo(orderDetail);
+					orderDetail.setOrdNo(vdMap.getInt("ordNo"));	// 실패	
+				}
+				
 				orderDetail.setUploadStat(TscConstants.ExtmallUploadStat.FAIL.value());	// 실패
-				orderDetail.setOrdNo(vdMap.getInt("ordNo"));	// 실패
-				orderDetail.setUploadFailCd(vdMap.getString("uploadFailCd"));
-				orderDetail.setUploadFailReason(vdMap.getString("message"));
 				orderOcmDao.updateExtmallOrder(orderDetail);
 			}
 		}
@@ -503,7 +503,7 @@ public class TscOrderOcmService {
 				failGoodsAdmMsg = "";
 				stockFailCnt = 0;
 				for (ExtmallOrder orderDetail : orderDetailList) {
-					if("".equals(orderDetail.getUploadFailCd())) {
+					if("SUCCESS".equals(orderDetail.getUploadFailReason())) {
 						orderDetail.setUploadFailCd(TscConstants.ExtmallUploadFailStat.ETC.value());
 						orderDetail.setUploadFailReason("(정상) 다른 옵션으로 인한 실패");
 					}

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

@@ -87,7 +87,8 @@
 			, A.OPT_CD
 			, A.UPLOAD_GB
 		FROM TB_EXTMALL_ORDER_UPLOAD A
-			LEFT OUTER JOIN TB_GOODS B ON A.GOODS_CD = B.GOODS_CD
+			LEFT OUTER JOIN TB_OPTION OP ON A.OPT_CD = OP.OPT_CD
+			LEFT OUTER JOIN TB_GOODS B ON OP.GOODS_CD = B.GOODS_CD
 			LEFT OUTER JOIN TB_EXTMALL C ON A.VENDOR_ID = C.VENDOR_ID AND A.EXTMALL_ID = C.EXTMALL_ID AND C.USE_YN = 'Y'
 		WHERE 1=1
 		AND RECIP_BASE_ADDR IS NOT NULL AND RECIP_BASE_ADDR != ''
@@ -230,8 +231,8 @@
 		FROM TB_EXTMALL_ORDER_UPLOAD A
 			LEFT OUTER JOIN TB_ORDER_DETAIL OD ON A.VENDOR_ID = OD.VENDOR_ID AND A.EXTMALL_ID = OD.EXTMALL_ID
 					AND A.AGENT_ORDER_ID = OD.AGENT_ORDER_ID AND A.EXTMALL_ORDER_ID = OD.EXTMALL_ORDER_ID
-			LEFT OUTER JOIN TB_GOODS GS ON A.GOODS_CD = GS.GOODS_CD
-			LEFT OUTER JOIN VW_STOCK VS ON VS.GOODS_CD = A.GOODS_CD AND VS.OPT_CD = A.OPT_CD
+			LEFT OUTER JOIN VW_STOCK VS ON VS.OPT_CD = A.OPT_CD
+			LEFT OUTER JOIN TB_GOODS GS ON VS.GOODS_CD = GS.GOODS_CD
 
 		WHERE A.VENDOR_ID = #{vendorId}
 		AND A.EXTMALL_ID = #{extmallId}
@@ -298,7 +299,8 @@
 			, A.REG_NO
 			, A.REG_DT
 		FROM TB_EXTMALL_ORDER_UPLOAD A
-			LEFT OUTER JOIN TB_GOODS B ON A.GOODS_CD = B.GOODS_CD
+			LEFT OUTER JOIN TB_OPTION OP ON A.OPT_CD = OP.OPT_CD
+			LEFT OUTER JOIN TB_GOODS B ON OP.GOODS_CD = B.GOODS_CD
 			LEFT OUTER JOIN TB_EXTMALL C ON A.VENDOR_ID = C.VENDOR_ID AND A.EXTMALL_ID = C.EXTMALL_ID AND C.USE_YN = 'Y'
 		WHERE 1=1
 		AND RECIP_BASE_ADDR IS NOT NULL AND RECIP_BASE_ADDR != ''