|
|
@@ -1,6 +1,5 @@
|
|
|
package com.style24.batch.biz.service;
|
|
|
|
|
|
-import com.fasterxml.jackson.core.JsonStreamContext;
|
|
|
import com.gagaframework.web.parameter.GagaMap;
|
|
|
import com.nhncorp.psinfra.toolkit.SimpleCryptLib;
|
|
|
import com.style24.batch.biz.dao.TsbNaverPayDao;
|
|
|
@@ -21,7 +20,6 @@ import com.style24.core.support.env.TscConstants;
|
|
|
import com.style24.persistence.domain.Order;
|
|
|
import com.style24.persistence.domain.OrderChange;
|
|
|
import com.style24.persistence.domain.Payment;
|
|
|
-import jdk.nashorn.internal.parser.JSONParser;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.bouncycastle.jce.provider.BouncyCastleProvider;
|
|
|
@@ -80,8 +78,8 @@ public class TsbNaverPayService {
|
|
|
String eddt = time.getEddt();
|
|
|
|
|
|
if("locd".equals(env.getProperty("spring.profiles.active"))) {
|
|
|
- stdt = "20210615000000";
|
|
|
- eddt = "20210615235959";
|
|
|
+ stdt = "20210616000000";
|
|
|
+ eddt = "20210616235959";
|
|
|
|
|
|
log.info("stdt : eddt ---> " + stdt + " : " + eddt);
|
|
|
}
|
|
|
@@ -237,13 +235,11 @@ public class TsbNaverPayService {
|
|
|
orderNo = productOrderInfo[i].getProductOrder().getMerchantCustomCode1(); // 가맹점 주문번호
|
|
|
// naverSeq = productOrderInfo[i].getProductOrder().getProductOrderID(); // 네이버주문번호순번
|
|
|
if(StringUtils.isNotBlank(orderNo) && !"0".equals(orderNo)) {
|
|
|
- log.info("CHECK NPAY_ORD_NO ::::: {}", productOrderInfo[i].getOrder().getOrderID());
|
|
|
-
|
|
|
// TB_ORDER 네이버페이 주문번호 UPDATE
|
|
|
- log.info("CHECK productOrderInfo[i].getOrder().getOrderID() ::::: {}", productOrderInfo[i].getOrder().getOrderID());
|
|
|
- log.info("CHECK productOrderInfo[i].getProductOrder().getMallID() ::::: {}", productOrderInfo[i].getProductOrder().getMallID());
|
|
|
- log.info("CHECK productOrderInfo[i].getProductOrder().getMerchantCustomCode1() ::::: {}", productOrderInfo[i].getProductOrder().getMerchantCustomCode1());
|
|
|
naverParams.setOrdNo(Integer.parseInt(orderNo));
|
|
|
+ naverParams.setOrdNm(new String(SimpleCryptLib.decrypt(encryptKey, productOrderInfo[i].getOrder().getOrdererName()), StandardCharsets.UTF_8));
|
|
|
+ naverParams.setOrdPhnno(new String(SimpleCryptLib.decrypt(encryptKey, productOrderInfo[i].getOrder().getOrdererTel1()), StandardCharsets.UTF_8));
|
|
|
+ naverParams.setOrdEmail(new String(SimpleCryptLib.decrypt(encryptKey, productOrderInfo[i].getOrder().getOrdererID()), StandardCharsets.UTF_8) + "@naver.com");
|
|
|
naverParams.setNpayOrdNo(productOrderInfo[i].getOrder().getOrderID()); // 네이버 주문번호
|
|
|
naverParams.setSiteCd(productOrderInfo[i].getProductOrder().getMallID());
|
|
|
naverParams.setUpdNo(0);
|
|
|
@@ -353,6 +349,9 @@ public class TsbNaverPayService {
|
|
|
naverPayDao.updateShippingAddressInfo(order);
|
|
|
}
|
|
|
|
|
|
+ order.setRegNo(0);
|
|
|
+ order.setUpdNo(0);
|
|
|
+ order.setCustNo(0);
|
|
|
order.setSellGb("10");
|
|
|
order.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
|
|
|
order.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
|
|
|
@@ -394,6 +393,8 @@ public class TsbNaverPayService {
|
|
|
} else {
|
|
|
String changeReasonCd = orderInfo.getCancelInfo().getCancelReason().getValue();
|
|
|
param.setChgMemo(orderInfo.getCancelInfo().getCancelDetailedReason());
|
|
|
+ log.info("CHECK CHG_MEMO ::::: {}", param.getChgMemo());
|
|
|
+ log.info("CHECK RESON_CODE ::::: {}", changeReasonCd);
|
|
|
|
|
|
if("PRODUCT_UNSATISFIED".equals(changeReasonCd)) {
|
|
|
// 단순변심 (네이버 : 서비스 및 상품 불만족)
|
|
|
@@ -425,6 +426,9 @@ public class TsbNaverPayService {
|
|
|
change.setUserNo(0); // 배치는 0
|
|
|
change.setOrdDtlNoArr(dtlNoArr); // 주문상세번호배열
|
|
|
change.setCnclRtnReqQtyArr(cnclQtyArr); // 취소수량배열
|
|
|
+ change.setCustNo(info.getCustNo()); // 주문고객번호
|
|
|
+ change.setOrdNm(info.getOrdNm()); // 주문자명 (비회원용)
|
|
|
+ change.setOrdPhnno(info.getOrdPhnno()); // 주문자휴대폰번호 (비회원용)
|
|
|
GagaMap cancelInfo = orderChangeService.orderCancelPreInfoTemp(change, change.getUserNo());
|
|
|
}
|
|
|
}
|
xodud lee