|
|
@@ -1,11 +1,16 @@
|
|
|
package com.style24.scm.biz.web;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
+import java.io.PrintWriter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import com.style24.core.biz.checkout.base.ChangedProductOrderInfo;
|
|
|
+import com.style24.core.biz.checkout.base.ProductOrderChangeType;
|
|
|
+import com.style24.core.biz.service.TscNaverPayService;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
|
@@ -64,6 +69,9 @@ public class TssOrderController extends TssBaseController {
|
|
|
@Autowired
|
|
|
private Environment env;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TscNaverPayService coreNaverPayService;
|
|
|
+
|
|
|
/**
|
|
|
* 입점업체미발주목록화면
|
|
|
*
|
|
|
@@ -279,8 +287,8 @@ public class TssOrderController extends TssBaseController {
|
|
|
*
|
|
|
* @param orderList - 미발주목록
|
|
|
* @return GagaResponse
|
|
|
- * @author jsh77b
|
|
|
- * @since 2020. 12. 01
|
|
|
+ * @author xodud1202
|
|
|
+ * @since 2021. ?. ?
|
|
|
*/
|
|
|
@PostMapping("/seller/delv/started")
|
|
|
@ResponseBody
|
|
|
@@ -555,4 +563,57 @@ public class TssOrderController extends TssBaseController {
|
|
|
Collection<Order> OrderSellerClaimList = coreOrderService.getOrderSellerClaimList(order);
|
|
|
return OrderSellerClaimList;
|
|
|
}
|
|
|
+
|
|
|
+ @GetMapping("/naverpay/recv/order/complete")
|
|
|
+ public ModelAndView naverpayRecvOrderComplete(HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ try {
|
|
|
+ log.info("<<<< 결제완료 수신 시작 >>>>");
|
|
|
+
|
|
|
+ PrintWriter out = response.getWriter();
|
|
|
+ Order time = coreNaverPayService.setInitData();
|
|
|
+ ChangedProductOrderInfo[] changedProductOrderList = coreNaverPayService.changedProductOrderList(ProductOrderChangeType.PAYED, time.getFrom(), time.getTo(), TssSession.getInfo().getUserNo()); // 변경 상품주문 조회;
|
|
|
+
|
|
|
+ if(changedProductOrderList != null) {
|
|
|
+ log.info("<<<< 수신건수: [{}]건 >>>>", changedProductOrderList.length);
|
|
|
+ Order result = coreNaverPayService.createOrderInfo(changedProductOrderList, TssSession.getInfo().getUserNo());
|
|
|
+ }
|
|
|
+
|
|
|
+ log.info("<<<< 결제완료 수신 종료 >>>>");
|
|
|
+
|
|
|
+ out.print("<html><body><form><h1>ORDER COMPLETE SUCCESS</h1></body></html>");
|
|
|
+ out.flush();
|
|
|
+ out.close();
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/naverpay/send/ready/delivery")
|
|
|
+ public ModelAndView naverpaySendReadyDelivery(HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ try {
|
|
|
+ log.info("<<<< 결제완료 수신 시작 >>>>");
|
|
|
+
|
|
|
+ PrintWriter out = response.getWriter();
|
|
|
+ log.info("<<<< 배송준비중 송신 시작 >>>>");
|
|
|
+ Order time = coreNaverPayService.setInitData();
|
|
|
+ Collection<Order> readyDeliveryList = coreNaverPayService.getReadyDeliveryList(time); // 네이버페이 주문형 배송준비중 테스트
|
|
|
+
|
|
|
+ if (readyDeliveryList != null) {
|
|
|
+ // 배송 준비중 데이터 네이버로 송신
|
|
|
+ Order result = coreNaverPayService.sendNaverPayReadyDeliveryOrder(readyDeliveryList, TssSession.getInfo().getUserNo());
|
|
|
+ }
|
|
|
+
|
|
|
+ log.info("<<<< 배송준비중 송신 종료 >>>>");
|
|
|
+
|
|
|
+ out.print("<html><body><form><h1>DELIVERY READY SUCCESS</h1></body></html>");
|
|
|
+ out.flush();
|
|
|
+ out.close();
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|
xodud lee