Merge remote-tracking branch 'origin/jsh77b' into xodud1202

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -1487,7 +1487,7 @@ public class TscOrderService {
 					orderDetailItem.setSavePntAmt((orderDetail.getSavePntAmt() * tempDiv) / 100);
 					orderDetailItem.setRealOrdAmt((orderDetail.getRealOrdAmt() * tempDiv) / 100);
 					orderDetailItem.setGfcdUseAmt((orderDetail.getGfcdUseAmt() * tempDiv) / 100);
-					
+										
 					leftOrdAmt 			= leftOrdAmt 			- ((orderDetail.getOrdAmt() * tempDiv) / 100);
 					leftCpn1DcAmt 		= leftCpn1DcAmt 		- ((orderDetail.getCpn1DcAmt() * tempDiv) / 100);
 					leftTmtb1DcAmt 		= leftTmtb1DcAmt 		- ((orderDetail.getTmtb1DcAmt() * tempDiv) / 100);
@@ -1501,6 +1501,8 @@ public class TscOrderService {
 					leftGfcdUseAmt 		= leftGfcdUseAmt 		- ((orderDetail.getGfcdUseAmt() * tempDiv) / 100);
 				}
 				
+				// 2021.05.06 옵션금액 단품 추가
+				orderDetailItem.setOptAddPrice(optAddPrice);
 				orderDetailItem.setCustNo(order.getCustNo());
 
 				orderDao.createOrderDetailItem(orderDetailItem); // 주문상세단품정보등록

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

@@ -2492,7 +2492,7 @@
 		     , G.CURR_PRICE 
 		     , IFNULL(GC.QTY, 1)                            AS ITEM_QTY
 		     , IFNULL(GC.COMPS_CURR_PRICE, G.CURR_PRICE)    AS ITEM_PRICE
-		     , OP.ADD_PRICE 
+		     , OP.ADD_PRICE                                 AS OPT_ADD_PRICE
 		     , CD.DISP_ORD 
 		     , 0                                            AS ORD_AMT
 		     , 0                                            AS CNCL_RTN_AMT