From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/PaymentCallback.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
index 43989ac..c26dbaa 100644
--- a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
+++ b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
@@ -22,6 +22,7 @@
import com.wechat.pay.java.service.payments.model.Transaction;
import com.wechat.pay.java.service.refund.model.RefundNotification;
import com.wechat.pay.java.service.refund.model.Status;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@
* @Author : Rk
* @create 2023/3/24 16:57
*/
+@Api(tags = "鏀粯鍥炶皟涓氬姟鎺ュ彛")
@Slf4j
@RestController
@CrossOrigin
@@ -229,10 +231,10 @@
templateParam.put("orderNo", refundOrder.getCode());
templateParam.put("money", String.valueOf(Constants.getFormatMoney(
refundOrder.getRefundAmount() != null ? refundOrder.getRefundAmount() : 0L)));
- boolean smsResult = AliSmsService.sendSms(refundMember.getTelephone(),
+ String smsError = AliSmsService.sendSms(refundMember.getTelephone(),
Constants.SmsNotify.MEMBER_REFUNDED.getTemplateCode(),
templateParam.toJSONString());
- if (smsResult) {
+ if (smsError == null) {
log.info("閫�娆剧煭淇″彂閫佹垚鍔�: phone={}", refundMember.getTelephone());
} else {
log.warn("閫�娆剧煭淇″彂閫佸け璐�: phone={}", refundMember.getTelephone());
@@ -242,7 +244,10 @@
smsRecord.setPhone(refundMember.getTelephone());
smsRecord.setContent(smsContent);
smsRecord.setType(Constants.ONE);
- smsRecord.setStatus(smsResult ? Constants.ONE : Constants.ZERO);
+ smsRecord.setStatus(smsError == null ? Constants.ONE : Constants.ZERO);
+ if (smsError != null) {
+ smsRecord.setRemark(smsError);
+ }
smsRecord.setCreateTime(new java.util.Date());
smsRecord.setDeleted(Constants.ZERO);
smsrecordMapper.insert(smsRecord);
--
Gitblit v1.9.3