From c54b2f12e52194f2ea226b3ee4b91e5d202b1338 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 03 六月 2021 16:54:16 +0800
Subject: [PATCH] 优化app 支付报错问题

---
 service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java b/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
index b853208..aa356a6 100755
--- a/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
@@ -29,7 +29,6 @@
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.PayUtil;
-import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +66,7 @@
      * @return
      * @throws Exception
      */
-    public String confirmPayFee(String param,String wId) {
+    public String confirmPayFee(String param, String wId) {
         String resXml = "";
         try {
             Map<String, Object> map = PayUtil.getMapFromXML(param);
@@ -138,17 +137,14 @@
         } else {
             openId = map.get("openid").toString();
         }
+        responseEntity = getUserInfoByOpenId(restTemplate, openId);
+        logger.debug("鏌ヨ鐢ㄦ埛淇℃伅杩斿洖鎶ユ枃锛�" + responseEntity);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException("鏍圭粷openId 鏌ヨ鐢ㄦ埛淇℃伅寮傚父" + openId);
+        }
+        JSONObject userResult = JSONObject.parseObject(responseEntity.getBody());
         String useId = "-1";
-        if(!StringUtil.isEmpty(openId)) {
-
-            responseEntity = getUserInfoByOpenId(restTemplate, openId);
-
-            logger.debug("鏌ヨ鐢ㄦ埛淇℃伅杩斿洖鎶ユ枃锛�" + responseEntity);
-            if (responseEntity.getStatusCode() != HttpStatus.OK) {
-                throw new IllegalArgumentException("鏍圭粷openId 鏌ヨ鐢ㄦ埛淇℃伅寮傚父" + openId);
-            }
-
-            JSONObject userResult = JSONObject.parseObject(responseEntity.getBody());
+        if (userResult.containsKey("data") && userResult.getJSONArray("data").size() > 0) {
             JSONObject realUserInfo = userResult.getJSONArray("data").getJSONObject(0);
             useId = realUserInfo.getString("userId");
         }

--
Gitblit v1.8.0