diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java index 5fc6bbd7..30c7b2e2 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/pay/service/BOPayService.java @@ -1564,9 +1564,16 @@ public class BOPayService{ //관련 키값 DB 조회 DataMap resultMap = selectPayLink(payVO.getSopmalCd()); + log.debug("cancelKiwoomPay step2 resultMap :::> {}", resultMap); + //요청코드 String authKey = resultMap.get("kcpSecretKey").toString(); String cpId = resultMap.get("kcpMid").toString(); + if ("naverpay".equals(payVO.getModGubun())) { + authKey = resultMap.get("bpaySecretKey").toString(); + cpId = resultMap.get("bpayMid").toString(); + } + String amount = payVO.getCancelAmount(); //취소금액 String trxId = payVO.getTno(); //거래번호 String cancelReason = payVO.getCancelReason(); //취소사유 @@ -1574,10 +1581,6 @@ public class BOPayService{ String cancelReq = "Y"; //취소URL 요청여부 //String TAXFREEAMT = nullCheck(request.getParameter("TAXFREEAMT")); //비과세 취소금액 - /*if(payVO.getSetleTyCd().equals("01")) { - payMethod = "CARD"; - }*/ - //1차 요청코드 JSONObject obj = new JSONObject(); obj.put("cancelReason", cancelReason); //취소사유 diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java index ed6058ec..a8d2234f 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/service/BORtngudrefndService.java @@ -1119,6 +1119,7 @@ public class BORtngudrefndService { payVO.setMemorSetleAt("Y"); } + payVO.setModGubun(setle.getPgCmpnyNm()); //결제키 구분용 if ("kiwoom".equals(setle.getPgCmpnyNm())) { payVO.setPayMethod("CARD"); } else if ("naverpay".equals(setle.getPgCmpnyNm())) {