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

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

@@ -440,64 +440,4 @@ public interface TscOrderDao {
 	 * @since 2021. 02. 02
 	 */	
 	int getDailyDeliveryZoneInfo(Order order);
-
-	/**
-	 * 마이페이지 주문 정보 조회
-	 *
-	 * @param Order
-	 * @return Collection<Order>
-	 * @author card007
-	 * @since 2021. 02. 04
-	 */
-	Collection<Order> getOrderListForMypage(Order order);
-
-	/**
-	 * 마이페이지 주문상태 별 주문수량 조회
-	 *
-	 * @param Order
-	 * @return int
-	 * @author card007
-	 * @since 2021. 02. 08
-	 */
-	int getOrderStatCount(Order order);
-
-	/**
-	 * 마이페이지 주문변경상태 별 주문수량 조회
-	 *
-	 * @param Order
-	 * @return int
-	 * @author card007
-	 * @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/dao/TscPointDao.java

@@ -33,4 +33,13 @@ public interface TscPointDao {
 	 */
 	int createCustomerPointHst(Point point);
 
+	/**
+	 * 구매확정 포인트 조회
+	 * @param Integer
+	 * @return int
+	 * @author card007
+	 * @since 2021. 02. 17
+	 */
+	int getOrderDecisionPoint(Integer ordDtlNo);
+
 }

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

@@ -1,6 +1,8 @@
 package com.style24.core.biz.service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.List;
 
@@ -14,9 +16,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gagaframework.excel.env.GagaExcelConstants;
 import com.gagaframework.excel.xssf.GagaExcelResultHandler;
 import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.dao.TscOrderDao;
