주문서 수정중

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

@@ -503,8 +503,8 @@ public class TscKakaotalkService {
 		dm.setFdestine(order.getOrdPhnno());
 		dm.setFkkoresendtype("LMS");
 
-		dm.setButtonNm("마이페이지 > 주문내역");
-		dm.setButtonUrl("/mypage/order/list/form");
+		dm.setButtonNm("마이페이지 > 주문상세");
+		dm.setButtonUrl("/mypage/order/detail/" + order.getOrdNo());
 
 		DecimalFormat dc = new DecimalFormat("###,###,###,###");
 		String payAmt = dc.format(order.getPayAmt());
@@ -529,34 +529,76 @@ public class TscKakaotalkService {
 				Date deadline = new SimpleDateFormat("yyyyMMdd").parse(order.getVaDeadline().substring(0, 8));
 
 				replaceInfo.setString("ordDt"			, todayDate);
-				replaceInfo.setString("vaBankNm"		, order.getCardNm());
+				replaceInfo.setString("vaNm"			, order.getCardNm());
 				replaceInfo.setString("vaNo"			, order.getVaNo());
-				replaceInfo.setString("deadlineYmd"		, new SimpleDateFormat("yyyy년 MM월 dd일").format(deadline));
+				replaceInfo.setString("vaDeadline"		, new SimpleDateFormat("yyyy년 MM월 dd일").format(deadline));
 				replaceInfo.setString("deadlineH"		, "17");
 				
-				kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_ORDER_COMPLETE.value(), dm, replaceInfo);
+				//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_ORDER_COMPLETE.value(), dm, replaceInfo);
 			} 
 			// 실시간계좌이체
 			else if (TscConstants.PayMeans.ACCOUNT_TRANSFER.value().equals(order.getPayMeans())) {
 				replaceInfo.setString("ordDt"			, todayDate);
-				replaceInfo.setString("vaBankNm"		, order.getCardNm());
+				replaceInfo.setString("vaNm"			, order.getCardNm());
 				
-				kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.AT_ORDER_COMPLETE.value(), dm, replaceInfo);
+				//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.AT_ORDER_COMPLETE.value(), dm, replaceInfo);
 			}
 			// 신용카드, 휴대폰결제
 			else {
-				kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
+				//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
 			}
 		}
-		else if ("KAKAO".equals(order.getPgGb())) {
-			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
+		else  {
+			//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
 		}
-		else if ("NAVER".equals(order.getPgGb())) {
-			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
-		}
-		else if ("PAYCO".equals(order.getPgGb())) {
-			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.ORDER_COMPLETE.value(), dm, replaceInfo);
+		
+		try {
+			// 고객접촉이력 정보
+			CustContactHst custContactHst = new CustContactHst();
+			custContactHst.setContactType(TscConstants.ContactType.ORDER_INFO.value()); 		// 접촉유형:임시비밀번호발급(공통코드G054)
+			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); 		// 접촉방법:알림톡+문자(공통코드G055)
+			custContactHst.setContactContents("주문안내");
+			custContactHst.setReceiverNo(order.getCustNo());
+			custContactHst.setSenderNo(senderNo);
+			custContactHst.setRegNo(senderNo);
+			coreCustomerService.createCustomerContactHistory(custContactHst);
+		} catch (Exception e) {
+			log.error("error", e);
+			// Do nothing
 		}
