Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

src/main/java/com/style24/front/biz/dao/TsfOrderDao.java

@@ -146,4 +146,14 @@ public interface TsfOrderDao {
 	 * @since 2021. 05. 10
 	 */
 	Collection<Order> getGoodsInfoForInsurance(Order order);
+
+	/**
+	 * 비회원 주문 여부 정보 조회
+	 *
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	int getNoMemberOrderInfo(Order order);
 }

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -6,14 +6,17 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.style24.persistence.domain.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -35,6 +38,16 @@ import com.style24.front.biz.dao.TsfGoodsDao;
 import com.style24.front.biz.dao.TsfOrderDao;
 import com.style24.front.biz.dao.TsfRendererDao;
 import com.style24.front.support.security.session.TsfSession;
+import com.style24.persistence.domain.Cart;
+import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.Delivery;
+import com.style24.persistence.domain.GiftCard;
+import com.style24.persistence.domain.Goods;
+import com.style24.persistence.domain.GoodsStock;
+import com.style24.persistence.domain.KakaoPay;
+import com.style24.persistence.domain.NaverPay;
+import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.Payment;
 import com.usafe.guarantee.InsuranceInfo;
 import com.usafe.guarantee.InsuranceManager;
 
@@ -2071,4 +2084,16 @@ public class TsfOrderService {
 
 		return "SUCCESS";
 	}
+
+	/**
+	 * 비회원 주문 여부 정보 조회
+	 *
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	public int getNoMemberOrderInfo(Order order) {
+		return orderDao.getNoMemberOrderInfo(order);
+	}
 }

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

@@ -310,7 +310,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		if (!order.getOrdPhnno().contains("-")) {
 			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
 		}
-		boolean isFind = orderService.getPagingOrdNoListCount(order) > 0;
+		boolean isFind = orderService.getNoMemberOrderInfo(order) > 0;
 
 		if (isFind) {
 			TsfSession.setAttribute("noMemberOrdNm",order.getOrdNm());
@@ -349,10 +349,10 @@ public class TsfNoMemberController extends TsfBaseController {
 		}
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
 		List<Order> cnclReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
-		return coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
+		return coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
 	}
 
 	/**
@@ -552,7 +552,8 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		// 1. 취소완료 처리
 		orderChange.setCustNo(0);
-		GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
+		// GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
+		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, 0);
 
 		// TODO
 		// 취소 완료 알림톡 발송 에정

src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -608,6 +608,15 @@
 		AND    INS.ORD_NO = #{ordNo}
 	</select>
 	
+	<!-- 비회원 주문 여부 정보 조회 -->
+	<select id="getNoMemberOrderInfo" parameterType="Order" resultType="int">
+		/* TsfOrder.getNoMemberOrderInfo */
+		SELECT COUNT(*)
+		  FROM TB_ORDER
+		 WHERE ORD_NO = #{ordNo}
+		   AND ORD_NM = #{ordNm}
+		   AND ORD_PHNNO = #{ordPhnno}
+	</select>
 
 
 </mapper>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreCancelDetailFormMob.html

@@ -211,6 +211,7 @@
 let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
 let kcpReceiptUrl = [[${kcpReceiptUrl}]];
+let refundYn = [[${refundYn}]];
 
 $(document).ready(function() {
 	// 타이틀명

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -774,7 +774,7 @@
 		let jsonData = JSON.stringify(data);
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
+			cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL);
 		});
 	}
 </script>

src/main/webapp/biz/mypage.js

@@ -242,7 +242,7 @@ var fnDeleteOrder = function(noMember) {
 
 			gagajf.ajaxJsonSubmit(url, jsonData, function() {
 				if (noMember == 'noMember') {
-					cfnGoToPage(_PAGE_NOMEMBER_MAIN);
+					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
 				} else {
 					cfnGoToPage(_PAGE_MYPAGE);
 				}