From 998379e6b0e234ab42a06cfe7b79c450d9d1bba1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 20 三月 2023 10:22:19 +0800
Subject: [PATCH] 修改银联退款接口

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index ef78c15..d2778b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -10,7 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import com.panzhihua.applets.config.MinioUtil;
 import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.applets.unionpay.Query;
 import com.panzhihua.applets.unionpay.Refund;
+import com.panzhihua.applets.unionpay.RefundQuery;
 import com.panzhihua.applets.unionpay.UnifiedOrder;
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.vos.community.Base64File;
@@ -255,33 +257,54 @@
 
     @ApiOperation("uu洗车银联下单接口")
     @GetMapping("/uuUnionpayPay")
-    public R uuUnionpayPay(@RequestParam("amount")String amount,@RequestParam("productId")String productId){
-        String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId);
+    public R uuUnionpayPay(@RequestParam("amount")String amount,
+                           @RequestParam("productId")String productId,
+                           @RequestParam("openId")String openId){
+        String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,openId);
         return R.ok(map);
     }
 
     @ApiOperation("无水洗车银联下单接口")
     @GetMapping("/wsUnionpayPay")
-    public R wsUnionpayPay(@RequestParam("amount")String amount,@RequestParam("productId")String productId){
-        String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId);
+    public R wsUnionpayPay(@RequestParam("amount")String amount,
+                           @RequestParam("productId")String productId,
+                           @RequestParam("openId")String openId){
+        String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,openId);
         return R.ok(map);
     }
 
     @ApiOperation("uu洗车银联退款接口")
     @GetMapping("/uuUnionpayRefund")
-    public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,@RequestParam("refundOrderId")String refundOrderId){
+    public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+                                 @RequestParam("refundOrderId")String refundOrderId){
         String map= Refund.sendOrder(refundAmount,refundOrderId);
         return R.ok(map);
     }
 
     @ApiOperation("无水洗车银联退款接口")
     @GetMapping("/wsUnionpayRefund")
-    public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,@RequestParam("refundOrderId")String refundOrderId){
+    public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+                                 @RequestParam("refundOrderId")String refundOrderId){
         String map= Refund.sendOrder(refundAmount,refundOrderId);
         return R.ok(map);
     }
 
 
+    @ApiOperation("银联支付查询接口")
+    @GetMapping("/unionpayQuery")
+    public R unionpayRefundPay(@RequestParam("merOrderId")String merOrderId){
+        String map= Query.query(merOrderId);
+        return R.ok(map);
+    }
+
+    @ApiOperation("银联退款查询接口")
+    @GetMapping("/unionpayRefundQuery")
+    public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
+        String map= RefundQuery.refundQuery(merOrderId);
+        return R.ok(map);
+    }
+
+
 
 
 

--
Gitblit v1.7.1