|
|
@@ -6,9 +6,14 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import com.style24.core.biz.dao.TscPointDao;
|
|
|
import com.style24.core.support.env.TscConstants;
|
|
|
+import com.style24.core.biz.service.TscKakaotalkService;
|
|
|
+import com.style24.core.biz.dao.TscDeliveryDao;
|
|
|
+
|
|
|
import com.style24.persistence.domain.Order;
|
|
|
import com.style24.persistence.domain.Point;
|
|
|
|
|
|
+import com.style24.core.support.env.TscConstants.MallGb;
|
|
|
+
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
import java.util.Collection;
|
|
|
@@ -33,6 +38,14 @@ public class TscPointService {
|
|
|
@Autowired
|
|
|
private TscOrderService orderService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TscKakaotalkService kakaotalkService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private TscDeliveryDao deliveryDao;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 포인트 적립 / 차감
|
|
|
* @param point - 포인트 정보
|
|
|
@@ -115,6 +128,26 @@ public class TscPointService {
|
|
|
// 3.구매확정 포인트 히스토리 수정
|
|
|
pointDao.updateOrderDecisionPointHst(point);
|
|
|
|
|
|
+ // 3-1 알림톡 추가 (배송완료(상품평등록안내)알림톡) 2021-09-08 박중재팀장님 요청!!
|
|
|
+ try {
|
|
|
+ // 배송완료(상품평등록안내)알림톡
|
|
|
+ Order sweetTracker = new Order();
|
|
|
+ sweetTracker.setOrdDtlNo(point.getOrdDtlNo());
|
|
|
+ Order info = deliveryDao.getOrdNoInfoKakao(sweetTracker);
|
|
|
+ if("Y".equals(info.getAllYn())) {
|
|
|
+ if(MallGb.SELFMALL.value().equals(info.getMallGb()) && "O".equals(info.getOrdExchGb())) {
|
|
|
+ Order orderSend = new Order();
|
|
|
+ orderSend.setOrdNo(info.getOrdNo());
|
|
|
+ orderSend.setCustNo(info.getCustNo());
|
|
|
+ orderSend.setOrdNm(info.getOrdNm());
|
|
|
+ orderSend.setOrdPhnno(info.getOrdPhnno());
|
|
|
+ kakaotalkService.sendDeliveryComplete(orderSend, point.getRegNo());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }catch(Exception e) {
|
|
|
+ log.debug("배송완료 알림톡 Exception ordDtlNo: "+point.getOrdDtlNo()+" "+e.getStackTrace());
|
|
|
+ }
|
|
|
+
|
|
|
// 4.주문상세 상태 변경 및 히스토리 생성
|
|
|
Order order = new Order();
|
|
|
order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
|