+	}
+	
+	/**
+	 * 선물받기 배송지입력
+	 * @param order - 주문 정보
+	 * @param senderNo - 발송자번호(고객)
+	 * @author jsh77b
+	 * @since 2021. 6. 2
+	 */
+	@Transactional("shopTxnManager")
+	public void sendOrderGiftComplete(Order order, Integer senderNo) throws Exception {
+		SsgDirectMessage dm = new SsgDirectMessage();
+		dm.setFuserid(String.valueOf(senderNo)); // 발송자NO
+		dm.setFdestine(order.getRecipPhnno());
+		dm.setFkkoresendtype("LMS");
+
+		dm.setButtonNm("선물받기 > 배송지입력");
+		dm.setButtonUrl("/order/giftComplete?ordNo" + order.getOrdNo());
+
+		DecimalFormat dc = new DecimalFormat("###,###,###,###");
+		String payAmt = dc.format(order.getPayAmt());
+
+		GagaMap replaceInfo = new GagaMap();
+		replaceInfo.setString("siteNm"				, siteNm);
+		replaceInfo.setString("ordNm"				, order.getOrdNm());
+		replaceInfo.set("ordNo"						, order.getOrdNo());
+		replaceInfo.setString("goodsNm"				, order.getGoodsNm());
+		replaceInfo.setString("goodsCnt"			, order.getGoodsCnt());
+		
+		Date giftPackCloseDt = new SimpleDateFormat("yyyy-MM-dd").parse(order.getGiftPackCloseDt().substring(0, 10));
+		replaceInfo.setString("giftPackCloseDt"		, new SimpleDateFormat("yyyy년 MM월 dd일").format(giftPackCloseDt));
+		
+		//kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.GIFT_ARRIVED.value(), dm, replaceInfo);
 		
 		try {
 			// 고객접촉이력 정보

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

@@ -1861,6 +1861,9 @@ public class TscOrderService {
 				order.setCustNo(orderInfo.getCustNo());
 				order.setPgGb(orderInfo.getPgGb());
 				order.setCustId(orderInfo.getCustId());
+				
+				order.setGiftPackCloseYn(orderInfo.getGiftPackCloseYn());
+				order.setGiftPackCloseDt(orderInfo.getGiftPackCloseDt());
 			}
 			index++;
 		}
@@ -2071,10 +2074,14 @@ public class TscOrderService {
 		
 		// 3. 주문목록 조회
 		Collection<Order> orderList = getOrderGiftGoodsList(order);
-		String giftAddrInpYn = "N";
+		String giftAddrInpYn 	= "N";
+		String goodsNm 			= "";
+		int goodsCnt			= orderList.size() - 1;
+		
 		for (Order orderDetail : orderList) {
 			if (index == 0) {
-				giftAddrInpYn = orderDetail.getGiftAddrInpYn();
+				giftAddrInpYn 	= orderDetail.getGiftAddrInpYn();
+				goodsNm			= orderDetail.getGoodsNm();
 			}
 			
 			// 1.1 세트상품 옵션별 배열로 담기
@@ -2107,6 +2114,8 @@ public class TscOrderService {
 		resultMap.set("orderListCnt"		, orderList.size());	// 주문목록갯수
 		resultMap.set("giftAddrInpYn"		, giftAddrInpYn);		// 선물받기배송지등록여부
 		resultMap.set("delvRegYn"			, delvRegYn);			// 배송지등록여부
+		resultMap.set("goodsNm"				, goodsNm);				// 상품명
+		resultMap.set("goodsCnt"			, goodsCnt);			// 상품수
 		
 		return resultMap;
 	}

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

@@ -2683,8 +2683,8 @@
 		     , NOW()
 		     , #{custNo}
 		     , #{custNm}
-		     , #{recipPhnno}
-		     , #{recipTelno}
+		     , #{ordPhnno}
+		     , #{ordTelno}
 		     , #{email}
 		     , 'G000_10'
 		     , #{npayOrdNo}
@@ -3867,6 +3867,7 @@
 		     , GROUP_CONCAT(Z.OPT_CD2    ORDER BY Z.ORD_DTL_ITEM_SQ)                    AS OPT_CD2
 		     , 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
 		FROM (
 		    SELECT OD.ORD_NO
 		         , OD.ORD_DTL_NO
@@ -3886,6 +3887,7 @@
 		         , ODI.ORD_DTL_ITEM_SQ
 		         , 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
 		    FROM   TB_ORDER_DETAIL OD
 		    INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
 		    ON     OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -3893,6 +3895,8 @@
 		    ON     OD.GOODS_CD = G.GOODS_CD
 		    INNER  JOIN TB_BRAND BR
 		    ON     G.BRAND_CD = BR.BRAND_CD
+		    INNER  JOIN TB_BRAND_GROUP BG
+		    ON     BR.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		    WHERE  1=1
 		    AND    OD.ORD_NO = #{ordNo}
 		    AND    OD.ORD_QTY > OD.CNCL_RTN_QTY
@@ -3907,6 +3911,7 @@
 		     , Z.CNCL_RTN_QTY
 		     , Z.GIFT_PACK_YN
 		     , Z.GIFT_ADDR_INP_YN
+		     , Z.BRAND_GROUP_NM
 	</select>
 	
 	<!-- 선물주문배송신청완료 -->