From ff2fc5e424e7bb71d17a178404d8790b5b3dc4ec Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 11:55:16 +0800
Subject: [PATCH] bug：返回字段修改
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index d05d8818ea..b61094d 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -896,8 +896,9 @@
siteBooking.setPayTime(new Date());
siteBookingService.updateById(siteBooking);
consumeCouponAfterSuccessfulPayment(siteBooking);
- HashMap<String, String> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
map.put("siteBooking", siteBooking.getId().toString());
+ map.put("paySuccess", true);
return ResultUtil.success(map);
}
if (reservationSite.getPayType() == 1 ) {//微信支付
@@ -932,15 +933,15 @@
// 平台
ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", id.toString(), code, paymentPrice.toString(),
"/base/site/weChatPaymentSiteCallback", "APP", "");
- return weixinpay;
+ return appendPaySuccess(weixinpay, false);
} else {
String smidVx = operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
if (!StringUtils.hasLength(smidVx)) {
return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
}
- return payMoneyUtil.weixinpayV3(smidVx, "预约场地"
+ return appendPaySuccess(payMoneyUtil.weixinpayV3(smidVx, "预约场地"
, code, "/base/site/weChatPaymentSiteCallback1",
- paymentPrice.toString(), id.toString());
+ paymentPrice.toString(), id.toString()), false);
}
@@ -978,7 +979,7 @@
}
ResultUtil alipay = payMoneyUtil.alipay(smid1, "预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
System.out.println("预约场地----" + alipay.getCode());
- return alipay;
+ return appendPaySuccess(alipay, false);
}
private void extracted(Integer operatorId, BigDecimal coursePackageOrder1, String tradeNo) throws Exception {
@@ -1045,11 +1046,23 @@
siteBooking.setStatus(1);
siteBookingService.updateById(siteBooking);
consumeCouponAfterSuccessfulPayment(siteBooking);
- HashMap<String, String> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
map.put("siteBooking", siteBooking.getId().toString());
+ map.put("paySuccess", true);
return ResultUtil.success(map);
}
+ /** 支付参数生成成功不等于已支付，前端仍需拉起微信或支付宝。 */
+ private ResultUtil appendPaySuccess(ResultUtil paymentResult, boolean paySuccess) {
+ JSONObject data = paymentResult.getData() == null ? new JSONObject()
+ : JSON.parseObject(JSON.toJSONString(paymentResult.getData()));
+ if (data == null) {
+ data = new JSONObject();
+ }
+ data.put("paySuccess", paySuccess);
+ return ResultUtil.getResult(paymentResult.getCode(), paymentResult.getMsg(), data);
+ }
+
/**
* 场地订单实际支付成功后才核销所选优惠券；避免仅创建待支付订单就提前消耗优惠券。
*/
--
Gitblit v1.7.1