Merge branch 'develop' into eskim

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

@@ -692,13 +692,15 @@ public class TsfDisplayService {
 	public Collection<Filter> getCategoryFilterList(Collection<Filter> filterList, String filterGb) {
 		Collection<Filter> resultList = new ArrayList<Filter>();
 		for (Filter filter : filterList) {
-			if (filter.getFilterGb().equals(filterGb)) {
-				if ("BENEFIT".equals(filterGb)) {
-					if (!filter.getFilterCd().equals("40")) {
+			if(!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)){
+				if (filter.getFilterGb().equals(filterGb)) {
+					if ("BENEFIT".equals(filterGb)) {
+						if (!filter.getFilterCd().equals("40")) {
+							resultList.add(filter);
+						}
+					} else {
 						resultList.add(filter);
 					}
-				} else {
-					resultList.add(filter);
 				}
 			}
 		}

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

@@ -916,7 +916,7 @@ public class TsfMypageController extends TsfBaseController {
 		orderChange.setIpAddress(TsfSession.getIpAddress());
 
 		// 2. 취소완료 처리
-		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
+		GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, custNo);
 
 		// 3. 취소완료 카카오알림톡 발송
 		int ordChgSq = result.getInt("ordChgSq");
@@ -2174,7 +2174,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author jsshin
 	 * @since 2021. 03. 16
 	 */
-	@RequestMapping("/account/check")
+	@PostMapping("/account/check")
 	@ResponseBody
 	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
 		boolean isValid = false;

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

@@ -568,8 +568,7 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		// 1. 취소완료 처리
 		orderChange.setCustNo(0);
-		// GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
-		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, 0);
+		GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
 
 		// 2. 취소완료 카카오알림톡 발송
 		int ordChgSq = result.getInt("ordChgSq");

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

@@ -1437,6 +1437,7 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("orderAddPayGoodsList"	, orderAddPayGoodsList);					// 주문목록정보
 		mav.addObject("ordNo"					, resultMap.get("ordNo"));					// 주문번호
 		mav.addObject("ordNm"					, resultMap.get("ordNm"));					// 주문자명
+		mav.addObject("ordPhnno"				, resultMap.get("ordPhnno"));				// 주문자핸드폰번호
 		mav.addObject("refundAmt"				, resultMap.get("refundAmt"));				// 상품환불금액
 		mav.addObject("addPayCost"				, resultMap.get("addPayCost"));				// 추가결제금액
 		mav.addObject("ordChgSq"				, resultMap.get("ordChgSq"));				// 주문취소신청번호
@@ -1474,8 +1475,8 @@ public class TsfOrderController extends TsfBaseController {
 		}
 		
 		order.setPayAmt(order.getAddPayCost());
-		order.setOrdNm(order.getChgerNm());
-		order.setOrdPhnno(order.getChgerPhnno());
+		// order.setOrdNm(order.getChgerNm());
+		// order.setOrdPhnno(order.getChgerPhnno());
 		
 		// 2. 결제정보설정
 		Payment payment = orderService.setPgDataInfo(order);
@@ -1535,6 +1536,8 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("ordChgSq", resultMap.get("ordChgSq"));					// 주문취소신청번호
 		mav.addObject("chgerNm", resultMap.get("chgerNm"));						// 변경신청인
 		mav.addObject("chgerPhnno", resultMap.get("chgerPhnno"));				// 변경신청핸드폰번호
+		mav.addObject("ordNm", resultMap.get("ordNm"));							// 주문자명
+		mav.addObject("ordPhnno", resultMap.get("ordPhnno"));					// 주문자핸드폰번호
 
 		// TODO 3. 주문정보 업데이트
 		coreOrderService.updateOrderChangeDetail(order);

src/main/java/com/style24/persistence/domain/searchengine/SearchEngine.java

@@ -84,6 +84,7 @@ public class SearchEngine implements Serializable {
 	private String likeIt;			// 좋아요(위시리스트에담긴상품)
 	private String mainColorCd;		// 메인컬러
 	private String selfGoodsYn;		// 자사상품여부
+	private String colorCd;
 
 //	private String adminIp;			// 검색엔진IP
 //	private String adminPort;		// 검색엔진포트
@@ -95,6 +96,8 @@ public class SearchEngine implements Serializable {
 	private String planNm;			//기획전명
 	private Integer planSq;			//기획전일련번호(SeqPlan sequence)
 	private String dtlTitle1;		//상세제목1
+	private String brandNm;
+	private String newYn;
 
 	// 이벤트 리스트
 	private String dispStdt;			//기획전 시작일시

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

@@ -347,6 +347,15 @@
 	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let oneData = [[${oneData}]];
 	let isLogin = [[${isLogin}]];
+	
+	// 추가배송비 전표 데이터 설정
+	let paymentInfo = {};
+	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
+	let orderAmtInfo = {};
+	orderAmtInfo.realOrdAmt = oneData.addPayCost;
+	orderAmtInfo.realDelvAmt = 0;
 
 	$(document).ready(function() {
 		// 타이틀명

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

@@ -333,6 +333,15 @@
 	let addrGb = '';
 	let memoGb = '';
 
+	// 추가배송비 전표 데이터 설정
+	let paymentInfo = {};
+	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
+	let orderAmtInfo = {};
+	orderAmtInfo.realOrdAmt = oneData.addPayCost;
+	orderAmtInfo.realDelvAmt = 0;
+
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('교환상세');

src/main/webapp/WEB-INF/views/web/mypage/MypageCreExchangeDetailFormWeb.html

@@ -301,6 +301,8 @@
 	// 추가배송비 전표 데이터 설정
 	let paymentInfo = {};
 	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
 	let orderAmtInfo = {};
 	orderAmtInfo.realOrdAmt = oneData.addPayCost;
 	orderAmtInfo.realDelvAmt = 0;

src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -484,6 +484,7 @@
 		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;
+		data.selfGoodsYn = oneData.selfGoodsYn;
 
 		let jsonData = JSON.stringify(data);
 

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreExchangeDetailFormWeb.html

@@ -298,6 +298,8 @@
 	// 추가배송비 전표 데이터 설정
 	let paymentInfo = {};
 	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
 	let orderAmtInfo = {};
 	orderAmtInfo.realOrdAmt = oneData.addPayCost;
 	orderAmtInfo.realDelvAmt = 0;

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html

@@ -127,8 +127,8 @@
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this, 'noMember');"><span>배송 조회</span></button></p>
 													</th:block>
 
-													<!-- 쇼핑백담기 버튼(구매확정) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70'}">
+													<!-- 쇼핑백담기 버튼(배송준비중, 구매확정) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_40' or ordDtl.ordDtlStat == 'G013_70'}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
 													</th:block>
 												</div>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderListFormWeb.html

@@ -431,8 +431,8 @@
 						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" shipCompCd="' + ordDtl.shipCompCd + '" invoiceNo="' + ordDtl.invoiceNo + '" onclick="fnGoToDelivery(this, \'noMember\');"><span>배송 조회</span></button></p>\n';
 					}
 
-					// 쇼핑백담기 버튼(구매확정)
-					if (ordDtl.ordDtlStat == 'G013_70') {
+					// 쇼핑백담기 버튼(배송준비중, 구매확정)
+					if (ordDtl.ordDtlStat == 'G013_40' || ordDtl.ordDtlStat == 'G013_70') {
 						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
 					}
 

src/main/webapp/WEB-INF/views/web/order/OrderAddPaymentFormWeb.html

@@ -28,6 +28,7 @@
 	<input type="hidden" name="refundAmt" th:value="${refundAmt}">
 	<input type="hidden" name="ordNo" th:value="${ordNo}">
 	<input type="hidden" name="ordNm" th:value="${ordNm}">
+	<input type="hidden" name="ordPhnno" th:value="${ordPhnno}">
 	<input type="hidden" name="addPayCost" th:value="${addPayCost}">
 	<input type="hidden" name="ordChgSq" th:value="${ordChgSq}">
 	
@@ -239,6 +240,7 @@ $("#btn_payment").on("click", function(){
 		,"payMeans"				: payMeans // 네이버페이, 카카오페이
 		,"ordNo"				: $("#addPayForm input[name=ordNo]").val()
 		,"ordNm"				: $("#addPayForm input[name=ordNm]").val()
+		,"ordPhnno"				: $("#addPayForm input[name=ordPhnno]").val()
 		,"addPayCost"			: $("#addPayForm input[name=addPayCost]").val()
 		,"ordChgSq"				: $("#addPayForm input[name=ordChgSq]").val()
 		,"chgGb"				: $("#addPayForm input[name=chgGb]").val()

src/main/webapp/biz/mypage.js

@@ -362,10 +362,15 @@ var fnReceipt = function(param) {
 	let receiptWin = kcpReceiptUrl;
 	let option = '';
 	if (param == 'card') {
+		let order_no = ordNo;
+		if (!gagajf.isNull(paymentInfo.ordChgSq)) {
+			order_no = 'C' + paymentInfo.ordChgSq;
+		}
+		
 		// URL 설정
 		receiptWin += '?cmd=card_bill';
 		receiptWin += '&tno=' + paymentInfo.pgTid;
-		receiptWin += '&order_no=' + ordNo;
+		receiptWin += '&order_no=' + order_no;
 		receiptWin += '&trade_mony=' + (orderAmtInfo.realOrdAmt + orderAmtInfo.realDelvAmt);
 
 		// 팝업 크기 설정
@@ -403,7 +408,7 @@ var fnReceipt = function(param) {
 		// 팝업 크기 설정
 		option = 'width=455, height=815';
 	}
-
+console.log(receiptWin);
 	// 팝업 생성
 	window.open(receiptWin, "", option);
 }