From 64de90a7f600b53e0a314600410a4d8177d3abab Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 30 Dec 2024 20:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/ruoyi/common/pay/tm/TmPayService.java | 9 ++++++---
.../main/java/com/ruoyi/common/utils/ServiceUtil.java | 6 ++++++
.../com/ruoyi/framework/web/service/SysLoginService.java | 4 ++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java b/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java
index 0122a4a..4c25dc7 100644
--- a/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java
+++ b/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.pay.tm.vo.RefundInfo;
import com.ruoyi.common.pay.tm.vo.TmTradeInfo;
import com.ruoyi.common.pay.wx.Payable;
import com.ruoyi.common.pay.wx.RefundAble;
+import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.http.HttpUtils;
import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse;
import org.slf4j.Logger;
@@ -58,9 +59,11 @@ public class TmPayService {
String response = doPost(channel.getHttpUrl() + "/open/Pay/refund", body,channel);
if (com.ruoyi.common.utils.StringUtils.hasText(response)) {
JSONObject jsonResponse = JSON.parseObject(response);
- if (jsonResponse.getInteger("errCode") == 0 && "退款成功".equals(jsonResponse.getString("errMsg"))) {
- JSONObject tradeInfo = jsonResponse.getJSONObject("refundInfo");
- return tradeInfo.toJavaObject(RefundInfo.class);
+ if (jsonResponse.getInteger("errCode") == 0) {
+ JSONObject refundInfo = jsonResponse.getJSONObject("refundInfo");
+ ServiceUtil.assertion(refundInfo == null, "退款失败");
+ ServiceUtil.assertion(refundInfo.getInteger("refundStatus") != 1, "退款失败:%s", refundInfo.getString("refundMessage"));
+ return refundInfo.toJavaObject(RefundInfo.class);
} else {
throw new ServiceException("退款失败: " + jsonResponse.getString("errMsg"));
}
diff --git a/electripper-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java b/electripper-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java
index 369382c..072b41b 100644
--- a/electripper-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java
+++ b/electripper-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java
@@ -28,4 +28,10 @@ public class ServiceUtil {
throw new ServiceException(msg, code);
}
}
+
+ public static void assertion(boolean flag, String format, Object ...args) {
+ if (flag) {
+ throw new ServiceException(String.format(format, args), 500);
+ }
+ }
}
diff --git a/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 779b3e5..9c6327f 100644
--- a/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -274,16 +274,16 @@ public class SysLoginService
asUser.setCreateTime(DateUtils.getNowDate());
if(type.equals(Constants.CUSTOM_LOGIN_WX)){
asUser.setWxOpenid(openId);
+ asUser.setAppId(dept.getAppid());
}else{
asUser.setAliOpenid(openId);
+ asUser.setAppId("2021005106675341");
}
asUser.setAreaId(areaId);
if(dept.getIsUsePlatformApp().equals("true")){
asUser.setAppName("创享电动车");
- asUser.setAppId("2021005106675341");
}else{
asUser.setAppName(dept.getAppName());
- asUser.setAppId("2021005106675341");
}
log.info("【微信登录/wxlogin】用户不存在，自动注册用户：【{}】", JSON.toJSON(asUser));
int i = asUserService.insertUser(asUser);