BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 78275a165ace2cb98766ae274ada5d039579fd80

Authored by 芋道源码
Committed by Gitee
2 parents 6e404697 65059065

!131 【支付模块】微信native支付【BUG修复】 微信支付 修改时间 格式 yyyyMMddHHmmss 修改为 yyyy-MM-dd'T'HH:mm:ssXXX 

Merge pull request !131 from zwy/master
Inline Side-by-side
Showing 5 changed files with 164 additions and 4 deletions
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java
  View file @78275a1
... ... @@ -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/alipay/AbstractAlipayClient.java
  View file @78275a1
... ... @@ -18,6 +18,7 @@ import lombok.SneakyThrows;
18 18 import lombok.extern.slf4j.Slf4j;
19 19  
20 20 import java.nio.charset.StandardCharsets;
  21 +import java.util.HashMap;
21 22 import java.util.Map;
22 23  
23 24 import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
... ... @@ -54,7 +55,8 @@ public abstract class AbstractAlipayClient extends AbstractPayClient&lt;AlipayPayCl
54 55 */
55 56 @Override
56 57 public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws Exception {
57   - Map<String, String> params = data.getParams();
  58 + Map<String, String> params = strToMap(data.getBody());
  59 +
58 60 return PayOrderNotifyRespDTO.builder().orderExtensionNo(params.get("out_trade_no"))
59 61 .channelOrderNo(params.get("trade_no")).channelUserId(params.get("seller_id"))
60 62 .tradeStatus(params.get("trade_status"))
... ... @@ -64,7 +66,7 @@ public abstract class AbstractAlipayClient extends AbstractPayClient&lt;AlipayPayCl
64 66  
65 67 @Override
66 68 public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
67   - Map<String, String> params = notifyData.getParams();
  69 + Map<String, String> params = strToMap(notifyData.getBody());
68 70 PayRefundNotifyDTO notifyDTO = PayRefundNotifyDTO.builder().channelOrderNo(params.get("trade_no"))
69 71 .tradeNo(params.get("out_trade_no"))
70 72 .reqNo(params.get("out_biz_no"))
... ... @@ -128,4 +130,17 @@ public abstract class AbstractAlipayClient extends AbstractPayClient&lt;AlipayPayCl
128 130 }
129 131 }
130 132  
  133 + public static Map<String, String> strToMap(String s) {
  134 + Map<String, String> stringStringMap = new HashMap<>();
  135 + //调整时间格式
  136 + String s3 = s.replaceAll("%3A", ":");
  137 + //获取map
  138 + String s4 = s3.replace("+", " ");
  139 + String[] split = s4.split("&");
  140 + for (String s1 : split) {
  141 + String[] split1 = s1.split("=");
  142 + stringStringMap.put(split1[0], split1[1]);
  143 + }
  144 + return stringStringMap;
  145 + }
