ST24PRJ-678 [결함] 배송 출고 누락 문의

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,32 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 주소수정 가능여부 체크
+			GagaMap map = coreOrderService.canModifyAddress(order);
+			log.info("result >>> {}", map.getInt("result"));
+			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 deliveryOrderNo = map.getInt("deliveryorderno");
+			if (deliveryOrderNo > 0) {
+				order.setDeliveryorderno(deliveryOrderNo);
+				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 +1434,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 deliveryOrderNo = map.getInt("deliveryorderno");
+			if (deliveryOrderNo > 0) {
+				order.setDeliveryorderno(deliveryOrderNo);
+				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 +1497,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 deliveryOrderNo = map.getInt("deliveryorderno");
+			if (deliveryOrderNo > 0) {
+				order.setDeliveryorderno(deliveryOrderNo);
+				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 deliveryOrderNo = map.getInt("deliveryorderno");
+			if (deliveryOrderNo > 0) {
+				order.setDeliveryorderno(deliveryOrderNo);
+				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/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/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);
 			});
 		}
 	});