From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 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 10eddf1..67034b3 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
@@ -309,23 +309,8 @@
@ApiOperation("银联退款查询接口")
@GetMapping("/unionpayRefundQuery")
public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
-// String map= RefundQuery.refundQuery(merOrderId);
-
- R r=communityService.queryById("5935");
- log.error("花城洗车银联退款数据 ：" + r);
- if(r.getCode()==200)
- {
- UnionpayCarWash wash= JSONObject.parseObject(r.getData().toString(),UnionpayCarWash.class);
- if(wash!=null)
- {
- String re=Refund.sendOrder(wash.getMoney(),wash.getUnionpayOrderId());
- log.error("花城洗车银联退款数据2 ：" + re);
- }
-
- }
-
-
- return communityService.queryById("5935");
+ String map= RefundQuery.refundQuery(merOrderId);
+ return R.ok(map);
}
--
Gitblit v1.7.1