From c6b28f3e234f3c6036e2c8b32d0a7f122da2c1db Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 25 九月 2023 23:37:11 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeBbgPaymentAdapt.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeBbgPaymentAdapt.java b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeBbgPaymentAdapt.java
index b8b7250..8f55e2f 100644
--- a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeBbgPaymentAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeBbgPaymentAdapt.java
@@ -2,15 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.acct.payment.adapt.bbgpay.EncryptDecryptFactory;
-import com.java110.acct.payment.adapt.bbgpay.lib.AesEncrypt;
-import com.java110.acct.payment.adapt.bbgpay.lib.CAUtil;
-import com.java110.acct.payment.adapt.bbgpay.lib.HttpRequestUtil;
-import com.java110.acct.payment.adapt.bbgpay.lib.JsonUtil;
import com.java110.acct.smo.IQrCodePaymentSMO;
import com.java110.core.client.RestTemplate;
import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
@@ -19,8 +14,6 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -103,7 +96,7 @@
if ("SUCCESS".equals(paramOut.getString("deal_status"))) {
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
} else {
- return new ResultVo(ResultVo.CODE_ERROR, resMap.get("绛夊緟鐢ㄦ埛鏀粯涓�"));
+ return new ResultVo(ResultVo.CODE_ERROR, "绛夊緟鐢ㄦ埛鏀粯涓�");
}
}
@@ -122,18 +115,19 @@
String decryParams = EncryptDecryptFactory.execute(communityId, queryUrl, params);
JSONObject paramOut = JSONObject.parseObject(decryParams);
+
+ if (!"SUCCESS".equals(paramOut.getString("status"))
+ || !"SUCCESS".equals(paramOut.getString("deal_status"))) {
+ throw new IllegalArgumentException("鏀粯澶辫触" + paramOut.getString("return_message"));
+ }
+
if (!"0000".equals(paramOut.getString("return_code"))
- || !"SUCCESS".equals(paramOut.getString("status"))
+ && !"0001".equals(paramOut.getString("return_code"))
) {
- return new ResultVo(ResultVo.CODE_ERROR, "鏀粯澶辫触" + paramOut.getString("return_message"));
-
+ throw new IllegalArgumentException("鏀粯澶辫触" + paramOut.getString("return_message"));
}
- if ("FAIL".equals(paramOut.getString("deal_status"))) {
- return new ResultVo(ResultVo.CODE_ERROR, "涓氬姟澶辫触");
- }
-
- if ("SUCCESS".equals(paramOut.getString("deal_status"))) {
+ if ("0000".equals(paramOut.getString("return_code"))) {
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
} else {
return new ResultVo(ResultVo.CODE_WAIT_PAY, "绛夊緟鏀粯瀹屾垚");
--
Gitblit v1.8.0