From ce573e18e1c9adcc5d15f3b708435262da86c2e3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Aug 2022 18:05:01 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index fa7e82e..4c0d3bb 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -219,7 +219,7 @@
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
         MallMember member = LoginUserUtil.getLoginUser();
-        MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
+        MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(payOrderDto.getId());
         if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
             throw new FebsException("订单不存在");
         }
@@ -342,8 +342,9 @@
                 }else{
                     JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
                     payResultStr = (String) jsonObject.get("biz_code");
-                    if("JS000000" != payResultStr){
-                        throw new FebsException("支付失败");
+                    String signBizMsg = (String) jsonObject.get("biz_msg");
+                    if(!"JS000000".equals(payResultStr)){
+                        throw new FebsException(signBizMsg);
                     }
                 }
                 
@@ -369,8 +370,9 @@
                 }else{
                     JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
                     payResultStr = (String) jsonObject.get("biz_code");
+                    String payBizMsg = (String) jsonObject.get("biz_msg");
                     if(!"JS000000".equals(payResultStr)){
-                        throw new FebsException("支付失败");
+                        throw new FebsException(payBizMsg);
                     }
                 }
                 orderInfo.setPayMethod("快捷协议支付");

--
Gitblit v1.9.1