From 1006ed84660edfabbb5273a523e0c3c5af20a387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 00:29:59 +0800
Subject: [PATCH] 优化代码

---
 service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java b/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java
old mode 100644
new mode 100755
index 9c563a1..464dd52
--- a/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java
@@ -22,7 +22,6 @@
 import com.java110.front.properties.WechatAuthProperties;
 import com.java110.front.smo.payment.adapt.IPayNotifyAdapt;
 import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
@@ -75,7 +74,7 @@
      * @return
      * @throws Exception
      */
-    public String confirmPayFee(String param) {
+    public String confirmPayFee(String param,String wId) {
         JSONObject resJson = new JSONObject();
         resJson.put("result_code", "010002");
         resJson.put("result_msg", "澶辫触");
@@ -85,7 +84,7 @@
             String resultCode = map.getString("result_code");
             if ("000000".equals(resultCode)) {
                 //鏇存柊鏁版嵁
-                int result = confirmPayFee(map);
+                int result = confirmPayFee(map,wId);
                 if (result > 0) {
                     //鏀粯鎴愬姛
                     resJson.put("result_code", "000000");
@@ -101,8 +100,7 @@
     }
 
 
-    public int confirmPayFee(JSONObject map) {
-        String wId = map.getString("wId");
+    public int confirmPayFee(JSONObject map,String wId) {
         wId = wId.replace(" ", "+");
 
         ResponseEntity<String> responseEntity = null;
@@ -127,7 +125,7 @@
 
         //鏌ヨ鐢ㄦ埛ID
         JSONObject paramIn = new JSONObject();
-        paramIn.put("oId", outTradeNo);
+        paramIn.put("oId", outTradeNo.substring(4));
         String url = ServiceConstant.SERVICE_API_URL + "/api/fee.payFeeConfirm";
         responseEntity = this.callCenterService(restTemplate, "-1", paramIn.toJSONString(), url, HttpMethod.POST);
 
@@ -162,9 +160,8 @@
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
             logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
-            return responseEntity;
         }
-
+        return responseEntity;
     }
 
 

--
Gitblit v1.8.0