From 40f362f8c120a94f35e28dcba6e70b5e42c6d599 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 24 十月 2023 20:32:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
index 5a5e6ad..915a855 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
@@ -196,6 +196,7 @@
             Map<String, String> map = new HashMap<>();
             map.put("orderString", response.getBody());
             System.err.println("========map=========="+map);//就是orderString 可以直接给客户端请求,无需再做处理。
+            map.put("siteBooking",passbackParams);
             return ResultUtil.success(map);
         } catch (AlipayApiException e) {
             e.printStackTrace();
@@ -423,6 +424,7 @@
                         String s1 = this.weixinSignature(map3);
                         map3.put("sign", s1);
                         System.err.println(map3);
+                        map3.put("siteBookingId",attach);
                         return ResultUtil.success(map3);
                 }
                 return null;

--
Gitblit v1.7.1