이태영 - 20210602 수정사항 개선

src/main/java/com/style24/front/biz/dao/TsfOrderDao.java

@@ -156,4 +156,13 @@ public interface TsfOrderDao {
 	 * @since 2021. 05. 26
 	 */
 	int getNoMemberOrderInfo(Order order);
+
+	/**
+	 * 주문 실결제 금액 조회
+	 * @param param
+	 * @return
+	 * @author xodud1202
+	 * @since 2021. 06. 02
+	 */
+	int getRealPaymentAmt(Order param);
 }

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

@@ -1302,13 +1302,26 @@ public class TsfOrderService {
 
 			result = sendOrderInfoToNC(sb);
 
-			// 네이버 페이 주문번호 저장
-			param.setNpayOrdNo(Integer.parseInt(result.get("resultNo").toString()));
+			// 최종 결제 금액 계산
+			Order realAmtOrdNo = new Order();
+			realAmtOrdNo.setOrdNo(ordNo);
+
+			// 4. 결제 예정 정보 저장
+			Payment payment = new Payment();
+			payment.setOrdNo(param.getOrdNo());
+			payment.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
+			payment.setPayAmt(orderDao.getRealPaymentAmt(realAmtOrdNo));
+			payment.setPgCpnAmt(0);
+			payment.setNpayPntAmt(0);
+			payment.setPayGb("O");
+			payment.setPayStat(TscConstants.PaymentStat.PAYMENT_WAIT.value());
+			payment.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
+			payment.setPgShopId(env.getProperty("naverPay.shop.id"));
+			payment.setEscrowYn("N");
+			payment.setRegNo(custNo);
+			payment.setUpdNo(custNo);
+			coreOrderDao.insertPayment(payment);
 
-			// 3.주문정보 저장
-			param.setOrdNo(ordNo);
-			param.setUpdNo(custNo);
-			coreOrderDao.updateNaverPayOrderNo(param);
 			if(TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb())) {
 				result.put("npayOrderUrl", env.getProperty("naverPay.order.pc.url"));
 			} else {

src/main/java/com/style24/front/biz/web/TsfCartController.java

@@ -84,7 +84,12 @@ public class TsfCartController extends TsfBaseController {
 	@GetMapping("/list/form")
 	public ModelAndView cartListForm() {
 		ModelAndView mav = new ModelAndView();
-		mav.addObject("loginCustNo", TsfSession.getInfo().getCustNo());
+		int custNo = 0;
+		if(TsfSession.isLogin()) {
+			custNo = TsfSession.getInfo().getCustNo();
+		}
+
+		mav.addObject("loginCustNo", custNo);
 		mav.setViewName(super.getDeviceViewName("cart/CartListForm"));
 		return mav;
 	}

src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -617,5 +617,18 @@
 		   AND ORD_PHNNO = #{ordPhnno}
 	</select>
 
-
+	<select id="getRealPaymentAmt" parameterType="Order" resultType="int">
+		SELECT OD.REAL_ORD_AMT + DF.REAL_DELV_AMT AS PAY_AMT
+		FROM   (SELECT OD.ORD_NO
+		             , SUM(OD.REAL_ORD_AMT) AS REAL_ORD_AMT
+		        FROM   TB_ORDER_DETAIL OD
+		        WHERE  OD.ORD_NO = #{ordNo}
+			    GROUP  BY OD.ORD_NO) OD
+		INNER  JOIN (SELECT DF.ORD_NO
+		                 , SUM(DF.REAL_DELV_AMT) AS REAL_DELV_AMT
+		            FROM   TB_DELIVERY_FEE DF
+		            WHERE  DF.ORD_NO = #{ordNo}
+		            GROUP  BY DF.ORD_NO) DF
+		ON     OD.ORD_NO = DF.ORD_NO
+	</select>
 </mapper>

src/main/resources/config/application-locd.yml

@@ -90,7 +90,7 @@ naverPay:
     button.pc.js.url : https://test-pay.naver.com/customer/js/naverPayButton.js
     button.mobile.js.url : https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key : s_3799db3bf4af-
-    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
     order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/

src/main/resources/config/application-style.yml

@@ -102,7 +102,7 @@ naverPay:
     button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
     button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key: s_3799db3bf4af-
-    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
     order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/

src/main/resources/config/application-tsit.yml

@@ -95,7 +95,7 @@ naverPay:
     button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
     button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key : s_3799db3bf4af-
-    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
     order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/