+import com.style24.core.biz.dao.TscPointDao;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.Point;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -38,6 +44,9 @@ public class TscOrderService {
 
 	@Autowired
 	private TscOrderDao orderDao;
+	
+	@Autowired
+	private TscPointService pointService;
 
 	@Autowired
 	private ObjectMapper mapper;
@@ -844,177 +853,76 @@ public class TscOrderService {
 	}
 
 	/**
-	 * 마이페이지 주문 정보 조회
+	 * 구매확정 처리
 	 * 
 	 * @param Order
+	 * @result GagaMap
 	 * @author card007
-	 * @since 2021. 02. 04
+	 * @since 2021. 02. 17
 	 */
-	public Collection<GagaMap> getOrderListForMypage(Order order) {
-		Collection<GagaMap> mapList = new ArrayList<>();
-		List<Order> orderList = new ArrayList<>();
-		int ordNo = 0;
-		String ordDt = "";
-		String delvFeeCd = "";
-		String ordDtlStat = "";
-		String shotDelvYn = "";
-		String selfGoodsYn = "";
-		String shipCompNm = "";
-		String invoiceNo = "";
-		String giftPackYn = "";
-		int reviewSq = 0;
-		int index = 0;
-		int ordDtlStatCnt = 0;
-		int rowspan = 0;
-
-		for (Order tmpOrder : orderDao.getOrderListForMypage(order)) {
-			// 주문번호, 배송구분(총알배송, 일반배송, 업체직배송), 배송정책 변경
-			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);		// 자사여부
-					map.set("ordDtlStat", ordDtlStat);			// 주문상태코드
-					map.set("shipCompNm", shipCompNm);			// 배송업체명
-					map.set("invoiceNo", invoiceNo);			// 송장번호
-					map.set("giftPackYn", giftPackYn);			// 선물하기여부
-					map.set("reviewSq", reviewSq);				// 리뷰일련번호
-					map.set("orderList", setOrderListParameter(orderList, rowspan, ordDtlStatCnt, "Y"));			// 주문내역
-					mapList.add(map);
-				}
-				
-				// 데이터 설정 후 초기화 진행
-				ordNo = tmpOrder.getOrdNo();
-				ordDt = tmpOrder.getOrdDt();
-				delvFeeCd = tmpOrder.getDelvFeeCd();
-				ordDtlStat = tmpOrder.getOrdDtlStat();
-				shotDelvYn = tmpOrder.getShotDelvYn();
-				selfGoodsYn = tmpOrder.getSelfGoodsYn();
-				shipCompNm = tmpOrder.getShipCompNm();
-				invoiceNo = tmpOrder.getInvoiceNo();
-				reviewSq = tmpOrder.getReviewSq();
-				giftPackYn = tmpOrder.getGiftPackYn();
-				orderList = new ArrayList<>();
-				ordDtlStatCnt = 0;
-				rowspan = 0;
-			} else if (index > 0 && !ordDtlStat.equals(tmpOrder.getOrdDtlStat())) {
-				// 주문내역 데이터 추가
-				orderList = setOrderListParameter(orderList, rowspan, ordDtlStatCnt, "N");
-				
-				// 상태 별 배너 설정 후 초기화 진행
-				ordDtlStat = tmpOrder.getOrdDtlStat();
-				rowspan = 0;
+	@Transactional("shopTxnManager")
+	public GagaMap decideOrder(Order order) {
+		GagaMap result = new GagaMap();
+
+		Integer custNo = order.getCustNo();
+		Integer ordNo = order.getOrdNo();
+		Integer reviewSq = order.getReviewSq();
+		Integer regNo = order.getRegNo();
+		Integer updNo = order.getUpdNo();
+		
+		try {
+			for (Integer ordDtlNo : order.getOrdDtlNoArr()) {
+				// 구매확정 포인트 적립
+				int savePntAmt = pointService.getOrderDecisionPoint(ordDtlNo);
+
+				Point point = new Point();
+				point.setCustNo(custNo);
+				point.setGvPntAmt(savePntAmt);
+				point.setUsPntAmt(0);
+				point.setRmPntAmt(savePntAmt);
+				point.setExpBeDt(getExpBeDt());
+				point.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT.value());
+				point.setOccurDtlDesc("구매확정");
+				point.setPntAmt(savePntAmt);
+				point.setOrdNo(ordNo);
+				point.setOrdDtlNo(ordDtlNo);
+				point.setReviewSq(reviewSq);
+				point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
+				point.setRegNo(regNo);
+				point.setUpdNo(updNo);
+
+				pointService.saveCustomerPoint(point);
+
+				// 주문상세 상태값 변경
+				order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
+				order.setOrdDtlNo(ordDtlNo);
+				orderDao.changedOrdDtlStat(order);
 			}
-
-			// 주문내역 설정
-			orderList.add(tmpOrder);
-
-			// 인덱스 처리
-			index++;
-			ordDtlStatCnt++;
-			rowspan++;
+			
+			result.set("message", message.getMessage("SUCC_0004"));
+			result.set("status", GagaResponseStatus.SUCCESS.getCode());
+		} catch(Exception e) {
+			result.set("message", message.getMessage("FAIL_1003"));
+			result.set("status", GagaResponseStatus.FAIL.getCode());
 		}
 
-		// 마지막 데이터 설정
-		GagaMap map = new GagaMap();
-		map.set("ordNo", ordNo);
-		map.set("ordDt", ordDt);
-		map.set("shotDelvYn", shotDelvYn);
-		map.set("selfGoodsYn", selfGoodsYn);
-		map.set("ordDtlStat", ordDtlStat);
-		map.set("shipCompNm", shipCompNm);
-		map.set("invoiceNo", invoiceNo);
-		map.set("giftPackYn", giftPackYn);
-		map.set("reviewSq", reviewSq);
-		map.set("orderList", setOrderListParameter(orderList, rowspan, ordDtlStatCnt, "Y"));
-		mapList.add(map);
-
-		return mapList; 
+		return result;
 	}
 
 	/**
-	 * 마이페이지 주문내역 데이터 추가
+	 * 구매확정 만료예정일 계산
 	 *
-	 * @param List<Order>
-	 * @return List<Order>
+	 * @result String
 	 * @author card007
-	 * @since 2021. 02. 08
+	 * @since 2021. 02. 17
 	 */
-	private List<Order> setOrderListParameter(List<Order> orderList, int rowspan, int ordDtlStatCnt, String setLastBanner) {
-		// rowspan 설정
-		for (int i = 0;i <= rowspan;i++) {
-			if (i == rowspan) {
-				orderList.get(ordDtlStatCnt - rowspan).setRowspan(rowspan);
-			} else if (rowspan == 1){
-				orderList.get(ordDtlStatCnt - rowspan).setRowspan(1);
-			} else {
-				orderList.get(ordDtlStatCnt - rowspan).setRowspan(0);
-			}
-		}
-		
-		// 주문상세상태값 별 배너 설정
-		if ("Y".equals(setLastBanner)) {
-			orderList.get(orderList.size() - 1).setOrdDtlStatBanner("Y");
-		} else {
-			orderList.get(ordDtlStatCnt - 1).setOrdDtlStatBanner("Y");
-		}
-		
-		return orderList;
+	private String getExpBeDt() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		Calendar cal = Calendar.getInstance();
+		cal.add(Calendar.YEAR, 1);
+		return sdf.format(cal.getTime()) + "235959";
 	}
 
