주문서개발중

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

@@ -1364,7 +1364,6 @@ public class TscOrderService {
 			orderDetail.setRegNo(order.getCustNo());
 			orderDetail.setOrdDtlStat(TscConstants.OrderDetailStat.ORDER_RECEIPT.value());
 			orderDetail.setDelvAddrSq(order.getDelvAddrSq());
-			orderDetail.setGiftPackYn("N");
 			
 			// 2021.03.29 즉시할인금액 수량만큼 넣어야함
 			orderDetail.setCpn1DcAmt(orderDetail.getCpn1DcAmt() * order.getGoodsQty());
@@ -1735,6 +1734,7 @@ public class TscOrderService {
 				order.setRecipDtlAddr(deliveryAddrInfo.getRecipDtlAddr());
 				order.setRecipPhnno(deliveryAddrInfo.getRecipPhnno());
 				order.setDelvMemo(deliveryAddrInfo.getDelvMemo());
+				order.setGiftMsg(deliveryAddrInfo.getGiftMsg());
 			}
 			index++;
 		}
@@ -1754,6 +1754,8 @@ public class TscOrderService {
 		int savePntSumAmt 		= 0; // 적립예정포인트합계
 		int delvAddrSq			= 0; // 배송지번호
 		index					= 0;
+		
+		String giftPackYn		= "N"; // 선물여부
 
 		for (Order orderDetail : orderDetailList) {
 			goodsSumAmt 		= goodsSumAmt 		+ ((orderDetail.getCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty());
@@ -1769,8 +1771,15 @@ public class TscOrderService {
 				delvAddrSq		= orderDetail.getDelvAddrSq();
 			}
 			index++;
+			
+			if ("Y".equals(orderDetail.getGiftPackYn())) {
+				giftPackYn		= "Y"; 
+			}
 		}
 		
+		// 선물여부
+		order.setGiftPackYn(giftPackYn);
+		
 		// 4. 결제정보조회
 		Collection<Order> orderPaymentList = getOrderPaymentBasicInfoList(order);
 		index = 0;

src/main/java/com/style24/persistence/domain/Order.java

@@ -640,5 +640,5 @@ public class Order extends TscBaseDomain {
 	}
 	
 	private String orderGiftYn;			// 선물여부
-	
+	private String giftMsg;				// 선물메세지
 }

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

@@ -460,7 +460,7 @@
 		    ON O.ORD_NO = OD.ORD_NO
 		  LEFT OUTER JOIN TB_CUSTOMER C
 		    ON O.CUST_NO = C.CUST_NO
-		 INNER JOIN TB_PAYMENT P
+		  LEFT OUTER JOIN TB_PAYMENT P
 		    ON O.ORD_NO = P.ORD_NO
 		   AND P.PAY_GB = 'O'
 		   AND P.PAY_STAT IN ('G016_30', 'G016_00')
@@ -639,6 +639,7 @@
 			 , Z.RECIP_DTL_ADDR
 			 , Z.ORD_EMAIL
 			 , Z.DELV_MEMO
+			 , Z.GIFT_MSG
 		  FROM (SELECT OD.DELV_ADDR_SQ
 					 , OD.ORD_DTL_STAT
 					 , OD.ORD_EXCH_GB
@@ -654,6 +655,7 @@
 					 , DA.RECIP_DTL_ADDR
 					 , O.ORD_EMAIL
 					 , DA.DELV_MEMO
+					 , DA.GIFT_MSG
 				  FROM TB_ORDER_DETAIL OD
 				 INNER JOIN TB_ORDER O
 				    ON OD.ORD_NO = O.ORD_NO
@@ -2470,6 +2472,7 @@
 		    , RECIP_BASE_ADDR
 		    , RECIP_DTL_ADDR
 		    , DELV_MEMO
+		    , GIFT_MSG
 		    , REG_NO
 		    , REG_DT
 		    , UPD_NO
@@ -2482,6 +2485,7 @@
 		    , #{recipBaseAddr}
 		    , #{recipDtlAddr}
 		    , #{delvMemo}
+		    , #{giftMsg}
 		    , #{custNo}
 		    , NOW()
 		    , #{custNo}
@@ -3481,7 +3485,7 @@
 	<select id="getOrderDetailOrdAmtList"  parameterType="Order" resultType="Order">
 		/* TscOrder.getOrderDetailOrdAmtList */
 		SELECT OD.CURR_PRICE
-		     , ODI.OPT_ADD_PRICE
+		     , SUM(ODI.OPT_ADD_PRICE) AS OPT_ADD_PRICE
 		     , OD.ORD_QTY
 		     , OD.CPN1_DC_AMT 
 		     , OD.TMTB1_DC_AMT 
@@ -3493,12 +3497,26 @@
 		     , OD.GFCD_USE_AMT 
 		     , OD.SAVE_PNT_AMT 
 		     , OD.DELV_ADDR_SQ
+		     , OD.GIFT_PACK_YN
 		FROM   TB_ORDER_DETAIL OD
 		INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
 		ON     OD.ORD_NO = ODI.ORD_NO
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		WHERE  1=1
 		AND    OD.ORD_NO = #{ordNo}
+		GROUP  BY OD.CURR_PRICE
+		     , OD.ORD_QTY
+		     , OD.CPN1_DC_AMT 
+		     , OD.TMTB1_DC_AMT 
+		     , OD.TMTB2_DC_AMT 
+		     , OD.GOODS_CPN_DC_AMT 
+		     , OD.CART_CPN_DC_AMT 
+		     , OD.PRE_PNT_DC_AMT 
+		     , OD.PNT_DC_AMT 
+		     , OD.GFCD_USE_AMT 
+		     , OD.SAVE_PNT_AMT 
+		     , OD.DELV_ADDR_SQ
+		     , OD.GIFT_PACK_YN
 	</select>
 
 	<!-- 마이페이지 주문 상태 별 수량 조회 -->