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

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

@@ -761,5 +761,14 @@ public interface TscOrderDao {
 	 * @since 2021. 02. 08
 	 */
 	Order getOrderStatCount(Order order);
+	
+	/**
+	 * 장바구니 구분의 선물하기 여부 판단
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 04. 13
+	 */
+	int getGiftOrderCheck(Order order);
 
 }

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

@@ -1849,6 +1849,17 @@ public class TscOrderService {
 	 * @since 2021. 02. 08
 	 */
 	public Order getOrderStatCount(Order order) { return orderDao.getOrderStatCount(order); }
+	
+	/**
+	 * 장바구니 구분의 선물하기 여부 판단
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 04. 13
+	 */
+	public int getGiftOrderCheck(Order order) {
+		return orderDao.getGiftOrderCheck(order);
+	}
 
 }
 

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

@@ -640,4 +640,6 @@ public class Order extends TscBaseDomain {
 		return this.sexGb;
 	}
 	
+	private String orderGiftYn;			// 선물여부
+	
 }

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

@@ -3503,7 +3503,7 @@
 
 	<!-- 마이페이지 주문 상태 별 수량 조회 -->
 	<select id="getOrderStatCount" parameterType="Order" resultType="Order">
-		/* TsfOrder.getOrderStatCount */
+		/* TscOrder.getOrderStatCount */
 		SELECT IFNULL(SUM(Z.ORDER_RECEIPT), 0)                          AS ORDER_RECEIPT_COUNT
 		     , IFNULL(SUM(Z.DEPOSIT_WAITING), 0)                        AS DEPOSIT_WAITING_COUNT
 		     , IFNULL(SUM(Z.WAITING_ADD_PAYMENT), 0)                    AS WAITING_ADD_PAYMENT_COUNT
@@ -3561,6 +3561,19 @@
 		) AS Z
 	</select>
 	
+	<!-- 장바구니 구분의 선물하기 여부 판단 -->
+	<select id="getGiftOrderCheck" parameterType="Order" resultType="int">
+		/* TscOrder.getGiftOrderCheck */
+		SELECT COUNT(1) CNT
+		FROM   TB_CART CA
+		WHERE  1=1
+		AND    CA.CART_SQ IN
+		<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
+		       #{item}
+		</foreach>
+		AND    CA.CART_GB = 'G026_GF'	
+	</select>
+	
 </mapper>