Merge remote-tracking branch 'origin/style' into ST24PRJ-627(등급오류표시)

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -400,7 +400,9 @@ public class TsfMypageController extends TsfBaseController {
 			result.set("message", message.getMessage("SUCC_0003"));
 			result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		} else {
-			result.set("message", message.getMessage("FAIL_0003"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0003"));
+			result.set("error", map);
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 		}
 
@@ -420,7 +422,9 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap result = new GagaMap();
 
 		if (order.getOrdDtlNoArr().length == 0) {
-			result.set("message", message.getMessage("FAIL_1003"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_1003"));
+			result.set("error", map);
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			return result;
 		}
@@ -541,7 +545,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 교환요청 데이터 확인
 		if (orderChange == null) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_1001"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_1001"));
+			result.set("error", map);
 			return result;
 		}
 
@@ -590,7 +596,9 @@ public class TsfMypageController extends TsfBaseController {
 				result.set("message", message.getMessage("EXCHANGE_0001"));
 			}
 		} else {
-			result.set("message", message.getMessage("FAIL_0004"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0004"));
+			result.set("error", map);
 		}
 
 		return result;
@@ -1373,14 +1381,31 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 주소수정 가능여부 체크
+			GagaMap map = coreOrderService.canModifyAddress(order);
+			if (map.getInt("result") == 0) {
+				map.set("message", message.getMessage("FAIL_0002"));
+
+				result.set("status", GagaResponseStatus.FAIL.getCode());
+				result.set("error", map);
+
+				return result;
+			}
+
 			// 배송지 수정 처리
 			commonService.updateDeliverAddr(order);
 
 			// WMS 배송지 수정 처리
-			coreWmsService.updateWmsDeliveryChangeAddr(order);
+			int[] deliveryOrderNoArr = (int[]) map.get("deliveryOrderNoArr");
+			if (deliveryOrderNoArr.length > 0) {
+				order.setDeliveryOrderNoArr((int[]) map.get("deliveryOrderNoArr"));
+				coreWmsService.updateWmsDeliveryChangeAddr(order);
+			}
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_0002"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0002"));
+			result.set("error", map);
 		}
 
 		return result;
@@ -1408,14 +1433,31 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 주소수정 가능여부 체크
+			GagaMap map = coreOrderService.canModifyAddress(order);
+			if (map.getInt("result") == 0) {
+				map.set("message", message.getMessage("FAIL_0002"));
+
+				result.set("status", GagaResponseStatus.FAIL.getCode());
+				result.set("error", map);
+
+				return result;
+			}
+
 			// 배송메모 수정 처리
 			commonService.updateDeliverAddrDelvMemo(order);
 
 			// WMS 배송메모 수정 처리
-			coreWmsService.updateWmsDeliveryMemo(order);
+			int[] deliveryOrderNoArr = (int[]) map.get("deliveryOrderNoArr");
+			if (deliveryOrderNoArr.length > 0) {
+				order.setDeliveryOrderNoArr((int[]) map.get("deliveryOrderNoArr"));
+				coreWmsService.updateWmsDeliveryMemo(order);
+			}
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_0002"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0002"));
+			result.set("error", map);
 		}
 
 		return result;
@@ -1454,7 +1496,9 @@ public class TsfMypageController extends TsfBaseController {
 			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_0002"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0002"));
