입점클레임반품배송비

src/main/java/com/style24/admin/biz/web/TsaOrderScmController.java

@@ -23,6 +23,7 @@ import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.core.biz.service.TscOrderChangeService;
+import com.style24.core.biz.service.TscOrderOcmService;
 import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.persistence.TscPageRequest;
@@ -60,6 +61,9 @@ public class TsaOrderScmController extends TsaBaseController {
 	@Autowired
 	private TscKakaotalkService coreKakaotalkService;
 	
+	@Autowired
+	private TscOrderOcmService coreOrderOcmService;
+	
 	/**
 	 * 입점업체미발주목록화면
 	 *
@@ -187,29 +191,6 @@ public class TsaOrderScmController extends TsaBaseController {
 		
 		Collection<Order> orderSellerClaimList = coreOrderService.getOrderSellerClaimList(order);
 		
-		// 2021.12.16 변경단위 데이타 노출
-		int ordChgSq = 0;
-		for (Order sellerClaim : orderSellerClaimList) {
-			
-			if (ordChgSq == sellerClaim.getOrdChgSq()) {
-				sellerClaim.setChgReason("");
-				sellerClaim.setRfDeliveryFee(0);
-				sellerClaim.setRfRealCnclAmt(0);
-				sellerClaim.setAddPayCostPayYn("");
-				sellerClaim.setAddPayCostPgGb("");
-				sellerClaim.setChgMemo("");
-			} else {
-				ordChgSq = sellerClaim.getOrdChgSq();
-			}
-			
-			// 3.2 주문취소수량으로 취소율 정보 설정
-			int ordQty 			= sellerClaim.getOrdQty();
-			int ordCanChgQty 	= sellerClaim.getOrdCanChgQty();
-			int cnclRtnQty		= sellerClaim.getCnclRtnQty();
-			
-			float _appQty		= (float)ordCanChgQty / (float)(ordQty - cnclRtnQty);
-		}
-		
 		result.set("pageing"				, order);
 		result.set("orderSellerClaimList"	, orderSellerClaimList);
 				
@@ -243,7 +224,7 @@ public class TsaOrderScmController extends TsaBaseController {
 			order.setChgStat("G720_50");
 		}
 		
-		List<Order> cnclRtnCompleteList 	= coreOrderChangeService.getCnclRtnCompleteList(order);
+		List<Order> cnclRtnCompleteList 	= coreOrderService.getCnclRtnCompleteList(order);
 		
 		// 2021.08.04 AS-IS  데이타를 위해서 생성 처리
 		if (cnclRtnCompleteList == null || cnclRtnCompleteList.size() < 1) {
@@ -253,11 +234,11 @@ public class TsaOrderScmController extends TsaBaseController {
 			mav.addObject("oneData"				, resultMap.get("oneData"));
 		}
 		
-		Collection<Order> orderInfoList 	= coreOrderService.getOrderInfoList(order);
+		Collection<Order> orderInfoList = coreOrderService.getOrderInfoList(order);
 		
-		mav.addObject("cnclRtnCompleteList"		, cnclRtnCompleteList);			// 취소완료목록
-		mav.addObject("orderInfoList"			, orderInfoList);				// 주문기본정보
-		mav.addObject("chgStat"					, order.getChgStat());			// 변경요청상태값(정산상태구분)
+		mav.addObject("cnclRtnCompleteList"		, cnclRtnCompleteList);							// 취소완료목록
+		mav.addObject("orderInfoList"			, orderInfoList);								// 주문기본정보
+		mav.addObject("chgStat"					, order.getChgStat());							// 변경요청상태값(정산상태구분)
 		
 		mav.setViewName("order/ScmCnclCompleteView");
 		

src/main/webapp/WEB-INF/views/order/ScmCnclCompleteView.html

@@ -17,11 +17,11 @@
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<th:block th:if="${chgStat} == 'G720_30'">
-				<h2>취소완료</h2>
+				<h2>입점업체 취소완료</h2>
 				<button type="button" class="close" onclick="fnPopupClose();"><i class="fa fa-times"></i></button>
 			</th:block>
 			<th:block th:if="${chgStat} == 'G720_50'">
-				<h2>반품완료</h2>
+				<h2>입점업체 반품완료</h2>
 				<button type="button" class="close" onclick="fnPopupClose();"><i class="fa fa-times"></i></button>
 			</th:block>
 		</div>
@@ -35,6 +35,45 @@
 				<th:block th:if="${chgStat} == 'G720_50'">
 					<h4 th:id="orderInfoTitle">반품완료정보</h4>
 				</th:block>
+				
+				<!-- TABLE -->
+				<table class="tableStyle">
+					<colgroup>
+						<col width="6%"/>
+						<col width="6%"/>
+						<col width="10%"/>
+						<col width="6%"/>
+						<col width="7%"/>
+						<col width="9%"/>
+						<col width="12%"/>
+						<col width="6%"/>
+					</colgroup>
+					<thead>
+						<tr>
+							<th>몰구분</th>
+							<th>웹구분</th>
+							<th>주문일시</th>
+							<th>주문번호</th>
+							<th>주문자</th>
+							<th>휴대폰번호</th>
+							<th>이메일</th>
+							<th>고객번호</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td th:text="${orderInfoList[0].mallGbNm}"></td>
+							<td th:text="${orderInfoList[0].frontGbNm}"></td>
+							<td th:text="${orderInfoList[0].ordDt}"></td>
+							<td th:text="${orderInfoList[0].ordNo}"></td>
+							<td th:text="${orderInfoList[0].ordNm}"></td>
+							<td th:text="${orderInfoList[0].ordPhnno}"></td>
+							<td th:text="${orderInfoList[0].ordEmail}"></td>
+							<td th:text="${orderInfoList[0].custNo}"></td>
+						</tr>
+					</tbody>
+				</table>
+				<!-- //TABLE -->
 			
 				<div id="gridCnclRtnCompleteList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 				
@@ -152,52 +191,6 @@
 					</div>
 				</th:block>
 				
-				<!-- 
-				<h4>환불예정금액</h4>
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width:20%;"/>
-						<col style="width:30%;"/>
-						<col style="width:20%;"/>
-						<col style="width:30%;"/>
-					</colgroup>
-					<tbody>
-						<tr>
-							<th>상품 주문 금액</th>
-							<td><span id="spanOrdAmt"></span>원</td>
-							<th>상품 취소 금액</th>
-							<td><span id="spanCnclRtnAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>포인트 취소 금액</th>
-							<td colspan="3"><span id="spanTotPntDcAmt"></span>원 (고객 포인트 : <span id="spanPntDcAmt"></span>원 + 상품 선포인트 : <span id="spanPrePntDcAmt"></span>원) </td>
-						</tr>
-						<tr>
-							<th>쿠폰 취소 금액</th>
-							<td colspan="3"><span id="spanCpnDcAmt"></span>원 (즉시할인쿠폰 : <span id="spanCpn1DcAmt"></span>원 + 상품쿠폰 : <span id="spanGoodsCpnDcAmt"></span>원 + 장바구니쿠폰 : <span id="spanCartCpnDcAmt"></span>원 + 배송비쿠폰 : <span id="spanDelvCpnDcAmt"></span>원)</td>
-						</tr>
-						<tr>
-							<th>다다익선 취소 금액</th>
-							<td colspan="3"><span id="spanTmtbDcAmt"></span>원 (수량할인 : <span id="spanTmtb1DcAmt"></span>원 + 금액할인 : <span id="spanTmtb2DcAmt"></span>원)</td>
-						</tr>
-						<tr>
-							<th>상품권 취소 금액</th>
-							<td colspan="3"><span id="spanGfcdUseAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>상품 실결제 취소 금액</th>
-							<td><span id="spanRealCnclRtnAmt"></span>원</td>
-							<th>환불 배송비 금액</th>
-							<td><span id="spanRealDelvAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>환불 금액</th>
-							<td colspan="3"><span id="spanRefundAmt"></span>원</td>
-						</tr>
-					</tbody>
-				</table>
-				 -->
-				
 				<div id="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
 					<!-- TABLE -->
@@ -258,23 +251,13 @@ var payStat					= orderInfoList[0].payStat;					// 결제상태
 
 // 1. 취솨,반품완료 정보 목록 조회
 var columnCnclRtnCompleteList = [
+	{headerName: "업체명"			, field: "supplyCompNm"		, width: 120	, cellClass: 'text-left'},
+	{headerName: "브랜드명"		, field: "brandGroupNm"		, width: 120	, cellClass: 'text-left'},
 	{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center'},
-	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
+	{headerName: "요청구분"		, field: "chgGbNm"			, width: 100	, cellClass: 'text-center'},
+	{headerName: "변경상태"		, field: "chgStatNm"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'},
-	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'},
-	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
-	//{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center',
-		cellRenderer: function (params) {
-			var option;
-			if (params.data.goodsType == 'G056_S') {
-				option = "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailItemForm('" + params.data.ordDtlNo + "');\">" + params.value + "</a>";
-			} else {
-				option = params.value
-			}
-			return option;
-		}
-	},
+	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
 	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'},
 	{
@@ -406,6 +389,11 @@ gridOptionsCnclRtnCompleteList.rowSelection = 'multiple';
 <script>
 // 현재 사유는 고객 입니다.
 var isCustomer = true;
+var pgGb 			= orderInfoList[0].pgGb;
+var payMeans 		= orderInfoList[0].payMeans;
+var payMeansNm		= orderInfoList[0].payMeansNm;
+var cardNm			= orderInfoList[0].cardNm;
+var custNo			= orderInfoList[0].custNo;
 
 //  사유
 var fnChangeChgReason = function(reasonCd){
@@ -463,42 +451,6 @@ $(document).ready(function() {
 		raNo					= cnclRtnCompleteList[0].raNo;				// 환불계좌번호
 		raNm					= cnclRtnCompleteList[0].raNm;				// 환불계좌명
 		
-		// 5. 환불에정금액 
-		//var spanOrdAmt 			= 0;
-		//var spanCnclRtnAmt 		= 0;
-		//var spanTotPntDcAmt		= 0;
-		//var spanPntDcAmt		= 0;
-		//var spanPrePntDcAmt		= 0;
-		//var spanCpnDcAmt		= 0;
-		//var spanCpn1DcAmt		= 0;
-		//var spanGoodsCpnDcAmt	= 0;
-		//var spanCartCpnDcAmt	= 0;
-		//var spanTmtbDcAmt		= 0;
-		//var spanTmtb1DcAmt		= 0;
-		//var spanTmtb2DcAmt		= 0;
-		//var spanGfcdUseAmt		= 0;
-		//var spanRealCnclRtnAmt	= 0;
-		//var spanTotDeliveryFee	= addPayCost;
-		//var spanRefundAmt		= 0;
-		//var spanRealDelvAmt		= realDelvAmt;
-		//var spanSavePntAmt		= 0;
-		
-		// 2021.08.11 card007 환불금액 관련 계산 TB_REFUND 정보로 변경
-		//for (i=0 ; i<cnclRtnCompleteList.length ; i++) {
-		//	spanOrdAmt 				= spanOrdAmt 			+ cnclRtnCompleteList[i].ordAmt;
-		//	spanCnclRtnAmt 			= spanCnclRtnAmt 		+ cnclRtnCompleteList[i].cnclRtnAmt;
-		//	spanPntDcAmt			= spanPntDcAmt			+ cnclRtnCompleteList[i].pntDcAmt;
-		//	spanPrePntDcAmt			= spanPrePntDcAmt		+ cnclRtnCompleteList[i].prePntDcAmt;
-		//	spanCpn1DcAmt 			= spanCpn1DcAmt 		+ cnclRtnCompleteList[i].cpn1DcAmt;
-		//	spanGoodsCpnDcAmt 		= spanGoodsCpnDcAmt 	+ cnclRtnCompleteList[i].goodsCpnDcAmt;
-		//	spanCartCpnDcAmt 		= spanCartCpnDcAmt 		+ cnclRtnCompleteList[i].cartCpnDcAmt;
-		//	spanTmtb1DcAmt 			= spanTmtb1DcAmt 		+ cnclRtnCompleteList[i].tmtb1DcAmt;
-		//	spanTmtb2DcAmt 			= spanTmtb2DcAmt 		+ cnclRtnCompleteList[i].tmtb2DcAmt;
-		//	spanGfcdUseAmt 			= spanGfcdUseAmt 		+ cnclRtnCompleteList[i].gfcdUseAmt;
-		//	spanRealCnclRtnAmt 		= spanRealCnclRtnAmt 	+ cnclRtnCompleteList[i].realOrdAmt;
-		//	spanSavePntAmt			= spanSavePntAmt		+ cnclRtnCompleteList[i].savePntAmt;
-		//}
-		
 		var spanCnclRtnAmt 		= cnclRtnCompleteList[0].rfCnclAmt;			// 취소상품금액
 		var spanPntDcAmt		= cnclRtnCompleteList[0].rfPntAmt;			// 환불 포인트 사용 금액
 		var spanPrePntDcAmt		= cnclRtnCompleteList[0].rfPrePntAmt;		// 환불 선포인트 사용 금액
@@ -517,36 +469,35 @@ $(document).ready(function() {
 			spanSavePntAmt			= spanSavePntAmt		+ cnclRtnCompleteList[i].savePntAmt;
 		}
 		
-		var spanCpnDcAmt	= spanCpn1DcAmt + spanGoodsCpnDcAmt + spanCartCpnDcAmt;
-		var spanTmtbDcAmt	= spanTmtb1DcAmt + spanTmtb2DcAmt;
-		var goodsDcSumAmt = spanPrePntDcAmt + spanTmtbDcAmt;
-		var spanTotGfcdUseAmt = spanGfcdUseAmt + spanDelvGfcdUseAmt;
-		var totalRefundAmt = spanRefundAmt + spanTotGfcdUseAmt + spanPntDcAmt;
-		//spanRefundAmt	= spanRealCnclRtnAmt + realDelvAmt;
+		var spanCpnDcAmt		= spanCpn1DcAmt + spanGoodsCpnDcAmt + spanCartCpnDcAmt;
+		var spanTmtbDcAmt		= spanTmtb1DcAmt + spanTmtb2DcAmt;
+		var goodsDcSumAmt 		= spanPrePntDcAmt + spanTmtbDcAmt;
+		var spanTotGfcdUseAmt 	= spanGfcdUseAmt + spanDelvGfcdUseAmt;
+		var totalRefundAmt 		= spanRefundAmt + spanTotGfcdUseAmt + spanPntDcAmt;
 		
 		// 상품금액
-		$(".spanCnclRtnAmt").text(spanCnclRtnAmt.addComma()+"원");					// 취소상품금액
+		$(".spanCnclRtnAmt").text(spanCnclRtnAmt.addComma()+"원");				// 취소상품금액
 
 		// 할인금액차감
-		$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");						// 쿠폰할인차감 > 합계
+		$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");					// 쿠폰할인차감 > 합계
 		$(".spanCpn1DcAmt").text(spanCpn1DcAmt.addComma()+"원");					// 쿠폰할인차감 > 즉시할인쿠폰
 		$(".spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma()+"원");			// 쿠폰할인차감 > 주문서상품쿠폰
-		$(".spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma()+"원");				// 쿠폰할인차감 > 장바구니쿠폰
+		$(".spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma()+"원");			// 쿠폰할인차감 > 장바구니쿠폰
 		$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");					// 상품할인차감 > 합계
 		$(".spanPrePntDcAmt").text(spanPrePntDcAmt.addComma()+"원");				// 상품할인차감 > 선포인트할인
 		$(".spanTmtbDcAmt").text(spanTmtbDcAmt.addComma()+"원");					// 상품할인차감 > 다다익선할인
 
 		// 배송비
 		$(".spanRealDelvAmt").text(spanDeliveryFee.addComma()+"원");				// 환불배송비 > 합계
-		$(".addDelvFee").text(addPayCost.addComma()+"원");							// 환불배송비 > 추가금결제
+		$(".addDelvFee").text(addPayCost.addComma()+"원");						// 환불배송비 > 추가금결제
 		$(".delvCpnAmt").text(spanDelvCpnDcAmt.addComma()+"원");					// 환불배송비 > 배송비쿠폰
 
 		// 환불금액
-		$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");					// 총환불금액
+		$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");				// 총환불금액
 		$(".spanRefundAmt").text(spanRefundAmt.addComma()+"원");					// 결제수단환불
-		$(".spanGfcdUseAmt").text(spanTotGfcdUseAmt.addComma()+"원");				// 상품권환불
-		$(".spanPntDcAmt").text(spanPntDcAmt.addComma()+"원");						// 포인트환불
-		$(".spanSavePntAmt").text(spanSavePntAmt.addComma()+"P");					// 포인트환불 > 적립예정포인트환수
+		$(".spanGfcdUseAmt").text(spanTotGfcdUseAmt.addComma()+"원");			// 상품권환불
+		$(".spanPntDcAmt").text(spanPntDcAmt.addComma()+"원");					// 포인트환불
+		$(".spanSavePntAmt").text(spanSavePntAmt.addComma()+"P");				// 포인트환불 > 적립예정포인트환수
 		
 		var pgGbNm		= "";
 		var cardGbNm	= "";
@@ -571,28 +522,6 @@ $(document).ready(function() {
 		$(".pgGbNm").text(pgGbNm);
 		$(".cardNm").text(cardGbNm);
 		
-		/*
-		$("#spanOrdAmt").text(spanOrdAmt.addComma());
-		$("#spanCnclRtnAmt").text(spanCnclRtnAmt.addComma());
-		$("#spanTotPntDcAmt").text(spanTotPntDcAmt.addComma());
-		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
-		$("#spanPrePntDcAmt").text(spanPrePntDcAmt.addComma());
-		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
-		$("#spanCpn1DcAmt").text(spanCpn1DcAmt.addComma());
-		$("#spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma());
-		$("#spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma());
-		$("#spanDelvCpnDcAmt").text(delvCpnDcAmt.addComma());
-		$("#spanCpnDcAmt").text(spanCpnDcAmt.addComma());
-		$("#spanTmtb1DcAmt").text(spanTmtb1DcAmt.addComma());
-		$("#spanTmtb2DcAmt").text(spanTmtb2DcAmt.addComma());
-		$("#spanTmtbDcAmt").text(spanTmtbDcAmt.addComma());
-		$("#spanGfcdUseAmt").text(spanGfcdUseAmt.addComma());
-		$("#spanRealCnclRtnAmt").text(spanRealCnclRtnAmt.addComma());
-		$("#spanRealDelvAmt").text(realDelvAmt.addComma());
-		$("#spanTotDeliveryFee").text(addPayCost.addComma());
-		$("#spanRefundAmt").text(spanRefundAmt.addComma());
-		*/
-		
 		// 2021.05.13 높이자동조절
 		var cancelRequestTargetHeight = 50 + (40 * cnclRtnCompleteList.length);
 		$("#gridCnclRtnCompleteList").css("height" , cancelRequestTargetHeight+"px");