From 9267f497c229d8f22a7869b8fc9ca54c32185e72 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 31 Mar 2023 17:47:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4H5=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/common/plugin/wechat/WxPayDriver.java | 7 +++++-- .../main/java/com/mdd/front/controller/PayController.java | 4 ++-- .../java/com/mdd/front/service/impl/PayServiceImpl.java | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java index aaabfb15..f4d7eac2 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java @@ -55,7 +55,7 @@ public class WxPayDriver { * @return WxPayUnifiedOrderV3Result.JsapiResult * @throws Exception 异常 */ - public static WxPayUnifiedOrderV3Result.JsapiResult unifiedOrder(PaymentRequestV3 requestV3) throws Exception { + public static Object unifiedOrder(PaymentRequestV3 requestV3) throws Exception { // 订单参数 Integer terminal = requestV3.getTerminal(); String openId = requestV3.getOpenId(); @@ -88,7 +88,10 @@ public class WxPayDriver { payer.setOpenid(openId); // H5平台 + TradeTypeEnum tradeTypeEnum = TradeTypeEnum.JSAPI; + if (terminal == ClientEnum.H5.getCode()) { + tradeTypeEnum = TradeTypeEnum.H5; WxPayUnifiedOrderV3Request.SceneInfo sceneInfo = new WxPayUnifiedOrderV3Request.SceneInfo(); WxPayUnifiedOrderV3Request.H5Info h5Info = new WxPayUnifiedOrderV3Request.H5Info(); h5Info.setType(RequestUtils.device()); @@ -100,7 +103,7 @@ public class WxPayDriver { // 发起订单 WxPayService wxPayService = WxPayDriver.handler(terminal); wxPayUnifiedOrderV3Request.setPayer(payer); - return wxPayService.createOrderV3(TradeTypeEnum.JSAPI, wxPayUnifiedOrderV3Request); + return wxPayService.createOrderV3(tradeTypeEnum, wxPayUnifiedOrderV3Request); } /** diff --git a/server/like-front/src/main/java/com/mdd/front/controller/PayController.java b/server/like-front/src/main/java/com/mdd/front/controller/PayController.java index e51d7c18..6d3c4b81 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/PayController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/PayController.java @@ -50,8 +50,8 @@ public class PayController { @GetMapping("/payStatus") @ApiOperation(("支付状态")) - public AjaxResult payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from, - @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) { + public AjaxResult payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from, + @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) { PayStatusVo vo = iPayService.payStatus(from, orderId); return AjaxResult.success(vo); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index ee2f706f..9c8cce29 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -1,6 +1,7 @@ package com.mdd.front.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; import com.mdd.common.entity.RechargeOrder; import com.mdd.common.entity.setting.DevPayConfig; import com.mdd.common.entity.setting.DevPayWay;