Merge remote-tracking branch 'origin/jmh' into develop

src/main/java/com/style24/core/biz/dao/TscOrderOcmDao.java

@@ -258,6 +258,16 @@ public interface TscOrderOcmDao {
 	 * @since 2021. 06. 17
 	 */
 	int getExtmallOrderExceluploadWateCnt(int userNo);
+	
+	/**
+	 * 제휴몰주문등록 엑셀 업로드 임시테이블 수(본인)
+	 *
+	 * @param userNo - 사용자아이디
+	 * @return int
+	 * @author jmh
+	 * @since 2021. 11. 18
+	 */
+	int getExtmallOrderExceluploadTmpCnt(int userNo);
 
 	/**
 	 * 제휴몰주문 임시 테이블 삭제

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

@@ -802,6 +802,18 @@ public class TscOrderOcmService {
 	public int getExtmallOrderExceluploadWateCnt(int userNo) {
 		return orderOcmDao.getExtmallOrderExceluploadWateCnt(userNo);
 	}
+	
+	/**
+	 * 제휴몰주문등록 엑셀 업로드 임시테이블 수(본인)
+	 *
+	 * @param userNo
+	 * @return int
+	 * @author jmh
+	 * @since 2021. 11. 18
+	 */
+	public int getExtmallOrderExceluploadTmpCnt(int userNo) {
+		return orderOcmDao.getExtmallOrderExceluploadTmpCnt(userNo);
+	}
 
 	/**
 	 * 제휴몰주문등록 엑셀 저장
@@ -923,6 +935,17 @@ public class TscOrderOcmService {
 	public Collection<ExtmallOrder> getExtmallOrderUploadSecondList(ExtmallOrder extmallOrder) {
 		return orderOcmDao.getExtmallOrderUploadSecondList(extmallOrder);
 	}
+	
+	/**
+	 * 제휴몰주문등록 업로드 임시저장소 삭제처리
+	 *
+	 * @return 
+	 * @author jmh
+	 * @since 2020. 11. 18
+	 */
+	public void deleteExtmallOrderUploadTmpList(int userNo) {
+		orderOcmDao.deleteExtmallOrderUploadTmp(userNo);
+	}
 
 
 }

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

@@ -74,6 +74,8 @@ public class ExtmallOrder extends TscBaseDomain {
 	private String cnclsmsSendYn; 		// 알림톡-취소문자발송여부(Y:제휴몰에서발송, N:자사몰에서발송)
 	private String cnclAllSoldoutYn; 	// 알림톡-전체품절취소여부
 	private String soldoutGoodsNm;		// 알림톡-품절상품내용
+	private String csMemo;				// 메모내용
+	private String csMemoUpdDt;			// 메모수정일시
 
 	private String stDate;
 	private String edDate;
@@ -83,8 +85,9 @@ public class ExtmallOrder extends TscBaseDomain {
 
 	private String succCnt;				// 엑셀업로드 성공수
 	private String failCnt;				// 엑셀업로드 실패수
+	private String resultDtTime;		// 엑셀업로드 결과확인 시간
 
-	Collection<ExtmallOrder> orderDetailList;		// 주문상세목록
+	Collection<ExtmallOrder> orderDetailList;	// 주문상세목록
 	Collection<ExtmallOrder> delvFeeCdList;		// 배송정보목록
 
 	// 스타일24 ORDER 컬럼

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

@@ -109,6 +109,8 @@ public class ShoplinkerOrder extends TscBaseDomain {
 	private String optCd1;						// 옵션1
 	private String optCd2;						// 옵션2
 	private String regNm;						// 등록자
+	private String csMemo;						// 메모내용(tb_extmall_order_upload 관련 항목)
+	private String csMemoUpdDt;					// 메모수정일시(tb_extmall_order_upload 관련 항목)
 
 	// 검색
 	private int startRow;

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

@@ -1276,6 +1276,14 @@
 		AND UPLOAD_GB = 'E'
 		AND REG_NO = #{regNo}
 	</select>
+	
+	<!--제휴몰주문등록 엑셀 업로드 임시테이블 수(본인)-->
+	<select id="getExtmallOrderExceluploadTmpCnt" parameterType="Integer" resultType="Integer">
+		SELECT COUNT(1) 
+		FROM TB_EXTMALL_ORDER_UPLOAD_TMP
+		WHERE 1=1
+		AND REG_NO = #{regNo}
+	</select>
 
 	<!--외부몰주문등록 전 임시 테이블 삭제-->
 	<delete id="deleteExtmallOrderUploadTmp" parameterType="Integer">
@@ -1588,14 +1596,11 @@
 					, A.REG_NO
 					, A.REG_DT
 			FROM   TB_EXTMALL_ORDER_UPLOAD A
-			     , TB_EXTMALL_ORDER_UPLOAD_TMP B
-			WHERE  A.VENDOR_ID = B.VENDOR_ID
-			AND    A.EXTMALL_ID = B.EXTMALL_ID
-			AND    A.AGENT_ORDER_ID = B.AGENT_ORDER_ID
-			AND    A.EXTMALL_ORDER_ID = B.EXTMALL_ORDER_ID
+			WHERE  1=1
 			AND    A.UPLOAD_GB = 'E'
-			AND    B.REG_NO = #{regNo}
+			AND    A.REG_NO = #{regNo}
 			AND    DATE(A.REG_DT) = DATE(NOW())
+			AND    DATE_FORMAT(A.REG_DT, '%Y%m%d%H%i%S') >= #{resultDtTime}
 		) A WHERE A.RANKING = 1
 	</select>