1. 마이페이지 주문상세 임시 커밋

src/main/java/com/style24/core/biz/dao/TscOrderDao.java

@@ -461,4 +461,34 @@ public interface TscOrderDao {
 	 * @since 2021. 02. 08
 	 */
 	int getOrderChangeStatCount(Order order);
+
+	/**
+	 * 마이페이지 주문상세 금액정보 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 02. 15
+	 */
+	Order getOrderAmtForMypage(Order order);
+
+	/**
+	 * 마이페이지 주문상세 결제정보 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 02. 15
+	 */
+	Order getPaymentInfoForMypage(Order order);
+
+	/**
+	 * 마이페이지 주문상세 배송지 정보 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 02. 15
+	 */
+	Order getOrderDeliveryAddrInfo(Order order);
 }

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

@@ -791,12 +791,12 @@ public class TscOrderService {
 		int rowspan = 0;
 
 		for (Order tmpOrder : orderDao.getOrderListForMypage(order)) {
-			log.info("tmpOrder >>> {}", tmpOrder);
 			// 주문번호, 배송구분(총알배송, 일반배송, 업체직배송), 배송정책 변경
 			if (ordNo != tmpOrder.getOrdNo() || !selfGoodsYn.equals(tmpOrder.getSelfGoodsYn()) || ("N".equals(tmpOrder.getSelfGoodsYn()) && !delvFeeCd.equals(tmpOrder.getDelvFeeCd())) || !shotDelvYn.equals(tmpOrder.getShotDelvYn())) {
 				// 데이터 설정
 				if (index > 0) {
 					GagaMap map = new GagaMap();
+					map.set("ordNo", ordNo);					// 주문번호
 					map.set("ordDt", ordDt);					// 주문일시
 					map.set("shotDelvYn", shotDelvYn);			// 총알배송여부
 					map.set("selfGoodsYn", selfGoodsYn);		// 자사여부
@@ -843,6 +843,7 @@ public class TscOrderService {
 
 		// 마지막 데이터 설정
 		GagaMap map = new GagaMap();
+		map.set("ordNo", ordNo);
 		map.set("ordDt", ordDt);
 		map.set("shotDelvYn", shotDelvYn);
 		map.set("selfGoodsYn", selfGoodsYn);
@@ -907,4 +908,34 @@ public class TscOrderService {
 	 */
 	public int getOrderChangeStatCount(Order order) { return orderDao.getOrderChangeStatCount(order); }
 
+	/**
+	 * 마이페이지 주문상세 금액정보 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 02. 16
+	 */
+	public Order getOrderAmtForMypage(Order order) { return orderDao.getOrderAmtForMypage(order); }
+
+	/**
+	 * 마이페이지 주문상세 결제정보 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 02. 16
+	 */
+	public Order getPaymentInfoForMypage(Order order) { return orderDao.getPaymentInfoForMypage(order); }
+
+	/**
+	 * 마이페이지 주문상세 배송지 정보 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 02. 16
+	 */
+	public Order getOrderDeliveryAddrInfo(Order order) { return orderDao.getOrderDeliveryAddrInfo(order); }
+
 }

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

@@ -468,4 +468,7 @@ public class Order extends TscBaseDomain {
 	private int giftLimitDay;
 	private String giftCompleteDt;
 	private int rowspan;
+	private String vaDeadlineYmd;
+	private String vaDeadlineHms;
+	private int totalDcAmt;
 }

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

@@ -2036,6 +2036,9 @@
 				</otherwise>
 			</choose>
 		</where>
+		<if test="ordNo != null and ordNo != ''">
+		   AND O.ORD_NO = #{ordNo}
+		</if>
 		<choose>
 			<when test="stDate != null and stDate != '' and edDate != null and edDate != ''">
 		   AND O.ORD_DT BETWEEN DATE_FORMAT(CONCAT(#{stDate}, ' 000000'), '%Y-%m-%d %H%i%S') AND DATE_FORMAT(CONCAT(#{edDate}, ' 235959'), '%Y-%m-%d %H%i%S')
@@ -2116,6 +2119,118 @@
 		 WHERE CUST_NO = #{custNo}
 		<include refid="selectForPagingFooter"/>
 	</select>
+	
+	<!-- 마이페이지 주문상세 금액정보 조회 -->
+	<select id="getOrderAmtForMypage" parameterType="Order" resultType="Order">
+		/* TscOrder.getOrderAmtForMypage */
+		SELECT SUM(OD.ORD_AMT)          AS ORD_AMT
+			 , SUM(OD.CPN1_DC_AMT)      AS CPN1_DC_AMT
+			 , SUM(OD.TMTB1_DC_AMT)     AS TMTB1_DC_AMT
+			 , SUM(OD.TMTB2_DC_AMT)     AS TMTB2_DC_AMT
+			 , SUM(OD.CART_CPN_DC_AMT)  AS CART_CPN_DC_AMT
+			 , SUM(OD.GOODS_CPN_DC_AMT) AS GOODS_CPN_DC_AMT
+			 , SUM(OD.PRE_PNT_DC_AMT)   AS PRE_PNT_DC_AMT
+			 , SUM(OD.PNT_DC_AMT)       AS PNT_DC_AMT
+			 , SUM(OD.GFCD_USE_AMT)     AS GFCD_USE_AMT
+		     , SUM(OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT + OD.CART_CPN_DC_AMT + OD.GOODS_CPN_DC_AMT + OD.PRE_PNT_DC_AMT + OD.PNT_DC_AMT + OD.GFCD_USE_AMT) AS TOTAL_DC_AMT
+			 , SUM(OD.REAL_ORD_AMT)     AS REAL_ORD_AMT
+			 , SUM(OD.SAVE_PNT_AMT)     AS SAVE_PNT_AMT
+			 , SUM(DF.DELV_FEE)         AS DELV_FEE
+		  FROM TB_ORDER_DETAIL OD
+		  LEFT OUTER JOIN (
+			  SELECT ORD_NO
+				   , SUM(DELV_FEE) AS DELV_FEE
+				FROM TB_DELIVERY_FEE
+			   WHERE ORD_NO = #{ordNo}
+				 AND DELV_FEE_GB = 'G018_10'
+			   GROUP BY ORD_NO
+		  ) DF
+		    ON OD.ORD_NO = DF.ORD_NO
+		 WHERE OD.ORD_NO = #{ordNo}
+	</select>
+	
+	<!-- 마이페이지 주문상세 결제정보 조회 -->
+	<select id="getPaymentInfoForMypage" parameterType="Order" resultType="Order">
+		/* TscOrder.getPaymentInfoForMypage */
+		SELECT PAY_SQ
+		     , ORD_NO
+		     , PAY_DT
+		     , PAY_MEANS
+		     , PAY_AMT
+		     , PG_CPN_AMT
+		     , NPAY_PNT_AMT
+		     , PAY_GB
+		     , PAY_STAT
+		     , PG_GB
+		     , PG_TID
+		     , PG_TRADE_NO
+		     , PG_SHOP_ID
+		     , CARD_TYPE
+		     , CARD_KIND
+		     , CARD_BANK
+		     , CARD_NM
+		     , CARD_MIPS
+		     , CARD_PCABLE_YN
+		     , VA_NO
+		     , VA_NM
+		     , VA_BANK
+		     , VA_DEADLINE
+		     , DATE_FORMAT(VA_DEADLINE, '%Y.%m.%d') AS VA_DEADLINE_YMD
+		     , DATE_FORMAT(VA_DEADLINE, '%H:%i:%S') AS VA_DEADLINE_HMS
+		     , TELECOM
+		     , ESCROW_YN
+		     , ORD_CHG_SQ
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		  FROM TB_PAYMENT
+		<where>
+			<if test="ordNo != null and ordNo != ''">
+		   AND ORD_NO = #{ordNo}
+			</if>
+			<if test="paySq != null and paySq != ''">
+		   AND PAY_SQ = #{paySq}
+			</if>
+			<if test="ordChgSq != null and ordChgSq != ''">
+		   AND ORD_CHG_SQ = #{ordChgSq}
+			</if>
+			<if test="pgTid != null and pgTid != ''">
+		   AND PG_TID = #{pgTid}
+			</if>
+			<if test="payGb != null and payGb != ''">
+		   AND PAY_GB = #{payGb}
+			</if>
+			<if test="payStat != null and payStat != ''">
+		   AND PAY_STAT = #{payStat}
+			</if>
+			<if test="pgGb != null and pgGb != ''">
+		   AND PG_GB = #{pgGb}
+			</if>
+		</where>
+	</select>
+	
+	<!-- 마이페이지 주문상세 배송지 정보 조회 -->
+	<select id="getOrderDeliveryAddrInfo" parameterType="Order" resultType="Order">
+		/* TscOrder.getOrderDeliveryAddrInfo */
+		SELECT DA.DELV_ADDR_SQ
+		     , DA.RECIP_NM
+		     , DA.RECIP_PHNNO
+		     , DA.RECIP_TELNO
+		     , DA.RECIP_ZIPCODE
+		     , DA.RECIP_BASE_ADDR
+		     , DA.RECIP_DTL_ADDR
+		     , DA.DELV_MEMO
+		     , DA.REG_NO
+		     , DA.REG_DT
+		     , DA.UPD_NO
+		     , DA.UPD_DT
+		  FROM TB_DELIVERY_ADDR DA
+		 INNER JOIN TB_ORDER_DETAIL OD
+		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		   AND OD.ORD_NO = #{ordNo}
+		 LIMIT 1
+	</select>
 </mapper>