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 listSendGiftTop3 = iosPayMapper.listSendGiftTop3(uid, chargeRecord.getCreateTime(), refundTime); List 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 listSendGiftTop3 = iosPayMapper.listSendGiftTop3(uid, chargeRecord.getCreateTime(), refundTime); List 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 @@