주문서 수정중

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -29,6 +29,7 @@ import com.style24.front.biz.service.TsfCartService;
 import com.style24.front.biz.service.TsfOrderService;
 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.domain.Customer;
 import com.style24.persistence.domain.Order;
@@ -797,6 +798,9 @@ public class TsfOrderController extends TsfBaseController {
 	@ResponseBody
 	@RequestMapping(value = "/pay/result/response")
 	public ModelAndView payResultResponse(Payment param, HttpServletRequest request, HttpServletResponse response) {
+		
+		// 2021.06.02 태팔요청삭제
+		log.info("tno ::: {}", request.getParameter("tran_cd"));
 		if(StringUtils.isBlank(param.getPgTid()) && StringUtils.isBlank(request.getParameter("tran_cd"))) {
 			ModelAndView mav = new ModelAndView();
 			mav.setViewName("redirect:/order/payment/fail");
@@ -1033,7 +1037,7 @@ public class TsfOrderController extends TsfBaseController {
 			return mav;
 		}
 		
-		// TODO 2021.05.31 알림톡전송 주문완료정보		
+		// 2021.05.31 알림톡전송 주문완료정보		
 		if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
 			Integer userNo = orderInfo.getCustNo();
 			try {
@@ -1046,6 +1050,23 @@ public class TsfOrderController extends TsfBaseController {
 			}
 		}
 		
+		// 2021.05.31 알림톡전송 선물받기정보 (KCP 무통장입금 제외)
+		if ("Y".equals(orderInfo.getGiftPackYn())) {
+			if ("KCP".equals(orderInfo.getPgGb()) && !TscConstants.PayMeans.BANK_DEPOSIT.value().equals(orderInfo.getPayMeans())) {
+				if (StringUtils.isNotBlank(orderInfo.getRecipPhnno())) {
+					Integer userNo = orderInfo.getCustNo();
+					try {
+						orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
+						orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
+						kakaotalkService.sendOrderGiftComplete(orderInfo, userNo);
+					} catch (Exception e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		
 		// 2021.04.27 마일리지, 제휴할인정보
 		Order payOrder = orderService.getPaymentInfoForMypage(order);
 		int mileageDcAmt 	= payOrder.getNpayPntAmt();
@@ -1110,7 +1131,6 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("orderListCnt"		, resultMap.get("orderListCnt"));		// 주문목록갯수
 		mav.addObject("giftAddrInpYn"		, resultMap.get("giftAddrInpYn"));		// 선물받기배송지등록여부
 		mav.addObject("delvRegYn"			, resultMap.get("delvRegYn"));			// 배송지등록여부
-		
 		mav.setViewName(super.getDeviceViewName("order/OrderGiftComplete"));
 		
 		return mav;

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -1277,7 +1277,9 @@ var paymentInfoSet = function() {
 							} else if (pgGb == "KAKAO") {
 								fnKakaoPaymentReady();
 							} else if (pgGb == "KCP" || pgGb == "PAYCO") {
-								$("#order_info input[name=Ret_URL]").val("http:" + _frontUrl + "/order/pay/result/response");
+								// 2021.06.02 태팔요청
+								var protocol = location.protocol;
+								$("#order_info input[name=Ret_URL]").val(protocol + _frontUrl + "/order/pay/result/response");
 								kcp_AJAX();
 							}
 						}

src/main/webapp/WEB-INF/views/mob/order/OrderGiftInfoMob.html

@@ -38,7 +38,7 @@
 								<p class="desc_txt">선물이 타인에게 전송될수 있으니 받으실분 연락처를 정확하게 입력해주세요.</p> <!-- 210421_삭제 : 전화번호를 텍스트 삭제 -->
 							</div>
 							<div class="textarea_wrap">
-								<textarea class="doc_review" name="review" id="" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
+								<textarea class="doc_review" name="review" id="giftMsg" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
 								<p class="txt_cnt"><span id="review_cnt" class="c_primary">0</span>/200</p>
 							</div>
 						</div>

src/main/webapp/WEB-INF/views/mob/order/OrderListInfoMob.html

@@ -26,32 +26,34 @@
 					<th:block th:each="delvAllCart, i : ${delvAllCartList}">
 						<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
 							<div class="part_goods">
-								<th:block th:if="${i.index} == 0">
-									<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-										<div class="goods_top">
-											<div class="goods_date">STYLE24 총알배송<span class="date">오늘 자정까지 도착</span></div>
-										</div>
+								<th:block th:if="${order.giftPackYn} == 'N'" >
+									<th:block th:if="${i.index} == 0">
+										<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
+											<div class="goods_top">
+												<div class="goods_date">STYLE24 총알배송<span class="date">오늘 자정까지 도착</span></div>
+											</div>
+										</th:block>
 									</th:block>
-								</th:block>
-								<th:block th:if="${i.index} == 1">
-									<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-										<div class="goods_top">
-											<div class="goods_date">STYLE24 일반배송</div>
-										</div>
+									<th:block th:if="${i.index} == 1">
+										<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
+											<div class="goods_top">
+												<div class="goods_date">STYLE24 일반배송</div>
+											</div>
+										</th:block>
 									</th:block>
-								</th:block>
-								<th:block th:if="${i.index} == 2">
-									<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-										<div class="goods_top">
-											<div class="goods_date">업체직배송</div>
-										</div>
+									<th:block th:if="${i.index} == 2">
+										<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
+											<div class="goods_top">
+												<div class="goods_date">업체직배송</div>
+											</div>
+										</th:block>
 									</th:block>
-								</th:block>
-								<th:block th:if="${i.index} == 3">
-									<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
-										<div class="goods_top">
-											<div class="goods_date">예약배송</div>
-										</div>
+									<th:block th:if="${i.index} == 3">
+										<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
+											<div class="goods_top">
+												<div class="goods_date">예약배송</div>
+											</div>
+										</th:block>
 									</th:block>
 								</th:block>
 								<!-- 주문 접수 -->