Merge remote-tracking branch 'origin/dev' into dev

daxpay-open-channel/daxpay-open-channel-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/payment/callback/WechatPayCallbackService.java

@@ -73,7 +73,7 @@ public class WechatPayCallbackService {
         callbackInfo.setCallbackType(TradeTypeEnum.PAY)
                 .setChannel(isv? ChannelEnum.WECHAT_ISV.getCode():ChannelEnum.WECHAT.getCode());
 
-        WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(false);
+        WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(isv);
         WxPayService wxPayService = wechatPayConfigService.wxJavaSdk(config);
         // v2 或 v3
         if (Objects.equals(config.getApiVersion(), WechatPayCode.API_V2)) {

daxpay-open-channel/daxpay-open-channel-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/payment/callback/WechatRefundCallbackService.java

@@ -75,7 +75,7 @@ public class WechatRefundCallbackService {
         callbackInfo.setCallbackType(TradeTypeEnum.REFUND)
                 .setChannel(isv? ChannelEnum.WECHAT_ISV.getCode():ChannelEnum.WECHAT.getCode());
 
-        WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(false);
+        WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(isv);
         WxPayService wxPayService = wechatPayConfigService.wxJavaSdk(config);
         // v2 或 v3
         if (Objects.equals(config.getApiVersion(), WechatPayCode.API_V2)) {

daxpay-open-channel/daxpay-open-channel-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/payment/callback/WechatTransferCallbackService.java

@@ -66,7 +66,7 @@ public class WechatTransferCallbackService {
         CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
         callbackInfo.setChannel(isv? ChannelEnum.WECHAT_ISV.getCode():ChannelEnum.WECHAT.getCode())
                 .setCallbackType(TradeTypeEnum.TRANSFER);
-        WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(false);
+        WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(isv);
         WxPayService wxPayService = wechatPayConfigService.wxJavaSdk(config);
         // V3 回调接收处理
         String body = JakartaServletUtil.getBody(request);

daxpay-open-channel/daxpay-open-channel-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/payment/refund/WechatSubRefundV3Service.java

@@ -1,5 +1,6 @@
 package org.dromara.daxpay.channel.wechat.service.payment.refund;
 
+import cn.hutool.core.util.StrUtil;
 import org.dromara.daxpay.channel.wechat.entity.config.WechatPayConfig;
 import org.dromara.daxpay.channel.wechat.enums.WechatRefundStatusEnum;
 import org.dromara.daxpay.channel.wechat.service.payment.config.WechatPayConfigService;
@@ -48,6 +49,9 @@ public class WechatSubRefundV3Service {
                 .setOutTradeNo(refundOrder.getOrderNo())
                 .setAmount(amount)
                 .setSubMchid(config.getSubMchId());
+        if (StrUtil.isBlank(request.getReason())){
+            request.setReason("退款");
+        }
         try {
             WxPayRefundV3Result result = wxPayService.refundV3(request);
 

daxpay-open/daxpay-open-core/src/main/java/org/dromara/daxpay/core/result/DaxResult.java

@@ -1,10 +1,8 @@
 package org.dromara.daxpay.core.result;
 
-import cn.bootx.platform.core.code.CommonCode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.slf4j.MDC;
 
 import java.time.LocalDateTime;
 
@@ -35,11 +33,11 @@ public class DaxResult<T>{
     private String sign;
 
     @Schema(description = "响应时间")
-    private LocalDateTime resTime = LocalDateTime.now();
+    private LocalDateTime resTime;
 
     /** 追踪ID */
     @Schema(description = "追踪ID")
-    private String traceId = MDC.get(CommonCode.TRACE_ID);
+    private String traceId;
 
     public DaxResult(int successCode, T data, String msg) {
         this.code = successCode;

daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/common/aop/PaymentVerifyAspect.java

@@ -1,5 +1,6 @@
 package org.dromara.daxpay.service.common.aop;
 
+import cn.bootx.platform.core.code.CommonCode;
 import cn.bootx.platform.core.exception.BizException;
 import cn.bootx.platform.core.exception.ValidationFailedException;
 import cn.bootx.platform.core.util.ValidationUtil;
@@ -12,9 +13,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.MDC;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 /**
  * 支付签名切面, 用于对支付参数进行校验和签名
  * 执行顺序: 过滤器 -> 拦截器 -> 切面 -> 方法
@@ -60,6 +64,8 @@ public class PaymentVerifyAspect {
             proceed = pjp.proceed();
         } catch (BizException ex) {
             DaxResult<Void> result = new DaxResult<>(ex.getCode(), ex.getMessage());
+            result.setTraceId(MDC.get(CommonCode.TRACE_ID));
+            result.setResTime(LocalDateTime.now());
             paymentAssistService.sign(result);
             return result;
         }

daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackSendService.java

@@ -1,7 +1,14 @@
 package org.dromara.daxpay.service.service.notice.callback;
 
+import cn.bootx.platform.core.code.CommonCode;
 import cn.bootx.platform.core.util.JsonUtil;
 import cn.bootx.platform.starter.redis.delay.service.DelayJobService;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.ContentType;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.daxpay.core.result.DaxNoticeResult;
 import org.dromara.daxpay.service.code.DaxPayCode;
 import org.dromara.daxpay.service.dao.notice.callback.MerchantCallbackRecordManager;
@@ -11,12 +18,7 @@ import org.dromara.daxpay.service.entity.notice.callback.MerchantCallbackTask;
 import org.dromara.daxpay.service.enums.NoticeSendTypeEnum;
 import org.dromara.daxpay.service.service.assist.PaymentAssistService;
 import org.dromara.daxpay.service.service.notice.MerchantNoticeAssistService;
-import cn.hutool.core.util.StrUtil;
+import org.slf4j.MDC;
-import cn.hutool.http.ContentType;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -62,6 +64,8 @@ public class MerchantCallbackSendService {
             // 构造通知消息并签名
             var daxResult = new DaxNoticeResult<Map<String, Object>>(SUCCESS_CODE, JsonUtil.parseObj(task.getContent()), SUCCESS_MSG)
                     .setAppId(task.getAppId());
+            daxResult.setTraceId(MDC.get(CommonCode.TRACE_ID));
+            daxResult.setResTime(LocalDateTime.now());
             paymentAssistService.sign(daxResult);
             HttpResponse execute = HttpUtil.createPost(task.getUrl())
                     .body(JsonUtil.toJsonStr(daxResult), ContentType.JSON.getValue())

daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifySendService.java

@@ -1,5 +1,6 @@
 package org.dromara.daxpay.service.service.notice.notify;
 
+import cn.bootx.platform.core.code.CommonCode;
 import cn.bootx.platform.core.util.JsonUtil;
 import cn.bootx.platform.starter.redis.delay.service.DelayJobService;
 import org.dromara.daxpay.core.enums.MerchantNotifyTypeEnum;
@@ -20,6 +21,7 @@ import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -70,6 +72,8 @@ public class MerchantNotifySendService {
             var daxResult = new DaxNoticeResult<Map<String, Object>>(SUCCESS_CODE, JsonUtil.parseObj(task.getContent()), SUCCESS_MSG)
                     .setAppId(task.getAppId())
                     .setNoticeType(task.getNotifyType());
+            daxResult.setTraceId(MDC.get(CommonCode.TRACE_ID));
+            daxResult.setResTime(LocalDateTime.now());
             paymentAssistService.sign(daxResult);
 
             HttpResponse execute = HttpUtil.createPost(url)