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

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
index ba3e4c4..5c33787 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
@@ -188,12 +188,20 @@
         log.error("花城洗车请求参数queryEntiy :" + queryEntiy.toString());
         if(queryEntiy.getErrCode().equals("SUCCESS"))
         {
-            //调用uu洗车支付成功回调
-//            Map map=new HashMap();
-//            map.put("orderId",respMap.get("order_id"));
-//            HttpClientUtil.sendPostByJson("https://uu-api.imashuo.com/notify/wx/pzh-pay",JSONObject.toJSONString(map),
-//                    1,"appid","10000");
-            log.error("花城洗车回调成功 :" + queryEntiy.getMerOrderId());
+            //查询银联单号对应的洗车单号
+            R r=communityService.carWashById(merOrderId);
+            if(r.getCode()==200)
+            {
+                UnionpayCarWash unionpayCarWash=(UnionpayCarWash)r.getData();
+                //调用uu洗车支付成功回调
+                Map map=new HashMap();
+                map.put("orderId",unionpayCarWash.getCarWashId());
+                HttpClientUtil.sendPostByJson("https://uu-api.imashuo.com/notify/wx/pzh-pay",JSONObject.toJSONString(map),
+                        1,"appid","10000");
+                log.error("花城洗车回调成功 :" + queryEntiy.getMerOrderId()+" : 洗车号"
+                        +unionpayCarWash.getUnionpayOrderId()+" : 银联号"+unionpayCarWash.getUnionpayOrderId());
+            }
+
         }
         //调用SDK生成返回联动平台字符串,加到CONTENT中
         response.setContentType("text/html;charset=utf-8");
@@ -228,11 +236,16 @@
             if(desMap.get("orderId")!=null)
             {
                 R r=communityService.queryById(desMap.get("orderId"));
-                UnionpayCarWash wash=(UnionpayCarWash)r.getData();
-                if(wash!=null)
+                if(r.getCode()==200)
                 {
-                    String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());
-                    map.put("unionpay","退款成功");
+                    UnionpayCarWash wash=(UnionpayCarWash)r.getData();
+                    if(wash!=null)
+                    {
+                        String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());
+                        map.put("unionpay","退款成功");
+                        log.error("花城洗车银联退款成功 :" + re);
+                    }
+
                 }
             }
             return R.ok(map);

--
Gitblit v1.7.1