+			result.set("error", map);
 		}
 
 		return result;

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -305,7 +305,9 @@ public class TsfNoMemberController extends TsfBaseController {
 			result.set("message", message.getMessage("SUCC_0003"));
 			result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		} else {
-			result.set("message", message.getMessage("FAIL_0003"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0003"));
+			result.set("error", map);
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 		}
 
@@ -390,14 +392,31 @@ public class TsfNoMemberController extends TsfBaseController {
 		try {
 			order.setCustNo(0);
 
+			// 주소수정 가능여부 체크
+			GagaMap map = coreOrderService.canModifyAddress(order);
+			if (map.getInt("result") == 0) {
+				map.set("message", message.getMessage("FAIL_0002"));
+
+				result.set("status", GagaResponseStatus.FAIL.getCode());
+				result.set("error", map);
+				
+				return result;
+			}
+
 			// 배송지 수정 처리
 			commonService.updateDeliverAddr(order);
 
 			// WMS 배송지 수정 처리
-			coreWmsService.updateWmsDeliveryChangeAddr(order);
+			int[] deliveryOrderNoArr = (int[]) map.get("deliveryOrderNoArr");
+			if (deliveryOrderNoArr.length > 0) {
+				order.setDeliveryOrderNoArr((int[]) map.get("deliveryOrderNoArr"));
+				coreWmsService.updateWmsDeliveryChangeAddr(order);
+			}
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_0002"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0002"));
+			result.set("error", map);
 		}
 
 		return result;
@@ -421,14 +440,31 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setCustNo(0);
 
 		try {
+			// 주소수정 가능여부 체크
+			GagaMap map = coreOrderService.canModifyAddress(order);
+			if (map.getInt("result") == 0) {
+				map.set("message", message.getMessage("FAIL_0002"));
+
+				result.set("status", GagaResponseStatus.FAIL.getCode());
+				result.set("error", map);
+
+				return result;
+			}
+
 			// 배송메모 수정 처리
 			commonService.updateDeliverAddrDelvMemo(order);
 
 			// WMS 배송메모 수정 처리
-			coreWmsService.updateWmsDeliveryMemo(order);
+			int[] deliveryOrderNoArr = (int[]) map.get("deliveryOrderNoArr");
+			if (deliveryOrderNoArr.length > 0) {
+				order.setDeliveryOrderNoArr((int[]) map.get("deliveryOrderNoArr"));
+				coreWmsService.updateWmsDeliveryMemo(order);
+			}
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_0002"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0002"));
+			result.set("error", map);
 		}
 
 		return result;
@@ -467,7 +503,9 @@ public class TsfNoMemberController extends TsfBaseController {
 			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_0002"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0002"));
+			result.set("error", map);
 		}
 
 		return result;
@@ -986,7 +1024,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 교환요청 데이터 확인
 		if (orderChange == null) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
-			result.set("message", message.getMessage("FAIL_1001"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_1001"));
+			result.set("error", map);
 			return result;
 		}
 
@@ -1034,7 +1074,9 @@ public class TsfNoMemberController extends TsfBaseController {
 				result.set("message", message.getMessage("EXCHANGE_0001"));
 			}
 		} else {
-			result.set("message", message.getMessage("FAIL_0004"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_0004"));
+			result.set("error", map);
 		}
 
 		return result;

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

@@ -63,7 +63,8 @@ public class Plan extends TscBaseDomain {
 	private String goodsLimitYn;	//상품등록제한여부(Y:상품등록제한)
 	private String goodsLimitQty;	//상품등록제한수(상품등록제한여부가 "Y"일 떄)
 	private String delYn;			//삭제여부(Y:삭제)
-	private String openYn;			//오픈여부(Y:오픈)
+	private String openYn;			//노출여부(Y:오픈)
+	private String useYn;			//사용여부(Y:오픈)
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private long[] dispOrdArr;		//표시순서 배열
 	private long dispOrd;			//표시순서

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

@@ -114,7 +114,8 @@
 		        AND    P.SITE_CD = #{siteCd}
 		        AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
 		        AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
-		        AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
+		        AND    P.DEL_YN  = 'N' /*삭제안된 기획전*/
+				AND    p.USE_YN  = 'Y' /*사용하는 기획전*/
 		        AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/
 		        <if test="cateNo != null and cateNo != ''">
 		        AND    P.PLAN_SQ IN (SELECT PLAN_SQ
@@ -362,7 +363,7 @@
 		                         WHERE  PLAN_SQ = #{planSq}
 		                         <if test='adminPreview != "Y"'>
 		                          AND    NOW() BETWEEN DISP_STDT AND DISP_EDDT
-		                          AND    OPEN_YN = 'Y'
+		                          AND    USE_YN = 'Y'
 		                          AND    DEL_YN = 'N'
 		                         </if>
 		                        ),0) > 0 THEN 'Y'
@@ -588,7 +589,8 @@
 		        AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
 		        </if> -->
 		        AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
-		        AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
+		        AND    P.DEL_YN  = 'N' /*삭제안된 기획전*/
+		   		AND    P.USE_YN  = 'Y' /*사용하는 기획전*/
 		        AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/
 		        <if test="exceptPlanSq != null and exceptPlanSq != ''"> <!-- 제외할이벤트 -->
 		        AND    P.PLAN_SQ != #{exceptPlanSq}

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -483,11 +483,6 @@ var delvAddrSet = function(delvObj) {
 			mcxDialog.alert('죄송합니다. 정읍,익산,전주 지역은 주문/배송이 불가한 지역입니다. 다른 배송지로 수정 해주세요.');
 			return false;
 		} else {
-			$("#recipNm").text(delvObj.recipNm);
-			$("#recipPhnno").text(delvObj.recipPhnno);
-			$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
-			$("#delvMemo").text(delvObj.delvMemo);
-			
 			// 2021.05.16 비회원구분처리
 			let url = '';
 			// 변수값 설정
@@ -498,6 +493,10 @@ var delvAddrSet = function(delvObj) {
 			}
 			
 			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+				$("#recipNm").text(delvObj.recipNm);
+				$("#recipPhnno").text(delvObj.recipPhnno);
+				$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
+				$("#delvMemo").text(delvObj.delvMemo);
 			});
 		}
 	});

