|
@ -1,20 +1,17 @@ |
|
|
package com.gxwebsoft.shop.service.impl; |
|
|
package com.gxwebsoft.shop.service.impl; |
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
import cn.hutool.core.date.DateUtil; |
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
import com.gxwebsoft.common.core.config.ConfigProperties; |
|
|
import com.gxwebsoft.common.core.config.ConfigProperties; |
|
|
import com.gxwebsoft.common.core.config.CertificateProperties; |
|
|
import com.gxwebsoft.common.core.config.CertificateProperties; |
|
|
import com.gxwebsoft.common.core.exception.BusinessException; |
|
|
|
|
|
import com.gxwebsoft.common.core.utils.RedisUtil; |
|
|
import com.gxwebsoft.common.core.utils.RedisUtil; |
|
|
import com.gxwebsoft.common.core.utils.CertificateLoader; |
|
|
import com.gxwebsoft.common.core.utils.CertificateLoader; |
|
|
import com.gxwebsoft.common.core.service.PaymentCacheService; |
|
|
import com.gxwebsoft.common.core.service.PaymentCacheService; |
|
|
import com.gxwebsoft.common.core.utils.WechatPayDiagnostic; |
|
|
import com.gxwebsoft.common.core.utils.WechatPayDiagnostic; |
|
|
import com.gxwebsoft.common.system.entity.Payment; |
|
|
import com.gxwebsoft.common.system.entity.Payment; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import com.gxwebsoft.common.system.param.PaymentParam; |
|
|
|
|
|
import com.gxwebsoft.common.system.service.PaymentService; |
|
|
import com.gxwebsoft.common.system.service.PaymentService; |
|
|
import com.gxwebsoft.common.system.service.SettingService; |
|
|
import com.gxwebsoft.common.system.service.SettingService; |
|
|
import com.gxwebsoft.shop.entity.ShopOrderGoods; |
|
|
import com.gxwebsoft.shop.entity.ShopOrderGoods; |
|
@ -156,6 +153,7 @@ import com.gxwebsoft.common.core.service.PaymentCacheService; |
|
|
// 后台配置的回调地址
|
|
|
// 后台配置的回调地址
|
|
|
if (StrUtil.isNotBlank(payment.getNotifyUrl())) { |
|
|
if (StrUtil.isNotBlank(payment.getNotifyUrl())) { |
|
|
request.setNotifyUrl(payment.getNotifyUrl().concat("/").concat(order.getTenantId().toString())); |
|
|
request.setNotifyUrl(payment.getNotifyUrl().concat("/").concat(order.getTenantId().toString())); |
|
|
|
|
|
System.out.println("后台配置的回调地址 = " + request.getNotifyUrl()); |
|
|
} |
|
|
} |
|
|
System.out.println("=== 发起微信支付请求 ==="); |
|
|
System.out.println("=== 发起微信支付请求 ==="); |
|
|
System.out.println("请求参数: " + request); |
|
|
System.out.println("请求参数: " + request); |
|
|