From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index a04ed24..ea1db91 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -326,7 +327,7 @@
/**
- * 购买课程支付宝回调
+ * 预约场地支付宝回调
* @param request
* @param response
*/
@@ -334,6 +335,7 @@
@PostMapping("/base/site/aliPaymentSiteCallback")
public void aliPaymentSiteCallback(HttpServletRequest request, HttpServletResponse response){
try {
+ System.out.println("回调回调回调");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String code = map.get("out_trade_no");
@@ -354,8 +356,6 @@
e.printStackTrace();
}
}
-
-
@ResponseBody
@@ -404,6 +404,20 @@
List<Integer> ids = getIds(byId.getSiteId());
byId.setStorePhone(byId1.getPhone());
+
+ //拼接开始结束时间
+ Date startTime = byId.getStartTime();
+ Date endTime = byId.getEndTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ String startTimeString = sdf.format(startTime);
+ String endTimeString = sdf.format(endTime);
+
+ String result = startTimeString + "-" + endTimeString.substring(11);
+ byId.setTimes(result);
+
+
+
byId.setSid(Arrays.asList(storeId));
List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
--
Gitblit v1.7.1