Commit 4a91dcb3bf798c881963383915396dbce1160dbf

Authored by zwy
1 parent d285fc14

:sparkles:

【支付模块】
添加 微信native支付
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java
... ... @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
7 7 import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig;
8 8 import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient;
9 9 import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient;
  10 +import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXNativePayClient;
10 11 import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig;
11 12 import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPubPayClient;
12 13 import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum;
... ... @@ -63,6 +64,7 @@ public class PayClientFactoryImpl implements PayClientFactory {
63 64 case WX_PUB: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config);
64 65 case WX_LITE: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config);
65 66 case WX_APP: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config);
  67 + case WX_NATIVE: return (AbstractPayClient<Config>) new WXNativePayClient(channelId, (WXPayClientConfig) config);
66 68 case ALIPAY_WAP: return (AbstractPayClient<Config>) new AlipayWapPayClient(channelId, (AlipayPayClientConfig) config);
67 69 case ALIPAY_QR: return (AbstractPayClient<Config>) new AlipayQrPayClient(channelId, (AlipayPayClientConfig) config);
68 70 case ALIPAY_APP: return (AbstractPayClient<Config>) new AlipayQrPayClient(channelId, (AlipayPayClientConfig) config);
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java 0 → 100644
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.wx;
  2 +
  3 +import cn.hutool.core.bean.BeanUtil;
  4 +import cn.hutool.core.date.DateUtil;
  5 +import cn.hutool.core.lang.Assert;
  6 +import cn.hutool.core.util.StrUtil;
  7 +import cn.iocoder.yudao.framework.common.util.io.FileUtils;
  8 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
  9 +import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult;
  10 +import cn.iocoder.yudao.framework.pay.core.client.dto.*;
  11 +import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
  12 +import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum;
  13 +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
  14 +import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
  15 +import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
  16 +import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
  17 +import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
  18 +import com.github.binarywang.wxpay.config.WxPayConfig;
  19 +import com.github.binarywang.wxpay.constant.WxPayConstants;
  20 +import com.github.binarywang.wxpay.exception.WxPayException;
  21 +import com.github.binarywang.wxpay.service.WxPayService;
  22 +import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
  23 +import lombok.extern.slf4j.Slf4j;
  24 +
  25 +import java.util.Objects;
  26 +
  27 +import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
  28 +import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS;
  29 +import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS;
  30 +
  31 +/**
  32 + * @Description: Native支付
  33 + * @author: zwy
  34 + * @date: 2022年04月18日 17:00
  35 + */
  36 +@Slf4j
  37 +public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> {
  38 + private WxPayService client;
  39 +
  40 + public WXNativePayClient(Long channelId, WXPayClientConfig config) {
  41 + super(channelId, PayChannelEnum.WX_PUB.getCode(), config, new WXCodeMapping());
  42 + }
  43 +
  44 + @Override
  45 + protected void doInit() {
  46 + WxPayConfig payConfig = new WxPayConfig();
  47 + BeanUtil.copyProperties(config, payConfig, "keyContent");
  48 + payConfig.setTradeType(WxPayConstants.TradeType.JSAPI); // 设置使用 JS API 支付方式
  49 +// if (StrUtil.isNotEmpty(config.getKeyContent())) {
  50 +// payConfig.setKeyContent(config.getKeyContent().getBytes(StandardCharsets.UTF_8));
  51 +// }
  52 + if (StrUtil.isNotEmpty(config.getPrivateKeyContent())) {
  53 + // weixin-pay-java 存在 BUG,无法直接设置内容,所以创建临时文件来解决
  54 + payConfig.setPrivateKeyPath(FileUtils.createTempFile(config.getPrivateKeyContent()).getPath());
  55 + }
  56 + if (StrUtil.isNotEmpty(config.getPrivateCertContent())) {
  57 + // weixin-pay-java 存在 BUG,无法直接设置内容,所以创建临时文件来解决
  58 + payConfig.setPrivateCertPath(FileUtils.createTempFile(config.getPrivateCertContent()).getPath());
  59 + }
  60 + // 真实客户端
  61 + this.client = new WxPayServiceImpl();
  62 + client.setConfig(payConfig);
  63 + }
  64 +
  65 + @Override
  66 + public PayCommonResult<String> doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) {
  67 + // 这里原生的返回的是支付的 url 所以直接使用string接收
  68 + //"invokeResponse": "weixin://wxpay/bizpayurl?pr=EGYAem7zz"
  69 + String responseV3;
  70 + try {
  71 + switch (config.getApiVersion()) {
  72 + case WXPayClientConfig.API_VERSION_V2:
  73 + responseV3 = unifiedOrderV2(reqDTO).getCodeUrl();
  74 + break;
  75 + case WXPayClientConfig.API_VERSION_V3:
  76 + responseV3 = this.unifiedOrderV3(reqDTO);
  77 + break;
  78 + default:
  79 + throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
  80 + }
  81 + } catch (WxPayException e) {
  82 + log.error("[unifiedOrder][request({}) 发起支付失败,原因({})]", toJsonString(reqDTO), e);
  83 + return PayCommonResult.build(ObjectUtils.defaultIfNull(e.getErrCode(), e.getReturnCode(), "CustomErrorCode"),
  84 + ObjectUtils.defaultIfNull(e.getErrCodeDes(), e.getCustomErrorMsg()), null, codeMapping);
  85 + }
  86 + return PayCommonResult.build(CODE_SUCCESS, MESSAGE_SUCCESS, responseV3, codeMapping);
  87 + }
  88 +
  89 + private WxPayNativeOrderResult unifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
  90 + //前端
  91 + String trade_type = reqDTO.getChannelExtras().get("trade_type");
  92 + // 构建 WxPayUnifiedOrderRequest 对象
  93 + WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest
  94 + .newBuilder()
  95 + .outTradeNo(reqDTO.getMerchantOrderId())
  96 + .body(reqDTO.getBody())
  97 + .totalFee(reqDTO.getAmount().intValue()) // 单位分
  98 +// .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss"))
  99 + .spbillCreateIp(reqDTO.getUserIp())
  100 + .tradeType(WxPayConstants.TradeType.NATIVE)
  101 + .notifyUrl(reqDTO.getNotifyUrl())
  102 + .productId(trade_type)
  103 + .build();
  104 + // 执行请求
  105 + return client.createOrder(request);
  106 + }
  107 +
  108 + private String unifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
  109 + // 构建 WxPayUnifiedOrderRequest 对象
  110 + WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
  111 + request.setOutTradeNo(reqDTO.getMerchantOrderId());
  112 + request.setDescription(reqDTO.getBody());
  113 + request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getAmount().intValue())); // 单位分
  114 + request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp()));
  115 + request.setNotifyUrl(reqDTO.getNotifyUrl());
  116 + // 执行请求
  117 +// log.info("支付字段request:{}",request.getTimeExpire());
  118 +
  119 + return client.createOrderV3(TradeTypeEnum.NATIVE, request);
  120 + }
  121 +
  122 +
  123 + @Override
  124 + public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException {
  125 + WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody());
  126 + Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS");
  127 + // 转换结果
  128 + return PayOrderNotifyRespDTO.builder().orderExtensionNo(notifyResult.getOutTradeNo())
  129 + .channelOrderNo(notifyResult.getTransactionId()).channelUserId(notifyResult.getOpenid())
  130 + .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"))
  131 + .data(data.getBody()).build();
  132 + }
  133 +
  134 + @Override
  135 + public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
  136 + //TODO 需要实现
  137 + throw new UnsupportedOperationException("需要实现");
  138 + }
  139 +
  140 +
  141 + @Override
  142 + protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable {
  143 + //TODO 需要实现
  144 + throw new UnsupportedOperationException();
  145 + }
  146 +}
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelEnum.java
... ... @@ -20,6 +20,8 @@ public enum PayChannelEnum {
20 20 WX_PUB("wx_pub", "微信 JSAPI 支付", WXPayClientConfig.class), // 公众号网页
21 21 WX_LITE("wx_lite", "微信小程序支付", WXPayClientConfig.class),
22 22 WX_APP("wx_app", "微信 App 支付", WXPayClientConfig.class),
  23 + WX_NATIVE("wx_native", "微信 native 支付", WXPayClientConfig.class),
  24 +
23 25  
24 26 ALIPAY_PC("alipay_pc", "支付宝 PC 网站支付", AlipayPayClientConfig.class),
25 27 ALIPAY_WAP("alipay_wap", "支付宝 Wap 网站支付", AlipayPayClientConfig.class),
... ...