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

---
 src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java            |   16 +++++++---------
 src/test/java/cc/mrbird/febs/ProfitTest.java                                    |   10 ++++++++--
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    6 ++++--
 src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java               |    6 +++---
 4 files changed, 22 insertions(+), 16 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 44f17a8..41c1090 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
@@ -342,8 +342,9 @@
                 }else{
                     JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
                     payResultStr = (String) jsonObject.get("biz_code");
+                    String signBizMsg = (String) jsonObject.get("biz_msg");
                     if("JS000000" != payResultStr){
-                        throw new FebsException("支付失败");
+                        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("快捷协议支付");
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
index 4577c07..4e1bcda 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -158,10 +158,10 @@
     @PostMapping(value = "getAgreeMentPaySms")
     public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
         String agreeMentPaySms = unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
-        if("fail".equals(agreeMentPaySms)){
-            return new FebsResponse().fail().message("获取失败");
-        }else{
+        if("JS000000".equals(agreeMentPaySms)){
             return new FebsResponse().success().message("获取成功");
+        }else{
+            return new FebsResponse().fail().message(agreeMentPaySms);
         }
     }
 
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java
index 77a137f..e7fed5e 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java
@@ -306,16 +306,14 @@
             e.printStackTrace();
         }
         System.out.println(httpResponseJson);
-        if(StrUtil.isNotBlank(httpResponseJson)){
-            cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(httpResponseJson);
-            System.out.println(jsonObject);
-            String biz_code = jsonObject.get("biz_code").toString();
-            if("JS000000" == biz_code){
-                return httpResponseJson;
-            }
-            return "fail";
+        cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(httpResponseJson);
+        System.out.println(jsonObject);
+        String biz_code = jsonObject.get("biz_code").toString();
+        String biz_msg = jsonObject.get("biz_msg").toString();
+        if("JS000000" == biz_code){
+            return biz_code;
         }else{
-            return "fail";
+            return biz_msg;
         }
     }
 
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index e32b774..4bd99ef 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs;
 
+import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.mall.entity.MallOrderItem;
 import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
 import cc.mrbird.febs.mall.mapper.MallOrderItemMapper;
@@ -138,7 +139,7 @@
     @Test
     public void getAgreeMentPaySms(){
         AgreeMentPaySmsDto agreeMentPaySmsDto = new AgreeMentPaySmsDto();
-        agreeMentPaySmsDto.setOrderNo("2022082614465345250");
+        agreeMentPaySmsDto.setOrderNo("2022082617305930328");
 
         BigDecimal value = new BigDecimal("0.1").setScale(2, BigDecimal.ROUND_DOWN);
         DecimalFormat decimalFormat = new DecimalFormat("0.00#");
@@ -150,7 +151,12 @@
         agreeMentPaySmsDto.setIdCardNum("430321199310113713");
         agreeMentPaySmsDto.setBankNo("6222031901002389639");
         agreeMentPaySmsDto.setPhone("15274802129");
-        unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
+        String agreeMentPaySms = unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
+        if("JS000000".equals(agreeMentPaySms)){
+            System.out.println("获取成功");
+        }else{
+            System.out.println(agreeMentPaySms);
+        }
     }
 
     @Test

--
Gitblit v1.9.1