-	/**
-	 * 마이페이지 주문상태 별 주문수량 조회
-	 *
-	 * @param Order
-	 * @return int
-	 * @author card007
-	 * @since 2021. 02. 08
-	 */
-	public int getOrderStatCount(Order order) { return orderDao.getOrderStatCount(order); }
-
-	/**
-	 * 마이페이지 주문변경상태 별 주문수량 조회
-	 *
-	 * @param Order
-	 * @return int
-	 * @author card007
-	 * @since 2021. 02. 08
-	 */
-	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); }
-
 	/**
 	 * 장바구니 쿠폰 적용 상품 리스트 조회
 	 * @param Order

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

@@ -34,6 +34,17 @@ public class TscPointService {
 		pointDao.createCustomerPointHst(point);
 	}
 
+	/**
+	 * 구매확정 포인트 조회
+	 * @param Integer
+	 * @return int
+	 * @author card007
+	 * @since 2021. 02. 17
+	 */
+	public int getOrderDecisionPoint(Integer ordDtlNo) {
+		return pointDao.getOrderDecisionPoint(ordDtlNo);
+	}
+
 
 
 }

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -455,31 +455,34 @@ public class TscConstants {
 //		}
 //	}
 //
-//	// 포인트발생구분
-//	public enum PointOccurGb {
-//		USE_POINT("10"),				// 포인트사용
-//		USE_POINT_CANCEL("11"),			// 포인트사용취소
-//		EXPECT_POINT("12"),				// 예정포인트적립
-//		EXPECT_POINT_CANCEL("13"),		// 예정포인트적립취소
-//		REVIEW_POINT("20"),				// 상품평포인트승인
-//		REVIEW_POINT_CANCEL("21"),		// 상품평포인트승인취소
-//		EVENT_POINT("30"),				// 온라인이벤트
-//		JOIN_POINT("31"),				// 회원가입축하
-//		BIRTH_POINT("32"),				// 생일축하
-//		ETC_POINT("90"),				// 기타
-//		EXPIRE_POINT("99");				// 소멸포인트
-//
-//		private String value;
-//
-//		private PointOccurGb(String value) {
-//			this.value = value;
-//		}
-//
-//		public String value() {
-//			return value;
-//		}
-//	}
-//
+	// 포인트발생구분
+	public enum PointOccurGb {
+		USE_POINT("G069_10"),				// 포인트사용
+		USE_POINT_CANCEL("G069_11"),		// 포인트사용취소
+		EXPECT_POINT("G069_12"),			// 예정포인트적립
+		EXPECT_POINT_CANCEL("G069_13"),		// 예정포인트적립취소
+		REVIEW_POINT("G069_20"),			// 상품평포인트승인
+		REVIEW_POINT_CANCEL("G069_21"),		// 상품평포인트승인취소
+		EVENT_POINT("G069_30"),				// 온라인이벤트
+		JOIN_POINT("G069_31"),				// 회원가입축하
+		BIRTH_POINT("G069_32"),				// 생일축하
+		REVISIT("G069_33"),					// 재방문
+		FAMILY_SALE("G069_34"),				// 패밀리세일
+		APP_DOWNLOAD("G069_35"),			// APP다운로드
+		ETC_POINT("G069_90"),				// 기타
+		EXPIRE_POINT("G069_99");			// 소멸포인트
+
+		private String value;
+
+		private PointOccurGb(String value) {
+			this.value = value;
+		}
+
+		public String value() {
+			return value;
+		}
+	}
+
 	// 포인트발생상태
 	public enum PntUploadStat {
 		APPLY_EXPECT("G070_10"),				// 반영예정

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

@@ -484,4 +484,5 @@ public class Order extends TscBaseDomain {
 	private String vaDeadlineYmd;
 	private String vaDeadlineHms;
 	private int totalDcAmt;
+	private int custPntSq;
 }

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

@@ -2029,277 +2029,40 @@
 		AND    CCP.AVAIL_STDT <![CDATA[<]]> CURRENT_TIMESTAMP 
 		AND    CCP.AVAIL_EDDT > CURRENT_TIMESTAMP
 	</select>
-
-	<!-- 마이페이지 주문 목록 조회 -->
-	<select id="getOrderListForMypage" parameterType="Order" resultType="Order">
-		/* TscOrder.getOrderListForMypage */
-		SELECT O.ORD_NO
-			 , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
-			 , CASE OD.GIFT_PACK_YN WHEN 'Y' THEN DATE_FORMAT(O.ORD_DT + INTERVAL 3 DAY, '%Y.%m.%d')
-				END															AS GIFT_LIMIT_DT
-			 , CASE OD.GIFT_PACK_YN WHEN 'Y' THEN TIMESTAMPDIFF(DAY, NOW(), O.ORD_DT + INTERVAL 3 DAY)
-				END															AS GIFT_LIMIT_DAY
-			 , CASE OD.GIFT_PACK_YN WHEN 'Y' THEN DATE_FORMAT(DA.UPD_DT, '%Y.%m.%d')
-				END															AS GIFT_COMPLETE_DT
-			 , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')							AS DELV_EDDT
-			 , OD.ORD_DTL_NO
-			 , OD.ORD_EXCH_GB
-			 , OD.GOODS_CD
-			 , G.GOODS_NM
-			 , ODI.OPT_CD
-			 , ODI.OPT_CD1
-			 , ODI.OPT_CD2
-		     , GI.SYS_IMG_NM
-			 , OD.ORD_DTL_STAT
-			 , OD.ORD_QTY
-			 , OD.ORD_AMT
-			 , OD.SAVE_PNT_AMT
-			 , OD.SHIP_COMP_CD
-		     , OD.GIFT_PACK_YN
-			 , (SELECT SHIP_COMP_NM
-				  FROM TB_SHIP_COMPANY Z
-				 WHERE Z.SHIP_COMP_CD = OD.SHIP_COMP_CD)					AS SHIP_COMP_NM
-			 , OD.INVOICE_NO
-			 , OD.SUPPLY_COMP_CD
-			 , OD.DELV_FEE_CD
-			 , OD.SHOT_DELV_YN
-			 , G.SELF_GOODS_YN
-			 , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)						AS BRAND_NM
-			 , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)						AS ORD_DTL_STAT_NM
-			 , R.REVIEW_SQ
-			 , TIMESTAMPDIFF(DAY, NOW(), OD.DELV_EDDT + INTERVAL 2 WEEK)	AS PURCHASE_CONFIRM_DAY
-			 , DA.RECIP_NM
-			 , DA.RECIP_TELNO
-			 , DA.RECIP_PHNNO
-			 , DA.RECIP_ZIPCODE
-			 , DA.RECIP_BASE_ADDR
-			 , DA.RECIP_DTL_ADDR
-		  FROM TB_ORDER O
-		 INNER JOIN TB_ORDER_DETAIL OD
-		    ON O.ORD_NO = OD.ORD_NO
-		   AND OD.ORD_DTL_STAT NOT IN ('G013_11', 'G013_25', 'G013_97')
-		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		    ON OD.ORD_NO = ODI.ORD_NO
-		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		 INNER JOIN TB_GOODS G
-		    ON OD.GOODS_CD = G.GOODS_CD
-		 INNER JOIN TB_BRAND B
-		    ON B.BRAND_CD = G.BRAND_CD
-		  LEFT OUTER JOIN TB_REVIEW R
-		    ON R.ORD_NO = OD.ORD_NO
-		   AND R.ORD_DTL_NO = OD.ORD_DTL_NO
-		  LEFT OUTER JOIN TB_DELIVERY_ADDR DA
-		    ON DA.DELV_ADDR_SQ = OD.DELV_ADDR_SQ
-		  LEFT OUTER JOIN TB_GOODS_IMG GI
-		    ON OD.GOODS_CD = GI.GOODS_CD
-		   AND ODI.OPT_CD1 = GI.COLOR_CD
-		   AND GI.DEFAULT_IMG_YN = 'Y'
-		<where>
-			<choose>
-				<when test='custNo != null and custNo != ""'>
-		   AND O.CUST_NO = #{custNo}
-				</when>
-				<otherwise>
-		   AND O.ORD_NO = #{ordNo}
-		   AND O.ORD_NM = #{orderNm}
-				</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')
-			</when>
-			<otherwise>
-		   AND O.ORD_DT >= DATE_FORMAT(LAST_DAY(NOW() - INTERVAL 3 MONTH) + INTERVAL 1 DAY, '%Y-%m-%d')
-			</otherwise>
-		</choose>
-		 ORDER BY OD.SUPPLY_COMP_CD
-				, OD.DELV_FEE_CD
-				, OD.ORD_NO DESC
-				, G.SELF_GOODS_YN DESC
-				, OD.SHOT_DELV_YN DESC
-				, OD.ORD_DTL_STAT
-	</select>
 	
