Browse Source

Merge branch 'card007' into develop

card007 5 years ago
parent
commit
1d2522311c
1 changed files with 23 additions and 5 deletions
  1. 23 5
      src/main/java/com/style24/front/biz/web/TsfMypageController.java

+ 23 - 5
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -7,10 +7,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.gagaframework.web.util.GagaCookieUtil;
-import com.style24.core.biz.service.TscMailService;
-import com.style24.front.biz.service.TsfLoginService;
-import com.style24.front.support.env.TsfConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -28,11 +24,13 @@ import org.springframework.web.servlet.ModelAndView;
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaCookieUtil;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscKcpService;
+import com.style24.core.biz.service.TscMailService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscOrderService;
@@ -45,6 +43,7 @@ import com.style24.front.biz.service.TsfCouponService;
 import com.style24.front.biz.service.TsfCustomerService;
 import com.style24.front.biz.service.TsfDeliveryService;
 import com.style24.front.biz.service.TsfGiftcardService;
+import com.style24.front.biz.service.TsfLoginService;
 import com.style24.front.biz.service.TsfOrderChangeService;
 import com.style24.front.biz.service.TsfOrderService;
 import com.style24.front.biz.service.TsfPointService;
@@ -54,6 +53,7 @@ import com.style24.front.biz.service.TsfReviewService;
 import com.style24.front.biz.service.TsfWishlistService;
 import com.style24.front.biz.thirdparty.NiceCertify;
 import com.style24.front.support.controller.TsfBaseController;
+import com.style24.front.support.env.TsfConstants;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Cart;
@@ -869,7 +869,25 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
 
 		// TODO
-		// 취소 완료 알림톡 발송 에정
+		Integer ordChgSq = result.getInt("ordChgSq");
+		
+		// ordChgSq 로 아래 정보 조회하는 쿼리 작성 후 데이터 설정
+		// orderChange.setOrdPhnno();
+		// orderChange.setRefundAmt();
+		// orderChange.setOrdNm();
+		// orderChange.setOrdNo();
+		// orderChange.setGoodsNm();
+		// orderChange.setGoodsCnt();
+		// orderChange.setPayMeans();
+		// orderChange.setPayMeansNm();
+		// orderChange.setPgGb();
+		// orderChange.setCustNo();
+		
+		try {
+			coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
+		} catch (Exception e) {
+			throw new IllegalStateException(message.getMessage("FAIL_0004"));
+		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		result.set("message", message.getMessage("CANCEL_0001"));