From 270a3c0208001e2db9577cb6d7d4fd7ec646dfd8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 04 十一月 2025 21:27:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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 e5f51b0..08b01fb 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
@@ -304,11 +304,12 @@
@ApiImplicitParam(value = "场地id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(value = "日期（2023-01-01）", name = "day", dataType = "string", required = true),
@ApiImplicitParam(value = "半场名称", name = "halfName", dataType = "string", required = false),
- @ApiImplicitParam(value = "选择场地的名称", name = "siteName", dataType = "string", required = false)
+ @ApiImplicitParam(value = "选择场地的名称", name = "siteName", dataType = "string", required = false),
+ @ApiImplicitParam(value = "入场方式 1订场 2散客", name = "targetAudience",defaultValue = "1",dataType = "string", required = true),
})
- public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day, String halfName, String siteName) {
+ public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day, String halfName, String siteName,Integer targetAudience) {
try {
- List<QuerySiteTimes> list = siteService.querySiteTimes(id, day, halfName, siteName);
+ List<QuerySiteTimes> list = siteService.querySiteTimes(id, day, halfName, siteName,targetAudience);
return ResultUtil.success(list);
} catch (Exception e) {
e.printStackTrace();
@@ -366,6 +367,7 @@
if (null == uid) {
return ResultUtil.tokenErr();
}
+// Integer uid = 201;
return siteService.reservationSite(uid, reservationSite);
} catch (Exception e) {
e.printStackTrace();
@@ -505,7 +507,10 @@
@PostMapping("/base/site/aliPaymentSiteCallback")
public void aliPaymentSiteCallback(HttpServletRequest request, HttpServletResponse response) {
try {
+ System.err.println("预约场地回调");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ System.err.println("map");
+ System.err.println(map);
if (null != map) {
String code = map.get("out_trade_no");
String trade_no = map.get("trade_no");
@@ -630,6 +635,7 @@
HashMap<String, Object> map = new HashMap<>();
System.err.println("预约id"+id);
SiteBooking siteBooking = siteBookingService.getById(id);
+ Integer targetAudience = siteBooking.getTargetAudience();
System.err.println("预约"+siteBooking);
Integer storeId = siteBooking.getStoreId();
Store byId1 = service.getById(storeId);
@@ -640,6 +646,10 @@
map.put("siteType", siteType.getName());
map.put("shopName", byId1.getName());
map.put("shopAddress", byId1.getAddress());
+ // 进场二维码新增参数codeType 1=订场 2=散客，3=门票,玩湃惠民卡codeType=4
+ map.put("codeType", targetAudience);
+ map.put("dataId", siteBooking.getId());
+ System.err.println("订场类型:"+targetAudience);
map.put("name", site.getName());
@@ -706,6 +716,7 @@
})
public ResultUtil cancelMySite(Integer id) {
try {
+ System.err.println("预约数据id");
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
@@ -753,7 +764,59 @@
e.printStackTrace();
}
}
+ /**
+ * 微信退款回调V3服务商版本
+ *
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/site/cancelMySiteCallback1")
+ public void cancelMySiteCallback1(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ System.err.println("微信回调");
+ System.err.println("请求" + request);
+ BufferedReader reader = request.getReader();
+ String string1 = reader.toString();
+ System.err.println("请求reader" + string1);
+ StringBuilder requestBody = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ requestBody.append(line);
+ }
+ System.err.println("全部请求体" + requestBody);
+ JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
+ JSONObject resource = jsonObject.getJSONObject("resource");
+ AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
+ String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
+ resource.getString("ciphertext"));
+ System.err.println("微信解密的字符串信息" + decryptedData);
+ JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
+ String code = jsonInfo.getString("out_trade_no");
+ String transaction_id = jsonInfo.getString("transaction_id");
+ String refund_status = jsonInfo.getString("refund_status");
+ String out_refund_no = jsonInfo.getString("out_refund_no");
+ if (refund_status.equals("SUCCESS")) {
+ SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
+ siteBooking.setStatus(5);
+ siteBooking.setCancelTime(new Date());
+ siteBooking.setRefundOrderNo(out_refund_no);
+ siteBookingService.updateById(siteBooking);
+ if (null != siteBooking.getUserCouponId()) {
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(), siteBooking.getAppUserId()));
+ userCoupon.setStatus(1);
+ userCouponClient.updateUserCoupon(userCoupon);
+ }
+ PrintWriter out = response.getWriter();
+ out.write("SUCCESS");
+ out.flush();
+ out.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
@ResponseBody
@PostMapping("/api/site/continuePaymentMySite")
--
Gitblit v1.7.1