07.20

src/main/java/com/style24/front/biz/service/TsfDeliveryService.java

@@ -61,6 +61,7 @@ public class TsfDeliveryService {
 		if(6 == sweetTracker.getLevel()) {
 			// 주문상세번호 조회 
 			Collection<SweetTracker> list = deliveryDao.getOrdDtlNoList(sweetTracker);
+			String selfYn = "N";
 			for(SweetTracker data : list) {
 				// 주문상태값 변경
 				data.setUpdNo(userNo);
@@ -72,9 +73,27 @@ public class TsfDeliveryService {
 				order.setOrdDtlNo(data.getOrdDtlNo());
 				order.setUpdNo(userNo);
 				order.setRegNo(userNo);
-				orderDao.createOrderDetailHst(order);				
+				orderDao.createOrderDetailHst(order);
+				selfYn = "Y";
 			}
-			
+			if("Y".equals(selfYn)) {
+				try {
+					// 배송완료(상품평등록안내)알림톡
+					SweetTracker info = deliveryDao.getOrdNoInfo(sweetTracker);
+					if(MallGb.SELFMALL.value().equals(info.getMallGb())) {
+						Order order = new Order();
+						order.setOrdNo(info.getOrdNo());
+						order.setCustNo(info.getCustNo());
+						order.setOrdNm(info.getOrdNm());
+						order.setOrdPhnno(info.getOrdPhnno());
+						
+						kakaotalkService.sendDeliveryComplete(order, 99999);
+					}
+				}catch(Exception e) {
+					log.debug("배송완료 알림톡 Exception invoice: "+sweetTracker.getInvoice_no());
+				}
+			}
+
 			// 주문변경번호 조회 
 			
 			Collection<SweetTracker> chgList = deliveryDao.getOrdChgSqList(sweetTracker);
@@ -98,23 +117,6 @@ public class TsfDeliveryService {
 					orderChangeDao.createOrderChangeDetailHst(ordChg);
 				}
 			}
-			
-			try {
-				// 알림톡
-				SweetTracker info = deliveryDao.getOrdNoInfo(sweetTracker);
-				if(MallGb.SELFMALL.value().equals(info.getMallGb())) {
-					Order order = new Order();
-					order.setOrdNo(info.getOrdNo());
-					order.setCustNo(info.getCustNo());
-					order.setOrdNm(info.getOrdNm());
-					order.setOrdPhnno(info.getOrdPhnno());
-					
-					kakaotalkService.sendDeliveryComplete(order, 99999);
-				}
-			}catch(Exception e) {
-				
-			}
-			
 		}
 		
 		// 	TB_SWEET_TRACKER 등록