From 82223863ef1e95aca19b72ab326a0e854d30ae7c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 11 十月 2022 14:34:14 +0800
Subject: [PATCH] Merge branch '20221008' into local_20221010

---
 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