Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

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

@@ -2047,6 +2047,10 @@ public class TsaGoodsService {
 			goodsPriceRes.setUpdNo(TsaSession.getInfo().getUserNo());
 			goodsPriceRes.setRegNo(TsaSession.getInfo().getUserNo());
 
+			//예약일시 시분 설정
+			goodsPriceRes.setApplyStdt(goodsPriceRes.getApplyStdt() + "0000");
+			goodsPriceRes.setApplyEddt(goodsPriceRes.getApplyEddt() + "5959");
+
 			// 엑셀조회를 위한 SEARCH 테이블 생성
 			SearchData searchData = new SearchData();
 			searchData.setRegNo(goodsPriceRes.getRegNo());
@@ -2082,22 +2086,22 @@ public class TsaGoodsService {
 				return (cnt + 2) + "행의 예약가격을 확인해주세요.";
 			}
 
-			String nowDate = GagaDateUtil.getToday();	//yyyyMMdd
-			SimpleDateFormat dateFormatParser = new SimpleDateFormat("yyyyMMdd");
+			String nowDate = GagaDateUtil.getToday();	//yyyyMMddHH
+			SimpleDateFormat dateFormatParser = new SimpleDateFormat("yyyyMMddHH");
 			dateFormatParser.setLenient(false);
 			try {
 				dateFormatParser.parse(goodsPriceRes.getApplyStdt() );
 			} catch (Exception e) {
-				return (cnt + 2) + "행의 예약시작일을 확인해주세요.";
+				return (cnt + 2) + "행의 예약시작일시을 확인해주세요.";
 			}
 			try {
 				dateFormatParser.parse(goodsPriceRes.getApplyEddt() );
 			} catch (Exception e) {
-				return (cnt + 2) + "행의 예약종료일을 확인해주세요.";
+				return (cnt + 2) + "행의 예약종료일시을 확인해주세요.";
 			}
 
 			if (Integer.parseInt(goodsPriceRes.getApplyStdt()) > Integer.parseInt(goodsPriceRes.getApplyEddt())) {
-				return (cnt + 2) + "행의 예약 시작일은 종료일보다 보다 클 수 없습니다.";
+				return (cnt + 2) + "행의 예약 시작일시은 종료일시보다 보다 클 수 없습니다.";
 			}
 
 			if (Integer.parseInt(goodsPriceRes.getApplyStdt()) <= Integer.parseInt(nowDate)) {

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

@@ -2689,8 +2689,8 @@
 		        <include refid="getGoodsListCondition_sql"/>
 		        ORDER BY  GR.APPLY_STDT DESC, GR.APPLY_EDDT DESC, G.GOODS_CD, GR.GOODS_PRICE_RES_SQ
 		        </if>
-		        <if test="searchGb != null and searchGb =='EXCEL'">
-		        ORDER BY SD.TMP_DISP_ORD
+		        <if test="searchGb != null and (searchGb =='EXCEL' or searchGb =='EXCELRESULT')">
+		        ORDER BY SD.TMP_DISP_ORD, GR.APPLY_STDT DESC, GR.APPLY_EDDT DESC, G.GOODS_CD, GR.GOODS_PRICE_RES_SQ
 		        </if>
 		<include refid="getListPagingCondition_sql"/>
 	</select>

src/main/webapp/WEB-INF/views/common/fragments/header.html

@@ -47,6 +47,7 @@
 	<script type="text/javascript" src="/ux/plugins/dropzone/dropzone.js"></script>
 	<script type="text/javascript" src="/ux/plugins/c3/d3.v5.js"></script>
 	<script type="text/javascript" src="/ux/plugins/c3/c3.js"></script>
+	<script type="text/javascript" src="https://ssl.daumcdn.net/dmaps/map_js_init/postcode.v2.js"></script>
 	
 	<!-- Custom Common JS library -->
 	<script type="text/javascript" th:src="@{'/ux/js/admin.ui.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/js/admin.ui.js"></script>

src/main/webapp/WEB-INF/views/goods/GoodsPriceReserveForm.html

@@ -453,7 +453,7 @@
 	});
 	
 	var fnGoodsPriceResDeleteCollBack = function(){
-		//fnGoodsRsvtTnmListSearch($("#goodsPriceResForm input[name=searchGb]").val());
+		fnGoodsPriceSearch($("#goodsPriceResForm input[name=searchGb]").val());
 	}
 	
 	//엑셀양식 다운로드

src/main/webapp/WEB-INF/views/order/ReturnRequestForm.html

@@ -141,8 +141,8 @@
 						<tr>
 							<th>회수지주소 <i class="star"></i></th>
 							<td colspan="3">
-								<input type="text" name ="chgerPostNo" class="w100" readonly="readonly" />
-								<button type="button" class="btn btn-info" onclick="cfnOpenPostFindPopup('returnRequest');">우편번호찾기</button>
+								<input type="text" name ="chgerZipNo" class="w100" readonly="readonly" />
+								<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 								<input type="text" name ="chgerBaseAddr" class="w300" />
 								<input type="text" name ="chgerDtlAddr" class="w300" />
 							</td>
@@ -1077,9 +1077,9 @@ var fnOpenDaumAddr = function() {
 	let daumZip = new daum.Postcode({
 		oncomplete: function(data) {
 			// 우편번호와 주소 정보를 해당 필드에 넣는다.
-			$('#detailForm input[name=bizZipcode]').val(data.zonecode);
-			$('#detailForm input[name=bizBaseAddr]').val(cfnGetDaumRoadAddr(data));
-			$('#detailForm input[name=bizDtlAddr]').focus();
+			$('#detailForm input[name=chgerZipNo]').val(data.zonecode);
+			$('#detailForm input[name=chgerBaseAddr]').val(cfnGetDaumRoadAddr(data));
+			$('#detailForm input[name=chgerDtlAddr]').focus();
 			
 			cfnCloseDaumAddr();
 		},