From 02b087d8d55a7931d87c6e39423d9362463d67c9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 14:13:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 97945b0..f81393b 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
@@ -219,4 +219,10 @@
         Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount);
         return R.ok(map);
     }
+    @ApiOperation("无水洗车下单接口")
+    @GetMapping("/wsPay")
+    public R wsPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
+        Map map=umfPayUtil.pay2(orderid, DateUtils.getCurrentDateString(),openid,amount);
+        return R.ok(map);
+    }
 }

--
Gitblit v1.7.1