From 96215b51f02972cdefeba0006a351340e45db4c1 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Mon, 18 Nov 2024 14:14:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E8=8C=83=E5=9B=B4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/config/MerchantNotifyConfigManager.java | 11 ++++++++++- .../service/config/MerchantNotifyConfigService.java | 6 +++--- .../notice/callback/MerchantCallbackSendService.java | 2 +- .../notice/notify/MerchantNotifyTaskService.java | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/MerchantNotifyConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/MerchantNotifyConfigManager.java index 66bcb242c..bb63acb98 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/MerchantNotifyConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/MerchantNotifyConfigManager.java @@ -1,12 +1,14 @@ package org.dromara.daxpay.service.dao.config; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import org.dromara.daxpay.service.entity.config.MerchantNotifyConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; +import org.dromara.daxpay.service.entity.config.MerchantNotifyConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; /** @@ -37,4 +39,11 @@ public class MerchantNotifyConfigManager extends BaseManager findAllByAppId(String appId) { + return findAllByField(MchAppBaseEntity::getAppId, appId); + } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/MerchantNotifyConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/MerchantNotifyConfigService.java index 22ef1982a..864290c15 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/MerchantNotifyConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/config/MerchantNotifyConfigService.java @@ -1,14 +1,14 @@ package org.dromara.daxpay.service.service.config; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.dromara.daxpay.service.common.cache.MchAppCacheService; import org.dromara.daxpay.service.dao.config.MerchantNotifyConfigManager; import org.dromara.daxpay.service.dao.constant.MerchantNotifyConstManager; import org.dromara.daxpay.service.entity.config.MerchantNotifyConfig; import org.dromara.daxpay.service.entity.constant.MerchantNotifyConst; import org.dromara.daxpay.service.result.config.MerchantNotifyConfigResult; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -37,7 +37,7 @@ public class MerchantNotifyConfigService { * 显示列表 */ public List findAllByAppId(String appId) { - var map = configManager.findAll() + var map = configManager.findAllByAppId(appId) .stream() .collect(Collectors.toMap(MerchantNotifyConfig::getCode, Function.identity(), (v1, v2) -> v1)); List costs = constManagerAll.lambdaQuery().orderByAsc(MpIdEntity::getId).list(); diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackSendService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackSendService.java index 877813e9c..94d986e38 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackSendService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackSendService.java @@ -67,7 +67,7 @@ public class MerchantCallbackSendService { .execute(); body = execute.body(); } catch (Exception e) { - log.error("发送通知失败，数据错误，任务ID：{}",task.getTradeId(),e); + log.error("发送回调失败，数据错误，任务ID：{}",task.getTradeId(),e); record.setErrorMsg(e.getMessage()); } // 如果响应值等于SUCCESS, 说明发送成功, 进行成功处理 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java index 195b9c76e..5358c149c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java @@ -44,6 +44,7 @@ public class MerchantNotifyTaskService { */ public void registerPayNotice(PayOrder order) { if (this.nonRegister(NotifyContentTypeEnum.PAY)){ + log.info("支付通知无需回调，订单号：{}",order.getOrderNo()); return; } var noticeResult = PayOrderConvert.CONVERT.toResult(order); @@ -85,6 +86,7 @@ public class MerchantNotifyTaskService { */ public void registerTransferNotice(TransferOrder order) { if (this.nonRegister(NotifyContentTypeEnum.TRANSFER)){ + log.info("转账无需回调，订单号：{}",order.getTransferNo()); return; } var noticeResult = TransferOrderConvert.CONVERT.toResult(order);