네이버페이 주문형 검수 대응

src/main/java/com/style24/scm/biz/web/TssNaverpayController.java

@@ -1,40 +1,31 @@
 package com.style24.scm.biz.web;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gagaframework.excel.GagaExcelUtil;
+import java.io.PrintWriter;
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.core.biz.checkout.base.ChangedProductOrderInfo;
 import com.style24.core.biz.checkout.base.ProductOrderChangeType;
 import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.core.biz.service.TscOrderService;
-import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Order;
-import com.style24.persistence.domain.OrderChange;
 import com.style24.scm.biz.service.TssOrderService;
-import com.style24.scm.biz.service.TssRendererService;
 import com.style24.scm.support.controller.TssBaseController;
 import com.style24.scm.support.security.session.TssSession;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
+import lombok.extern.slf4j.Slf4j;
 
 
 /**
@@ -224,17 +215,16 @@ public class TssNaverpayController extends TssBaseController {
 	 */
 	@GetMapping("/send/order/delivery/start")
 	@ResponseBody
-	public String sendNaverpayOrderDeliveryStart(HttpServletRequest request, HttpServletResponse response) {
+	public GagaMap sendNaverpayOrderDeliveryStart(HttpServletRequest request, HttpServletResponse response) {
+		GagaMap result = new GagaMap();
 		Order order = new Order();
 		order.setOrdDtlNo(Integer.parseInt(request.getParameter("ordDtlNo")));
 		int userNo = Integer.parseInt(request.getParameter("userNo"));
-		String result = "";
 
 		try {
 			result = coreNaverPayService.sendNaverPayDeliveryStartOrder(order, "SHIPPING", userNo);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return "FAIL";
 		}
 
 		return result;
@@ -250,17 +240,16 @@ public class TssNaverpayController extends TssBaseController {
 	 */
 	@GetMapping("/send/exchange/delivery")
 	@ResponseBody
-	public String sendNaverpayExchangeReDelivery(HttpServletRequest request, HttpServletResponse response) {
+	public GagaMap sendNaverpayExchangeReDelivery(HttpServletRequest request, HttpServletResponse response) {
+		GagaMap result = new GagaMap();
 		Order order = new Order();
 		order.setOrdDtlNo(Integer.parseInt(request.getParameter("ordDtlNo")));
 		int userNo = Integer.parseInt(request.getParameter("userNo"));
-		String result = "";
 
 		try {
 			result = coreNaverPayService.sendNaverPayExchangeReDelivery(order, userNo);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return "FAIL";
 		}
 
 		return result;

src/main/java/com/style24/scm/biz/web/TssOrderController.java

@@ -396,9 +396,9 @@ public class TssOrderController extends TssBaseController {
 			}
 		}
 
-		coreOrderService.updateSellerDelvStart(orderList, cancelDataList, userNo);
+		String result = coreOrderService.updateSellerDelvStart(orderList, cancelDataList, userNo);
 
-		return super.ok("");
+		return super.ok(result);
 	}
 
 	/**

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

@@ -193,7 +193,7 @@ $("#btnSave").on("click", function(e) {
 
 	// 엑셀다운로드
 	var fnEndFunction = function(result){
-		mcxDialog.alert("성공적으로 저장되었습니다.");
+		//mcxDialog.alert("성공적으로 저장되었습니다.");
 		fnSearch();
 	}
 });