From 35603c9d2edd3ba95f80a90d2a6cafd0caf5b1b8 Mon Sep 17 00:00:00 2001
From: fs-danaus <danaus314@qq.com>
Date: 星期五, 27 八月 2021 10:43:50 +0800
Subject: [PATCH] 完善农行支付功能

---
 src/com/yc/abc/utils/AbcPayUtils.java |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/com/yc/abc/utils/AbcPayUtils.java b/src/com/yc/abc/utils/AbcPayUtils.java
index 920dec5..571c7d3 100644
--- a/src/com/yc/abc/utils/AbcPayUtils.java
+++ b/src/com/yc/abc/utils/AbcPayUtils.java
@@ -41,26 +41,41 @@
      * 00:鎺堟潈宸插彇娑�
      * 99:澶辫触
      */
-    public  static String getOrderStatus(String status) {
+    public  static String getOrderStatus(String status,String payType) {
+        String result="";
         switch (status) {
-            case "01":
-                return "鏈敮浠�";
-            case "02":
-                return "鏃犲洖搴�";
-            case "03":
-                return "寰俊鍜屾敮浠樺疂鏀粯鎴愬姛";
-            case "04":
-                return "鏀粯鎴愬姛";
-            case "05":
-                return "宸查��娆�";
-            case "07":
-                return "鎺堟潈纭鎴愬姛";
-            case "00":
-                return "鎺堟潈宸插彇娑�";
-            default:
-                return "澶辫触";
-        }
 
+            case "01":
+                result= "鏈敮浠�";
+                break;
+            case "02":
+                result= "鏃犲洖搴�";
+                break;
+            case "03":
+            case "04":
+                result= "鏀粯鎴愬姛";
+                break;
+            case "05":
+                result= "宸查��娆�";
+                break;
+            case "07":
+                result= "鎺堟潈纭鎴愬姛";
+                break;
+            case "00":
+                result= "鎺堟潈宸插彇娑�";
+                break;
+            default:
+                result= "鏀粯澶辫触";
+        }
+        String payTypeId="";
+        if("ALI_PAY".equalsIgnoreCase(payType)){
+            payTypeId="鏀粯瀹�";
+        }else if("weixinpay".equalsIgnoreCase(payType)){
+            payTypeId="寰俊";
+        }else{
+            payTypeId="鎺岄摱";
+        }
+    return payTypeId+result;
     }
 
     /**
@@ -134,7 +149,7 @@
         tPaymentRequest.dicOrder.put("PayTypeID", Constants.PAY_TYPE_DIRECTPAY);                   //璁惧畾浜ゆ槗绫诲瀷
         tPaymentRequest.dicOrder.put("OrderDate", date);                  //璁惧畾璁㈠崟鏃ユ湡 锛堝繀瑕佷俊鎭� - YYYY/MM/DD锛�
         tPaymentRequest.dicOrder.put("OrderTime", time);                   //璁惧畾璁㈠崟鏃堕棿 锛堝繀瑕佷俊鎭� - HH:MM:SS锛�
-        //tPaymentRequest.dicOrder.put("orderTimeoutDate", LocalDateTime.now().plusMinutes(5).format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));           // 璁剧疆璁㈠崟杩囨湡鏃堕棿锛�30鍒嗛挓
+        //tPaymentRequest.dicOrder.put("orderTimeoutDate", LocalDateTime.now().plusMinutes(10).format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));           // 璁剧疆璁㈠崟杩囨湡鏃堕棿锛�10鍒嗛挓
         tPaymentRequest.dicOrder.put("OrderNo", orderNo);                       //璁惧畾璁㈠崟缂栧彿 锛堝繀瑕佷俊鎭級
         tPaymentRequest.dicOrder.put("CurrencyCode", "156");             //璁惧畾浜ゆ槗甯佺
         tPaymentRequest.dicOrder.put("OrderAmount", orderAmount.toString());      //璁惧畾浜ゆ槗閲戦

--
Gitblit v1.8.0