# WARNING: head commit changed in the meantime

주문서작업중

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

@@ -422,4 +422,13 @@ public interface TscOrderDao {
 	 * @since 2021. 02. 02
 	 */	
 	int getDailyDeliveryZoneInfo(Order order);
+
+	/**
+	 * 마이페이지 주문 정보 조회
+	 *
+	 * @param Order
+	 * @author card007
+	 * @since 2021. 02. 04
+	 */
+	Collection<Order> getOrderListForMypage(Order order);
 }

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

@@ -700,4 +700,13 @@ public class TscOrderService {
 		return delvOrder;
 	}
 
+	/**
+	 * 마이페이지 주문 정보 조회
+	 * 
+	 * @param Order
+	 * @author card007
+	 * @since 2021. 02. 04
+	 */
+	public Collection<Order> getOrderListForMypage(Order order) { return orderDao.getOrderListForMypage(order); }
+
 }

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

@@ -548,11 +548,26 @@ public class TscConstants {
 //	}
 //
 	// 상품 타입
-	public enum GOODS_TYPE {
+	public enum GoodsType {
 		NORMAL("G056_N"), DEAL("G056_D"), SET("G056_S");
 
 		private String value;
-		private GOODS_TYPE(String value) {
+		private GoodsType(String value) {
+			this.value = value;
+		}
+
+		public String value() {
+			return value;
+		}
+	}
+
+	// 할인 적용 구분
+	public enum ApplyGb {
+		QTY("G810_10"),				// 수량
+		AMT("G810_20");				// 금액
+
+		private String value;
+		private ApplyGb(String value) {
 			this.value = value;
 		}
 

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

@@ -1,7 +1,7 @@
 package com.style24.persistence.domain;
 
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
@@ -399,4 +399,24 @@ public class Order extends TscBaseDomain {
 	Collection<Order> wmsCartList;
 	Collection<Order> resCartList;
 	Collection<Order> delvCartList;
+
+	// 장바구니
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private int[] cartSqArr;		// 장바구니 일련번호 배열
+	private int cartSq;				// 장바구니 일련번호
+	private int pcCurrPrice;		// PC 즉시할인 적용가
+	private String jsessionId;		// SessionId
+	private List<Integer> applyMoreBetterAmtList;	// 다다익선 금액 적용상품 리스트
+	private List<Integer> applyMoreBetterQtyList;	// 다다익선 수량 적용상품 리스트
+
+	// 다다익선
+	private String applyGb;							// 다다익선 할인 기준
+	private String applyQtySectionYn;				// 다다익선 적용 여부
+	private String applyAmtSectionYn;				// 다다익선 적용 여부
+	private int applyAmtSectionVal;					// 적용 조건
+	private int applyQtySectionVal;					// 적용 조건
+	private int sectionVal;							// 다다익선 조건
+	private int tmtbSumQty;							// 장바구니 수량 다다익선 총계
+	private int tmtbSumAmt;							// 장바구니 금액 다다익선 총계
+
 }

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

@@ -1617,9 +1617,9 @@
 				 , G.LIST_PRICE
 				 , G.CURR_PRICE
 				 , G.GOODS_GB
+			     , G.GOODS_STAT
 				 , G.PRE_PPNT_USABLE_YN
 				 , G.PRE_MPNT_USABLE_YN
-				 , G.MIN_ORD_AMT
 				 , G.MAX_ORD_QTY
 				 , G.DAY_MAX_ORD_QTY
 				 , G.GIFT_PACK_YN
@@ -1649,7 +1649,6 @@
 			  LEFT OUTER JOIN TB_GOODS_RES_SELL GRS
 				ON CA.GOODS_CD = GRS.GOODS_CD
 			 WHERE 1 = 1
-			   AND G.GOODS_STAT = 'G008_90'
 			<if test="custNo == 0">
 			   AND CA.CUST_NO = 0
 			   AND CA.JSESSION_ID = #{jsessionId}
@@ -1657,12 +1656,18 @@
 			<if test="custNo != 0">
 			   AND CA.CUST_NO = #{custNo}
 			</if>
-			<if test="cartSqArr != null and cartSqArr ==''">
+			<choose>
+				<when test="cartSqArr != null and cartSqArr.length > 0">
+			   AND G.GOODS_STAT = 'G008_90'
 			   AND CA.CART_SQ IN
-				<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
-					#{item}
-				</foreach>
-			</if>
+					<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
+						#{item}
+					</foreach>
+				</when>
+				<otherwise>
+			   AND G.GOODS_STAT IN ('G008_90', 'G008_70')
+				</otherwise>
+			</choose>
 		) Z
 		 ORDER BY Z.SUPPLY_COMP_CD
 				, Z.DELV_FEE_CD
@@ -1713,7 +1718,7 @@
 	<!-- 상품권정보 조회 -->
 	<select id="getGiftcardInfo" parameterType="Order" resultType="int">
 		/* TsfOrder.getGiftcardInfo */
-		SELECT IFNULL(SUM(CG.RM_GFCD_AMT)) AS RM_GFCD_AMT
+		SELECT IFNULL(SUM(CG.RM_GFCD_AMT), 0) AS RM_GFCD_AMT
 		  FROM TB_CUST_GIFTCARD CG
 		 WHERE 1=1
 		   AND CG.CUST_NO = #{custNo}
@@ -1771,7 +1776,7 @@
 		     , CP.MAX_DC_AMT
 		     , CP.BUY_LIMIT_AMT 
 		     , CASE WHEN CP.DC_WAY = 'G240_11' 
-		            THEN (((Z.CURR_PRCE + Z.ADD_PRICE) * Z.GOODS_QTY) * CP.DC_PVAL) / 100 
+		            THEN (((Z.CURR_PRICE + Z.ADD_PRICE) * Z.GOODS_QTY) * CP.DC_PVAL) / 100
 		            ELSE CP.DC_PVAL * Z.GOODS_QTY
 		            END  PC_CURR_PRICE
 		FROM   TB_COUPON CP
@@ -2098,8 +2103,8 @@
 	</select>
 	
 	<!-- 사은품 : 2차조건 적용된 사은품상품금액 구간정보조회 -->
-	<select id="getFreeGiftGoodsApplyAmt" parameterType="Order" resultType="Order">
-		/* TsfOrder.getFreeGiftGoodsApplyAmt */
+	<select id="getFreeGiftGoodsApplyAmt2" parameterType="Order" resultType="Order">
+		/* TsfOrder.getFreeGiftGoodsApplyAmt2 */
 		SELECT FGS.FREEGIFT_SECTION_SQ
 		     , FGS.FREEGIFT_SQ
 		     , FGS.SECTION_GB
@@ -2116,8 +2121,8 @@
 	</select>
 	
 	<!-- 사은품 : 3차조건 적용된 구간정보의 사은품정보조회 -->
-	<select id="getFreeGiftGoodsApplyAmt" parameterType="Order" resultType="Order">
-		/* TsfOrder.getFreeGiftGoodsApplyAmt */
+	<select id="getFreeGiftGoodsApplyAmt3" parameterType="Order" resultType="Order">
+		/* TsfOrder.getFreeGiftGoodsApplyAmt3 */
 		SELECT FGV.FREEGIFT_SECTION_SQ 
 		     , FGV.FREEGIFT_SQ 
 		     , FGV.USE_POINT
@@ -2134,6 +2139,35 @@
 		</if>
 	</select>
 
+	<!-- 마이페이지 주문 목록 조회 -->
+	<select id="getOrderListForMypage" parameterType="Order" resultType="Order">
+		SELECT O.ORD_NO
+			 , OD.ORD_DTL_NO
+			 , OD.ORD_EXCH_GB
+			 , OD.GOODS_CD
+			 , ODI.OPT_CD
+			 , ODI.OPT_CD1
+			 , ODI.OPT_CD2
+			 , OD.ORD_DTL_STAT
+			 , OD.ORD_QTY
+			 , OD.ORD_AMT
+			 , OD.SAVE_PNT_AMT
+			 , OD.SHIP_COMP_CD
+			 , OD.INVOICE_NO
+			 , OD.SUPPLY_COMP_CD
+			 , OD.DELV_FEE_CD
+		  FROM TB_ORDER O
+		 INNER JOIN TB_ORDER_DETAIL OD
+		    ON O.ORD_NO = OD.ORD_NO
+		   AND OD.ORD_DTL_STAT <![CDATA[<>]]> '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
+		 WHERE O.CUST_NO = #{custNo}
+		 ORDER BY OD.SUPPLY_COMP_CD
+				, OD.DELV_FEE_CD
+				, OD.ORD_NO DESC
+	</select>
 </mapper>