xujunwei 4 лет назад
Родитель
Сommit
3a58e7e94c

+ 3 - 1
framework-boot/src/main/java/com/mrxu/framework/boot/web/ServletUtils.java

@@ -99,7 +99,9 @@ public class ServletUtils {
         if (accept != null && accept.contains("application/json")) {
             return true;
         }
-
+        if(request.getRequestURI().contains(".json")) {
+            return true;
+        }
         String xRequestedWith = request.getHeader("X-Requested-With");
         if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
             return true;

+ 1 - 0
framework-common/src/main/java/com/mrxu/framework/common/xcx/api/PayService.java

@@ -39,6 +39,7 @@ public class PayService {
         System.out.println(resultStr);
         JSONObject resultJson = WeixinUtil.doXMLParse(resultStr);
         T result = JSONUtil.toBean(resultJson.toJSONString(),clazz);
+        MrxuAssert.isTrue(result.isSuccess(),result.getErrorMsg());
         return result;
     }
 

+ 8 - 0
framework-common/src/main/java/com/mrxu/framework/common/xcx/bean/PayBaseResponse.java

@@ -10,5 +10,13 @@ public class PayBaseResponse {
     // 返回信息	return_msg	否	String(128)	签名失败 返回信息,如非空,为错误原因 签名失败 参数格式校验错误
     private String return_msg;
 
+    public boolean isSuccess() {
+        return "SUCCESS".equals(return_code);
+    }
+
+    public String getErrorMsg() {
+        return "SUCCESS".equals(return_code)?"":(return_msg==null?"":return_msg);
+    }
+
 
 }

+ 8 - 0
framework-common/src/main/java/com/mrxu/framework/common/xcx/bean/UnifiedorderResponse.java

@@ -33,4 +33,12 @@ public class UnifiedorderResponse extends PayBaseResponse {
     trade_type=NATIVE时有返回,此url用于生成支付二维码,然后提供给用户进行扫码支付。
     注意:code_url的值并非固定,使用时按照URL格式转成二维码即可 */
     private String code_url;
+
+    public boolean isSuccess() {
+        return super.isSuccess() && "SUCCESS".equals(result_code);
+    }
+
+    public String getErrorMsg() {
+        return super.getErrorMsg()+(("SUCCESS".equals(result_code))?"":err_code_des);
+    }
 }