이태영 - 20210720 사은품프로모션 기간 조회 조건 수정 및 네이버페이 SCM 호출 수정 중

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

@@ -33,8 +33,7 @@
 						<if test="searchTxt == '' or promotionGubun != 'freegiftSq'">
 							<if test="stDate != null and stDate != ''">
 								<if test="edDate != null and edDate != ''">
-							   AND FREEGIFT_STDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
-							   AND FREEGIFT_EDDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
+							   AND FG.REG_DT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
 								</if>
 							</if>
 						</if>
@@ -65,8 +64,7 @@
 		<if test="searchTxt == '' or promotionGubun != 'freegiftSq'">
 			<if test="stDate != null and stDate != ''">
 				<if test="edDate != null and edDate != ''">
-					AND FREEGIFT_STDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
-					AND FREEGIFT_EDDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
+					AND FG.REG_DT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
 				</if>
 			</if>
 		</if>

src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionForm.html

@@ -46,7 +46,7 @@
 						</colgroup>
 
 						<tr>
-							<th>기간<em class="required" title="필수"></em></th>
+							<th>등록기간<em class="required" title="필수"></em></th>
 							<td id="sellTerms"></td>
 						</tr>