src/main/webapp/WEB-INF/views/web/SigninFormWeb.html

@@ -80,16 +80,12 @@
 					<div class="sns_wrap">
 						<h5 class="sr-only">간편로그인</h5>
 						<ul>
-							<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
-							<th:block th:if="${ipAddress == '180.71.39.150' || ipAddress == '127.0.0.1' || ipAddress == '192.168.104.72'}">
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginKakao();">
 									<i class="ico ico_snslogin kakao"></i>
 									<span>카카오</span>
 								</a>
 							</li>
-							</th:block>
-							<!-- //2021.09.01 card007 카카오싱크 검수 주석처리 -->
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginNaver();">
 									<i class="ico ico_snslogin naver"></i>

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -381,11 +381,6 @@ var delvAddrSet = function(delvObj) {
 			mcxDialog.alert('죄송합니다. 정읍,익산,전주 지역은 주문/배송이 불가한 지역입니다. 다른 배송지로 수정 해주세요.');
 			return false;
 		} else {
-			$("#recipNm").text(delvObj.recipNm);
-			$("#recipPhnno").text(delvObj.recipPhnno);
-			$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
-			$("#delvMemo").text(delvObj.delvMemo);
-			
 			// 2021.05.16 비회원구분처리
 			let url = '';
 			// 변수값 설정
@@ -396,6 +391,10 @@ var delvAddrSet = function(delvObj) {
 			}
 			
 			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+				$("#recipNm").text(delvObj.recipNm);
+				$("#recipPhnno").text(delvObj.recipPhnno);
+				$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
+				$("#delvMemo").text(delvObj.delvMemo);
 			});
 		}
 	});

src/main/webapp/biz/goods.js

@@ -284,6 +284,11 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 					tag += '<iframe id="pdThumbVideo" class="pd_mov video-autoplay" src="' + _kollusMediaUrl + '/' + videoUrl + '?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
 				}
 			}
+			
+			if(gagajf.isNull(item.sysImgNm2)){
+				item.sysImgNm2 = item.sysImgNm;
+			}
+			
 			// tag += '		<img class=" vLHTC pd_img" src="' + item.sysImgNm + '" data-img="' + item.sysImgNm2 + '" onerror="noneImg(this)">';
 			var imgUrl = "//image.istyle24.com/Upload/ProductImage/";
 			tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + (item.sysImgNm ? item.sysImgNm.replace(imgUrl,"") : '') + '" data-img="' + goodsUrl + '/' + (item.sysImgNm2 ? item.sysImgNm2.replace(imgUrl,"") : '') + '" onerror="noneImg(this)">';