From 72a0752cf6f5837db203d5508fd0f3781a36141d Mon Sep 17 00:00:00 2001
From: khalil <842328916@qq.com>
Date: Mon, 1 Sep 2025 14:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE-=E6=9C=BA=E5=99=A8=E4=BA=BA-?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=B7=E7=A4=BC=E6=80=BB=E9=A2=9D-?=
 =?UTF-8?q?=E6=94=B9=E5=86=99sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/iospay/IAPMessageService.java          | 5 +++++
 .../business/service/payment/GooglePlayRefundService.java   | 6 ++++++
 .../main/resources/accompany/sqlmappers/IOSPayMapper.xml    | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java
index af98b0dcc..aa8cb10b8 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java
@@ -64,7 +64,12 @@ public class IAPMessageService {
         msg.add(MarkdownMessage.getReferenceText("退款人訂單金額：" + BigDecimal.valueOf(chargeRecord.getAmount()).divide(Constant.HUNDRED, 2, RoundingMode.HALF_DOWN)));
         msg.add(MarkdownMessage.getReferenceText("退款訂單的充值時間：" + DateTimeUtil.convertDate(chargeRecord.getCreateTime())));
         msg.add(MarkdownMessage.getReferenceText("退款訂單的退款時間：" + DateTimeUtil.convertDate(refundTime)));
+
         Long totalSendGiftValue = iosPayMapper.calSendGiftTotalBetweenQueryTime(uid, chargeRecord.getCreateTime(), refundTime);
+        if (null == totalSendGiftValue){
+            totalSendGiftValue = 0L;
+        }
+
         msg.add(MarkdownMessage.getReferenceText("訂單充值時間到退款時間退款人刷禮總額：" + totalSendGiftValue));
         List<IOSRefundGiftStatDTO> listSendGiftTop3 = iosPayMapper.listSendGiftTop3(uid, chargeRecord.getCreateTime(), refundTime);
         List<IOSRefundGiftStatDTO.IOSRefundSendGiftNotifyDTO> top3 = new ArrayList<>();
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/payment/GooglePlayRefundService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/payment/GooglePlayRefundService.java
index 1ebf0b69a..1af23ac1c 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/payment/GooglePlayRefundService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/payment/GooglePlayRefundService.java
@@ -236,8 +236,14 @@ public class GooglePlayRefundService {
         msg.add(MarkdownMessage.getReferenceText("退款人訂單金額：" + BigDecimal.valueOf(chargeRecord.getAmount()).divide(Constant.HUNDRED, 2, RoundingMode.HALF_DOWN)));
         msg.add(MarkdownMessage.getReferenceText("退款訂單的充值時間：" + DateTimeUtil.convertDate(chargeRecord.getCreateTime())));
         msg.add(MarkdownMessage.getReferenceText("退款訂單的退款時間：" + DateTimeUtil.convertDate(refundTime)));
+
         Long totalSendGiftValue = iosPayMapper.calSendGiftTotalBetweenQueryTime(uid, chargeRecord.getCreateTime(), refundTime);
+        if (null == totalSendGiftValue){
+            totalSendGiftValue = 0L;
+        }
+
         msg.add(MarkdownMessage.getReferenceText("訂單充值時間到退款時間退款人刷禮總額：" + totalSendGiftValue));
+
         List<IOSRefundGiftStatDTO> listSendGiftTop3 = iosPayMapper.listSendGiftTop3(uid, chargeRecord.getCreateTime(), refundTime);
         List<IOSRefundGiftStatDTO.IOSRefundSendGiftNotifyDTO> top3 = new ArrayList<>();
         if (!CollectionUtils.isEmpty(listSendGiftTop3)) {
diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/IOSPayMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/IOSPayMapper.xml
index bd81b7f9b..dfdf25a90 100644
--- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/IOSPayMapper.xml
+++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/IOSPayMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.accompany.business.mybatismapper.iospay.IOSPayMapper">
     <select id="calSendGiftTotalBetweenQueryTime" resultType="java.lang.Long">
-        select ifnull(sum(total_gold_num), 0) from gift_send_record where uid = #{uid}
+        select sum(total_gold_num) from gift_send_record where uid = #{uid}
         and create_time between #{startTime} and #{endTime}
     </select>
     <select id="listSendGiftTop3" resultType="com.accompany.business.dto.iospay.IOSRefundGiftStatDTO">