-	<!-- 마이페이지 주문상태 별 주문수량 조회 -->
-	<select id="getOrderStatCount" parameterType="Order" resultType="int">
-		/* TscOrder.getOrderStatCount */
-		SELECT COUNT(*) CNT
+	<!-- 구매확정 포인트 지급 -->
+	<insert id="createOrderDecisionPoint" parameterType="Order">
+		/* TscOrder.createOrderDecisionPoint */
+		INSERT INTO TB_CUST_POINT (
+			CUST_NO
+		  , GV_PNT_AMT
+		  , US_PNT_AMT
+		  , RM_PNT_AMT
+		  , EXP_BE_DT
+		  , EXP_CMP_DT
+		  , REG_NO
+		  , REG_DT
+		  , UPD_NO
+		  , UPD_DT
+		)
+		SELECT O.CUST_NO
+		     , OD.SAVE_PNT_AMT
+		     , 0
+		     , OD.SAVE_PNT_AMT
+		     , DATE_FORMAT(CONCAT(DATE_ADD(CURRENT_DATE, INTERVAL 1 YEAR), ' 23:59:59'), '%Y-%m-%d %H:%i:%S')
+		     , NULL
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON O.ORD_NO = OD.ORD_NO
-		<where>
-			<choose>
-				<when test='custNo != null and custNo != ""'>
-		   AND O.CUST_NO  =  #{custNo}
-				</when>
-				<otherwise>
-		   AND O.ORD_NO = #{ordNo}
-		   AND O.ORD_NM = #{orderNm}
-				</otherwise>
-			</choose>
-		</where>
-		   AND OD.ORD_DTL_STAT = #{ordDtlStat}
-		<if test="ordDtlStat == 'G013_60'">
-		   AND O.ORD_DT >= DATE_FORMAT(CURRENT_DATE - INTERVAL 1 WEEK, '%Y-%m-%d')
-		</if>
-	</select>
-
-	<!-- 마이페이지 주문변경상태 별 주문수량 조회 -->
-	<select id="getOrderChangeStatCount" parameterType="Order" resultType="int">
-		/* TscOrder.getOrderChangeStatCount */
-		SELECT COUNT(*) CNT
-		  FROM TB_ORDER_CHANGE_DETAIL OCD
-		 INNER JOIN TB_ORDER_DETAIL OD
-		    ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		 INNER JOIN TB_ORDER O
-		    ON O.ORD_NO = OD.ORD_NO
-		<where>
-			<choose>
-				<when test='custNo != null and custNo != ""'>
-					AND O.CUST_NO  =  #{custNo}
-				</when>
-				<otherwise>
-					AND O.ORD_NO = #{ordNo}
-					AND O.ORD_NM = #{orderNm}
-				</otherwise>
-			</choose>
-		</where>
-		<choose>
-			<when test="chgStat == 'G685_30'">
-		   AND OCD.CHG_STAT IN (#{chgStat}, 'G685_33')
-			</when>
-			<otherwise>
-		   AND OCD.CHG_STAT = #{chgStat}
-			</otherwise>
-		</choose>
-	</select>
-	
-	<!-- 마이페이지 주문목록 페이징 처리 주문번호 조회 -->
-	<select id="getPagingOrdNoList" parameterType="Order" resultType="Order">
-		/* TscOrder.getPagingOrdNoList */
-		<include refid="selectForPagingHeader"/>
-		SELECT ORD_NO
-			 , RANK() OVER(ORDER BY ORD_DT DESC) AS NUMB
-		  FROM TB_ORDER
-		 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>
+		 WHERE OD.ORD_DTL_NO IN
+		<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+	</insert>
 </mapper>
 
 

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

@@ -80,5 +80,12 @@
 		)
 	</insert>
 
+	<!-- 구매확정 포인트 조회 -->
+	<select id="getOrderDecisionPoint" parameterType="Integer" resultType="int">
+		/* TscOrder.createOrderDecisionPoint */
+		SELECT SAVE_PNT_AMT
+		  FROM TB_ORDER_DETAIL
+		 WHERE ORD_DTL_NO = #{ordDtlNo}
+	</select>
 
 </mapper>