소스 검색

Merge branch 'develop' into card007

card007 4 년 전
부모
커밋
ffb47f63c3

+ 30 - 6
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -21,6 +21,7 @@ import com.style24.core.biz.dao.TscNaverPayDao;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.dao.TscOrderDao;
 import com.style24.core.biz.dao.TscScmDao;
+import com.style24.core.biz.thirdparty.SsgKakaoSender;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.env.TscConstants.OrderDetailStat;
 import com.style24.core.support.message.TscMessageByLocale;
@@ -29,6 +30,7 @@ import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.Payment;
 import com.style24.persistence.domain.Point;
+import com.style24.persistence.domain.SsgDirectMessage;
 import com.usafe.guarantee.InsuranceManager;
 
 import lombok.extern.slf4j.Slf4j;
@@ -78,6 +80,11 @@ public class TscOrderService {
 	
 	@Autowired
 	private TscOrderRefundService orderRefundService;
+	
+	private static final String siteNm = "STYLE24";
+	
+	@Autowired
+	private SsgKakaoSender kakaoSender;
 
 	/**
 	 * 주문목록 카운트
@@ -1424,12 +1431,12 @@ public class TscOrderService {
 	public GagaMap decideOrder(Order order) {
 		GagaMap result = new GagaMap();
 
-		Integer custNo = order.getCustNo();
-		Integer ordNo = order.getOrdNo();
-		Integer reviewSq = order.getReviewSq();
-		Integer regNo = order.getRegNo();
-		Integer updNo = order.getUpdNo();
-		int gvPointAmt = 0;
+		Integer custNo 		= order.getCustNo();
+		Integer ordNo 		= order.getOrdNo();
+		Integer reviewSq 	= order.getReviewSq();
+		Integer regNo 		= order.getRegNo();
+		Integer updNo 		= order.getUpdNo();
+		int gvPointAmt 		= 0;
 		
 		try {
 			for (Integer ordDtlNo : order.getOrdDtlNoArr()) {
@@ -1457,6 +1464,23 @@ public class TscOrderService {
 		} catch(Exception e) {
 			throw new IllegalStateException(message.getMessage("FAIL_1003"));
 		}
+		
+		// 2021.09.08 구매확정시 상품평쓰기 알림톡 전송
+		try {
+			GagaMap replaceInfo = new GagaMap();
+			replaceInfo.setString("siteNm", siteNm);
+			replaceInfo.setString("custNm", order.getOrdNm());
+			replaceInfo.setString("ordNo", String.valueOf(order.getOrdNo()));
+			
+			SsgDirectMessage dm = new SsgDirectMessage();
+			dm.setFuserid(String.valueOf(order.getOrdPhnno())); // 발송자NO
+			dm.setFdestine(order.getOrdPhnno());
+			dm.setFkkoresendtype("LMS");
+			
+			kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.REVIEW_WRITE.value(), dm, replaceInfo);
+		} catch (Exception e) {
+			
+		}
 
 		return result;
 	}

+ 5 - 1
src/main/java/com/style24/core/biz/service/TscShoplinkerService.java

@@ -559,7 +559,11 @@ public class TscShoplinkerService {
 					apiHstMap.setOrdDtlNo(info.getOrdDtlNo());
 					apiHstMap.setApiResult(resultMsg.getResult());
 					apiHstMap.setApiMessage(resultMsg.getMessage());
-
+					
+					if(-1 < resultMsg.getMessage().indexOf("could not open XML") ) {
+						apiHstMap.setApiResult("error");
+					}
+					
 				} catch (Exception e) {
 					log.error("createShoplinkerInvoiceXml error", e);
 					apiHstMap.setApiType("INVOICE");