From dcb96821f905f3fd93c059d8703517bdcac4d336 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 29 九月 2026 20:02:02 +0800
Subject: [PATCH] 排序问题及门店手机号展示问题
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 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 a3f5bd2..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
@@ -13,7 +13,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.other.entity.*;
-import com.dsh.other.enums.SiteBookingStatusEnum;
import com.dsh.other.feignclient.StoreClient;
import com.dsh.other.feignclient.account.AppUserClient;
import com.dsh.other.feignclient.account.model.AppUser;
@@ -1187,10 +1186,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);// 退款单号
// 运营商退款
- ResultUtil refundResult = payMoneyUtil.weixinRefundV3(smidVx, code, siteBooking.getPayOrderNo(), siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback1");
- if (!ResultUtil.SUCCESS.equals(refundResult.getCode())) {
- return refundResult;
- }
+ payMoneyUtil.weixinRefundV3(smidVx, code, siteBooking.getPayOrderNo(), siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback1");
} else {
Map<String, String> map = payMoneyUtil.wxRefund(siteBooking.getPayOrderNo(), siteBooking.getOrderNo(), siteBooking.getPayMoney().toString(),
siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback");
@@ -1201,19 +1197,15 @@
if (!"SUCCESS".equals(return_code)) {
return ResultUtil.error(map.get("return_msg"));
}
+ siteBooking.setCancelUserId(uid);
+ siteBookingService.updateById(siteBooking);
+
TBackRecord tBackRecord = new TBackRecord();
tBackRecord.setMoney(siteBooking.getPayMoney());
tBackRecord.setUserId(siteBooking.getAppUserId());
tBackRecord.setTime(new Date());
backRecordService.save(tBackRecord);
}
-
- // 退款请求已受理即结束该预约，不能继续在“待核销”列表中展示。
- // 微信退款回调用于补充退款流水号及恢复优惠券，重复更新状态不会影响结果。
- siteBooking.setStatus(SiteBookingStatusEnum.CANCELED.getCode());
- siteBooking.setCancelUserId(uid);
- siteBooking.setCancelTime(new Date());
- siteBookingService.updateById(siteBooking);
}
--
Gitblit v1.7.1