tsit14 5 лет назад
Родитель
Сommit
cdeb4d11b8

+ 45 - 43
src/main/java/com/style24/core/biz/service/TscKakaotalkService.java

@@ -555,8 +555,8 @@ public class TscKakaotalkService {
 		try {
 			// 고객접촉이력 정보
 			CustContactHst custContactHst = new CustContactHst();
-			custContactHst.setContactType(TscConstants.ContactType.ORDER_INFO.value()); 		// 접촉유형:임시비밀번호발급(공통코드G054)
-			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); 		// 접촉방법:알림톡+문자(공통코드G055)
+			custContactHst.setContactType(TscConstants.ContactType.ORDER_INFO.value());
+			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value());
 			custContactHst.setContactContents("주문안내");
 			custContactHst.setReceiverNo(order.getCustNo());
 			custContactHst.setSenderNo(senderNo);
@@ -568,6 +568,49 @@ public class TscKakaotalkService {
 		}
 	}
 	
+	/**
+	 * 무통장입금 확인 알림톡
+	 * @param order - 주문정보
+	 * @return void
+	 * @throws Exception - exception
+	 * @author jsh77b
+	 * @since 2021. 06. 03
+	 */
+	@Transactional("shopTxnManager")
+	public void sendDepositComplete(Order order, Integer senderNo) throws Exception {
+		SsgDirectMessage dm = new SsgDirectMessage();
+		dm.setFdestine(order.getOrdPhnno());
+		dm.setFkkoresendtype("LMS");
+
+		DecimalFormat dc = new DecimalFormat("###,###,###,###");
+		String payAmt = dc.format(order.getPayAmt());
+
+		GagaMap replaceInfo = new GagaMap();
+		replaceInfo.setString("siteNm"			, siteNm);
+		replaceInfo.setString("custNm"			, order.getOrdNm());
+		replaceInfo.setString("ordDt"			, order.getOrdDt());
+		replaceInfo.setString("payAmt"			, payAmt);
+		replaceInfo.setString("goodsNm"			, order.getGoodsNm());
+		replaceInfo.setString("vaNm"			, order.getVaNm());
+		replaceInfo.setString("vaNo"			, order.getVaNo());
+		
+		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_DEPOSIT_CONFIRM.value(), dm, replaceInfo);
+
+		try {
+			CustContactHst custContactHst = new CustContactHst();
+			// 고객접촉이력 정보
+			custContactHst.setContactType(TscConstants.ContactType.BANK_DEPOSIT_INFO.value());
+			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value());
+			custContactHst.setContactContents("주문-무통장입금안내");
+			custContactHst.setSenderNo(senderNo);
+			custContactHst.setCustNo(order.getCustNo());
+			coreCustomerService.createCustomerContactHistory(custContactHst);
+		} catch (Exception e) {
+			log.error("error", e);
+			// Do nothing
+		}
+	}
+	
 	/**
 	 * 선물받기 배송지입력
 	 * @param order - 주문 정보
@@ -616,47 +659,6 @@ public class TscKakaotalkService {
 		}
 	}
 	
-//	/**
-//	 * 무통장입금 확인 알림톡
-//	 * @param customer - 고객 정보
-//	 * @return void
-//	 * @throws Exception - exception
-//	 * @author yh98kim
-//	 * @since 2020. 4. 9
-//	 */
-//	@Transactional("shopTxnManager")
-//	public void sendDepositComplete(WfoOrder order) throws Exception {
-//		SsgDirectMessage dm = new SsgDirectMessage();
-//		dm.setFdestine(order.getOrderPhnno());
-//		dm.setFkkoresendtype("LMS");
-//
-//		DecimalFormat dc = new DecimalFormat("###,###,###,###");
-//		String payAmt = dc.format(order.getPayAmt());
-//
-//		GagaMap replaceInfo = new GagaMap();
-//		replaceInfo.setString("siteNm", commonService.getSiteName(WfoConstants.SITE_CD));
-//		replaceInfo.setString("custNm", order.getOrderNm());
-//		replaceInfo.setString("ordDt", order.getOrdDt());
-//		replaceInfo.setString("payAmt", payAmt);
-//		replaceInfo.setString("goodsNm", order.getGoodsNm());
-//		replaceInfo.setString("vaBankNm", order.getVaNm());
-//		replaceInfo.setString("vaNo", order.getVaNo());
-//		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.VA_DEPOSIT_CONFIRM.value(), dm, replaceInfo);
-//
-//		try {
-//			WfoCustomer customer = new WfoCustomer();
-//			// 고객접촉이력 정보
-//			customer.setContactType("302"); // 접촉유형:주문안내(공통코드G054)
-//			customer.setContactMethod(WfoConstants.ContactMethod.KAKAOTALK.value()); // 접촉방법:알림톡+문자(공통코드G055)
-//			customer.setContactContents("주문-무통장입금안내");
-//			customer.setReceiverId(order.getCustNo());
-//			customer.setCustNo(order.getCustNo());
-//			customerService.createCustomerContactHistory(customer);
-//		} catch (Exception e) {
-//			log.error("error", e);
-//			// Do nothing
-//		}
-//	}
 //
 //	/**
 //	 * 주문취소안내 알림톡

+ 24 - 1
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -68,6 +68,9 @@ public class TscOrderService {
 
 	@Autowired
 	private ObjectMapper mapper;
+	
+	@Autowired
+	private TscKakaotalkService kakaotalkService;
 
 	/**
 	 * 주문목록 카운트
@@ -1832,6 +1835,27 @@ 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();
+			}
+		}
+		
+		
 	}
 	
 	/**
@@ -1892,7 +1916,6 @@ public class TscOrderService {
 		int goodsDcSumAmt		= 0; // 상품할인금액(정상가 - 판매가)
 		int delvFeeSumAmt 		= 0; // 배송비합계
 		int realDelvSumAmt		= 0; // 실제배송비합계
-		int cpn1DcSumAmt 		= 0; // 즉시할인합계
 		int cpn11DcSumAmt 		= 0; // 즉시할인합계(실결제금액계산용)
 		int tmtbSumAmt 			= 0; // 다다익선합계
 		int cpnDcSumAmt 		= 0; // 쿠폰할인합계