Merge remote-tracking branch 'TSIT/ST24PRJ-678' into develop

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -1024,7 +1024,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		// 교환요청 데이터 확인
 		if (excReq == null) {
-			result.set("message", message.getMessage("FAIL_1001"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_1001"));
+			result.set("error", map);
 			return result;
 		}
 
@@ -1042,7 +1044,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 			if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
 				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;
 		}
@@ -1079,7 +1083,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
 			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;
@@ -1101,7 +1107,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		// 교환철회 요청 데이터 확인
 		if (excReq == null) {
-			result.set("message", message.getMessage("FAIL_1001"));
+			GagaMap map = new GagaMap();
+			map.set("message", message.getMessage("FAIL_1001"));
+			result.set("error", map);
 			return result;
 		}
 
@@ -1121,7 +1129,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
 			result.set("message", message.getMessage("SUCC_0004"));
 		} 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;
@@ -1222,7 +1232,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 			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/admin/biz/web/TsaOrderController.java

@@ -552,6 +552,13 @@ public class TsaOrderController extends TsaBaseController {
 	@PostMapping("/deliver/addr/update")
 	@ResponseBody
 	public GagaResponse udpateDeliveryAddrUpdate(@RequestBody Order order) {
+		// 주소수정 가능여부 체크
+		GagaMap map = orderService.canModifyAddress(order);
+		if (map.getInt("result") == 0) {
+			return super.error("주소 수정 불가능한 상태입니다.");
+		}
+
+		order.setDeliveryOrderNoArr((int[]) map.get("deliveryOrderNoArr"));
 		order.setUpdNo(TsaSession.getInfo().getUserNo());
 		orderService.updateOrderAddr(order);
 		return super.ok(message.getMessage("SUCC_0002"));
@@ -606,7 +613,9 @@ public class TsaOrderController extends TsaBaseController {
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
 			result.set("message", message.getMessage("SUCC_0004"));
 		} 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;