|
|
@@ -21,6 +21,7 @@ import com.google.gson.Gson;
|
|
|
import com.google.gson.GsonBuilder;
|
|
|
import com.style24.core.biz.dao.TscPointDao;
|
|
|
import com.style24.persistence.domain.Order;
|
|
|
+import com.style24.persistence.domain.Payment;
|
|
|
import com.style24.persistence.domain.Point;
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -102,7 +103,7 @@ public class TscKakaoPayService {
|
|
|
* @since 2021. 03. 04
|
|
|
*/
|
|
|
@Transactional("shopTxnManager")
|
|
|
- public GagaMap approveKakaoPayment(Order order) {
|
|
|
+ public Payment approveKakaoPayment(Order order) {
|
|
|
GagaMap map = new GagaMap();
|
|
|
String approvePaymentUrl = env.getProperty("kakao.approvePaymentUrl");
|
|
|
try {
|
|
|
@@ -135,7 +136,28 @@ public class TscKakaoPayService {
|
|
|
log.error(e.getMessage());
|
|
|
}
|
|
|
|
|
|
- return map;
|
|
|
+ Payment payment = new Payment();
|
|
|
+ payment.setPgTradeNo(map.getString("aid"));
|
|
|
+ payment.setPgTid(map.getString("tid"));
|
|
|
+ payment.setPgShopId(map.getString("cid"));
|
|
|
+ payment.setOrdNo(Integer.parseInt(map.getString("partner_order_id")));
|
|
|
+ payment.setCustNo(Integer.parseInt(map.getString("partner_user_id")));
|
|
|
+ payment.setKakaoMethodType(map.getString("payment_method_type"));
|
|
|
+
|
|
|
+ GagaMap amount = (GagaMap) map.get("amount");
|
|
|
+ payment.setPayAmt(Integer.parseInt(amount.getString("total")));
|
|
|
+ payment.setKakaoPoint(Integer.parseInt(amount.getString("point")));
|
|
|
+ payment.setKakaoDiscount(Integer.parseInt(amount.getString("discount")));
|
|
|
+
|
|
|
+ if ("CARD".equals(map.getString("payment_method_type"))) {
|
|
|
+ GagaMap cardInfo = (GagaMap) map.get("card_info");
|
|
|
+ payment.setCardKind(cardInfo.getString("purchase_corp"));
|
|
|
+ payment.setCardNm(cardInfo.getString("issuer_corp"));
|
|
|
+ payment.setCardType("신용".equals(cardInfo.getString("card_type")) ? "N" : "Y");
|
|
|
+ payment.setCardMips(cardInfo.getString("install_month"));
|
|
|
+ }
|
|
|
+
|
|
|
+ return payment;
|
|
|
}
|
|
|
|
|
|
}
|