From d85000e8f03740bd68523a36e108065a8168bd6a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 09:09:24 +0800
Subject: [PATCH] 更新预约场地部分接口
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 6 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 ff84b6c..5d978e8 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
@@ -1,19 +1,27 @@
package com.dsh.other.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.other.entity.Site;
+import com.dsh.other.entity.SiteBooking;
import com.dsh.other.model.*;
+import com.dsh.other.service.ISiteBookingService;
import com.dsh.other.service.ISiteService;
import com.dsh.other.service.ISiteTypeService;
+import com.dsh.other.util.PayMoneyUtil;
import com.dsh.other.util.ResultUtil;
+import com.dsh.other.util.TokenUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author zhibing.pu
@@ -28,6 +36,15 @@
@Autowired
private ISiteTypeService siteTypeService;
+
+ @Autowired
+ private TokenUtil tokenUtil;
+
+ @Autowired
+ private PayMoneyUtil payMoneyUtil;
+
+ @Autowired
+ private ISiteBookingService siteBookingService;
@@ -71,10 +88,12 @@
@ApiOperation(value = "获取场地详情", tags = {"用户—预约场地"})
@ApiImplicitParams({
@ApiImplicitParam(value = "场地id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
})
- public ResultUtil<QuerySiteInfoVo> querySiteInfo(Integer id){
+ public ResultUtil<QuerySiteInfoVo> querySiteInfo(Integer id, String lon, String lat){
try {
- QuerySiteInfoVo querySiteInfoVo = siteService.querySiteInfo(id);
+ QuerySiteInfoVo querySiteInfoVo = siteService.querySiteInfo(id, lon, lat);
return ResultUtil.success(querySiteInfoVo);
}catch (Exception e){
e.printStackTrace();
@@ -100,4 +119,104 @@
return ResultUtil.runErr();
}
}
+
+
+ /**
+ * 根据id获取数据
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/site/querySiteById")
+ public Site querySiteById(@RequestBody Integer id){
+ try {
+ return siteService.getById(id);
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+
+
+ public ResultUtil reservationSite(ReservationSite reservationSite){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+
+
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
+
+ /**
+ * 购买课程微信支付回调
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/site/weChatPaymentSiteCallback")
+ public void weChatPaymentSiteCallback(HttpServletRequest request, HttpServletResponse response){
+ try {
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ if(null != map){
+ String code = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+ String result = map.get("result");
+ SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
+ if(siteBooking.getStatus() == 0){
+ siteBooking.setPayTime(new Date());
+ siteBooking.setStatus(1);
+ siteBooking.setPayOrderNo(transaction_id);
+ siteBookingService.updateById(siteBooking);
+ }
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 购买课程支付宝回调
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/site/aliPaymentSiteCallback")
+ public void aliPaymentSiteCallback(HttpServletRequest request, HttpServletResponse response){
+ try {
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ if(null != map){
+ String code = map.get("out_trade_no");
+ String trade_no = map.get("trade_no");
+ SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
+ if(siteBooking.getStatus() == 0){
+ siteBooking.setPayTime(new Date());
+ siteBooking.setStatus(1);
+ siteBooking.setPayOrderNo(trade_no);
+ siteBookingService.updateById(siteBooking);
+ }
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.7.1