131 146 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java 0 → 100644
  View file @78275a1
  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 +@Slf4j
  33 +public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> {
  34 + private WxPayService client;
  35 +
  36 + public WXNativePayClient(Long channelId, WXPayClientConfig config) {
  37 + super(channelId, PayChannelEnum.WX_NATIVE.getCode(), config, new WXCodeMapping());
  38 + }
  39 +
  40 + @Override
  41 + protected void doInit() {
  42 + WxPayConfig payConfig = new WxPayConfig();
  43 + BeanUtil.copyProperties(config, payConfig, "keyContent");
  44 + payConfig.setTradeType(WxPayConstants.TradeType.NATIVE); // 设置使用 native 支付方式
  45 +// if (StrUtil.isNotEmpty(config.getKeyContent())) {
  46 +// payConfig.setKeyContent(config.getKeyContent().getBytes(StandardCharsets.UTF_8));
  47 +// }
  48 + if (StrUtil.isNotEmpty(config.getPrivateKeyContent())) {
  49 + // weixin-pay-java 存在 BUG，无法直接设置内容，所以创建临时文件来解决
  50 + payConfig.setPrivateKeyPath(FileUtils.createTempFile(config.getPrivateKeyContent()).getPath());
  51 + }
  52 + if (StrUtil.isNotEmpty(config.getPrivateCertContent())) {
  53 + // weixin-pay-java 存在 BUG，无法直接设置内容，所以创建临时文件来解决
  54 + payConfig.setPrivateCertPath(FileUtils.createTempFile(config.getPrivateCertContent()).getPath());
  55 + }
  56 + // 真实客户端
  57 + this.client = new WxPayServiceImpl();
  58 + client.setConfig(payConfig);
  59 + }
  60 +
  61 + @Override
  62 + public PayCommonResult<String> doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) {
  63 + // 这里原生的返回的是支付的 url 所以直接使用string接收
  64 + //"invokeResponse": "weixin://wxpay/bizpayurl?pr=EGYAem7zz"
  65 + String responseV3;
  66 + try {
  67 + switch (config.getApiVersion()) {
  68 + case WXPayClientConfig.API_VERSION_V2:
  69 + responseV3 = unifiedOrderV2(reqDTO).getCodeUrl();
  70 + break;
  71 + case WXPayClientConfig.API_VERSION_V3:
  72 + responseV3 = this.unifiedOrderV3(reqDTO);
  73 + break;
  74 + default:
  75 + throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
  76 + }
  77 + } catch (WxPayException e) {
  78 + log.error("[unifiedOrder][request({}) 发起支付失败，原因({})]", toJsonString(reqDTO), e);
  79 + return PayCommonResult.build(ObjectUtils.defaultIfNull(e.getErrCode(), e.getReturnCode(), "CustomErrorCode"),
  80 + ObjectUtils.defaultIfNull(e.getErrCodeDes(), e.getCustomErrorMsg()), null, codeMapping);
  81 + }
  82 + return PayCommonResult.build(CODE_SUCCESS, MESSAGE_SUCCESS, responseV3, codeMapping);
  83 + }
  84 +
  85 + private WxPayNativeOrderResult unifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
  86 + //前端
  87 + String trade_type = reqDTO.getChannelExtras().get("trade_type");
  88 + // 构建 WxPayUnifiedOrderRequest 对象
  89 + WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest
  90 + .newBuilder()
  91 + .outTradeNo(reqDTO.getMerchantOrderId())
  92 + .body(reqDTO.getBody())
  93 + .totalFee(reqDTO.getAmount().intValue()) // 单位分
  94 + .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
  95 + .spbillCreateIp(reqDTO.getUserIp())
  96 + .notifyUrl(reqDTO.getNotifyUrl())
  97 + .productId(trade_type)
  98 + .build();
  99 + // 执行请求
  100 + return client.createOrder(request);
  101 + }
  102 +
  103 + private String unifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
  104 + // 构建 WxPayUnifiedOrderRequest 对象
  105 + WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
  106 + request.setOutTradeNo(reqDTO.getMerchantOrderId());
  107 + request.setDescription(reqDTO.getBody());
  108 + request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getAmount().intValue())); // 单位分
  109 + request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp()));
  110 + request.setNotifyUrl(reqDTO.getNotifyUrl());
  111 + // 执行请求
  112 +// log.info("支付字段request:{}",request.getTimeExpire());
  113 +
  114 + return client.createOrderV3(TradeTypeEnum.NATIVE, request);
  115 + }
  116 +
  117 +
  118 + @Override
  119 + public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException {
  120 + WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody());
  121 + Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS");
  122 + // 转换结果
  123 + return PayOrderNotifyRespDTO.builder().orderExtensionNo(notifyResult.getOutTradeNo())
  124 + .channelOrderNo(notifyResult.getTransactionId()).channelUserId(notifyResult.getOpenid())
  125 + .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
  126 + .data(data.getBody()).build();
  127 + }
  128 +
  129 + @Override
  130 + public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
  131 + //TODO 需要实现
  132 + throw new UnsupportedOperationException("需要实现");
  133 + }
  134 +
  135 +
  136 + @Override
  137 + protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable {
  138 + //TODO 需要实现
  139 + throw new UnsupportedOperationException();
  140 + }
  141 +}
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java
  View file @78275a1
... ... @@ -98,7 +98,7 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
98 98 // TODO 芋艿：貌似没 title？
99 99 .body(reqDTO.getBody())
100 100 .totalFee(reqDTO.getAmount().intValue()) // 单位分
101   - .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss"))
  101 + .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
102 102 .spbillCreateIp(reqDTO.getUserIp())
103 103 .openid(getOpenid(reqDTO))
104 104 .notifyUrl(reqDTO.getNotifyUrl())
... ... @@ -114,7 +114,7 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
114 114 // TODO 芋艿：貌似没 title？
115 115 request.setDescription(reqDTO.getBody());
116 116 request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getAmount().intValue())); // 单位分
117   - request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss"));
  117 + request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"));
118 118 request.setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(getOpenid(reqDTO)));
119 119 request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp()));
120 120 request.setNotifyUrl(reqDTO.getNotifyUrl());
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelEnum.java
  View file @78275a1
... ... @@ -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),
... ...