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

# Conflicts:
#	src/main/java/com/style24/core/biz/dao/TscOrderDao.java
#	src/main/java/com/style24/core/biz/service/TscOrderService.java
#	src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

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

@@ -920,6 +920,15 @@ public interface TscOrderDao {
 	 * @since 2021. 06. 17
 	 */
 	Collection<Order> getSweetTrackerDeliveryInfo(Order order);
+	
+	/**
+	 * 선물받기 옵션변경
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 06. 18
+	 */
+	void updateOrderDetailItemOpt2(Order order);
 
 	/**
 	 * 추가배송비 결제금액 환불배송비 수정 처리

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

@@ -619,6 +619,7 @@ public class TscKakaotalkService {
 			custContactHst.setReceiverNo(order.getCustNo());
 			custContactHst.setSenderNo(senderNo);
 			custContactHst.setRegNo(senderNo);
+			custContactHst.setContactMemo(String.valueOf(order.getOrdNo()));
 			coreCustomerService.createCustomerContactHistory(custContactHst);
 		} catch (Exception e) {
 			log.error("error", e);
@@ -665,6 +666,7 @@ public class TscKakaotalkService {
 			custContactHst.setContactContents("주문-무통장입금안내");
 			custContactHst.setSenderNo(senderNo);
 			custContactHst.setCustNo(order.getCustNo());
+			custContactHst.setContactMemo(String.valueOf(order.getOrdNo()));
 			coreCustomerService.createCustomerContactHistory(custContactHst);
 		} catch (Exception e) {
 			log.error("error", e);

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

@@ -1848,27 +1848,6 @@ public class TscOrderService {
 
 		// 5. PAYMENT 수정
 		orderDao.updatePaymentStat(order);
-		
-		
-		// TODO 2021.06.03 알림톡발송 입금통보
-		GagaMap resultMap = getOrderCompleteInfo(order);
-		Order orderInfo = (Order) resultMap.get("orderInfo");
-		
-		
-		// 2021.05.31 알림톡전송 주문완료정보		
-		if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
-			Integer userNo = orderInfo.getCustNo();
-			try {
-				orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
-				orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
-				kakaotalkService.sendDepositComplete(orderInfo, userNo);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
-		
 	}
 	
 	/**
@@ -2860,8 +2839,6 @@ public class TscOrderService {
 	public Collection<Order> getSweetTrackerDeliveryInfo(Order order) {
 		return orderDao.getSweetTrackerDeliveryInfo(order);
 	}
-	
-	
 
 	/**
 	 * 배송비 테이블 결제시퀀스 등록
@@ -2874,6 +2851,22 @@ public class TscOrderService {
 	public void updateDeliveryFeePaySq(Payment payment) {
 		orderDao.updateDeliveryFeePaySq(payment);
 	}
+	
+	/**
+	 * 선물받기 옵션변경
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 06. 18
+	 */
+	@Transactional("shopTxnManager")
+	public void updateOrderDetailItemOpt2(Order order) {
+		
+		// 1. 추가결제 반품,교환 상태값 업데이트
+		orderDao.updateOrderDetailItemOpt2(order);
+	}
+	
+	
 
 	/**
 	 * 추가배송비 결제금액 환불배송비 수정 처리

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

@@ -3931,6 +3931,7 @@
 		     , GROUP_CONCAT(Z.ITEM_QTY   ORDER BY Z.ORD_DTL_ITEM_SQ)                    AS ITEM_QTYR
 		     , GROUP_CONCAT(Z.COLOR_NM   ORDER BY Z.ORD_DTL_ITEM_SQ)                    AS COLOR_NM
 		     , Z.BRAND_GROUP_NM
+		     , Z.GOODS_TYPE
 		FROM (
 		    SELECT OD.ORD_NO
 		         , OD.ORD_DTL_NO
@@ -3951,6 +3952,7 @@
 		         , OD.GIFT_PACK_YN
 		         , OD.GIFT_ADDR_INP_YN
 		         , (CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM ELSE BG.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
+		         , G.GOODS_TYPE
 		    FROM   TB_ORDER_DETAIL OD
 		    INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
 		    ON     OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -3976,6 +3978,7 @@
 		     , Z.GIFT_PACK_YN
 		     , Z.GIFT_ADDR_INP_YN
 		     , Z.BRAND_GROUP_NM
+		     , Z.GOODS_TYPE
 	</select>
 	
 	<!-- 선물주문배송신청완료 -->
@@ -4379,6 +4382,16 @@
 		 ORDER BY DELV_LEVEL DESC
 	</select>
 	
+	<!-- 2021.06.18 선물받기 옵션변경 -->
+	<update id="updateOrderDetailItemOpt2" parameterType="Order">
+		UPDATE TB_ORDER_DETAIL_ITEM
+		SET    OPT_CD2 = #{optCd2}
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
+		WHERE  1=1
+		AND    ORD_DTL_NO = #{ordDtlNo}
+		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
+		
 	<!-- 추가배송비 결제금액 환불배송비 수정 처리 -->
 	<update id="updateRefundDeliveryFee" parameterType="payment">
 		/* TscOrder.updateRefundDeliveryFee */