개선 #998 [ADMIN][FRONT] 배송비 계산 처리 시 상품권 사용 금액 추가 처리 임시 커밋

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

@@ -1212,8 +1212,8 @@ $(document).ready(function () {
 	var savePntSumAmt		= 0;			// 적립포인트
 	
 	for (i=0 ; i<orderGoodsInfo.length ; i++) {
-		listSumAmt			+= (parseInt(orderGoodsInfo[i].listPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * orderGoodsInfo[i].ordQty;
-		currSumAmt			+= (parseInt(orderGoodsInfo[i].currPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * orderGoodsInfo[i].ordQty;
+		listSumAmt			+= (parseInt(orderGoodsInfo[i].listPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * (orderGoodsInfo[i].ordQty - orderGoodsInfo[i].cnclRtnQty);
+		currSumAmt			+= (parseInt(orderGoodsInfo[i].currPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * (orderGoodsInfo[i].ordQty - orderGoodsInfo[i].cnclRtnQty);
 		cpn1DcSumAmt		+= parseInt(orderGoodsInfo[i].cpn1DcAmt);
 		tmtb1DcSumAmt		+= parseInt(orderGoodsInfo[i].tmtb1DcAmt);
 		tmtb2DcSumAmt		+= parseInt(orderGoodsInfo[i].tmtb2DcAmt);