mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整H5支付

This commit is contained in:
TinyAnts 2023-03-31 17:47:48 +08:00
parent e889caf07c
commit 9267f497c2
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxPayDriver.java
View File

@ -55,7 +55,7 @@ public class WxPayDriver {
* @return WxPayUnifiedOrderV3Result.JsapiResult * @return WxPayUnifiedOrderV3Result.JsapiResult
* @throws Exception 异常 * @throws Exception 异常
*/ */
public static WxPayUnifiedOrderV3Result.JsapiResult unifiedOrder(PaymentRequestV3 requestV3) throws Exception { public static Object unifiedOrder(PaymentRequestV3 requestV3) throws Exception {
// 订单参数 // 订单参数
Integer terminal = requestV3.getTerminal(); Integer terminal = requestV3.getTerminal();
String openId = requestV3.getOpenId(); String openId = requestV3.getOpenId();
@ -88,7 +88,10 @@ public class WxPayDriver {
payer.setOpenid(openId); payer.setOpenid(openId);
// H5平台 // H5平台
TradeTypeEnum tradeTypeEnum = TradeTypeEnum.JSAPI;
if (terminal == ClientEnum.H5.getCode()) { if (terminal == ClientEnum.H5.getCode()) {
tradeTypeEnum = TradeTypeEnum.H5;
WxPayUnifiedOrderV3Request.SceneInfo sceneInfo = new WxPayUnifiedOrderV3Request.SceneInfo(); WxPayUnifiedOrderV3Request.SceneInfo sceneInfo = new WxPayUnifiedOrderV3Request.SceneInfo();
WxPayUnifiedOrderV3Request.H5Info h5Info = new WxPayUnifiedOrderV3Request.H5Info(); WxPayUnifiedOrderV3Request.H5Info h5Info = new WxPayUnifiedOrderV3Request.H5Info();
h5Info.setType(RequestUtils.device()); h5Info.setType(RequestUtils.device());
@ -100,7 +103,7 @@ public class WxPayDriver {
// 发起订单 // 发起订单
WxPayService wxPayService = WxPayDriver.handler(terminal); WxPayService wxPayService = WxPayDriver.handler(terminal);
wxPayUnifiedOrderV3Request.setPayer(payer); wxPayUnifiedOrderV3Request.setPayer(payer);
return wxPayService.createOrderV3(TradeTypeEnum.JSAPI, wxPayUnifiedOrderV3Request); return wxPayService.createOrderV3(tradeTypeEnum, wxPayUnifiedOrderV3Request);
} }
/** /**

4
server/like-front/src/main/java/com/mdd/front/controller/PayController.java
View File

@ -50,8 +50,8 @@ public class PayController {
@GetMapping("/payStatus") @GetMapping("/payStatus")
@ApiOperation(("支付状态")) @ApiOperation(("支付状态"))
public AjaxResult<Object> payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from, public AjaxResult<PayStatusVo> payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from,
@Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) { @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) {
PayStatusVo vo = iPayService.payStatus(from, orderId); PayStatusVo vo = iPayService.payStatus(from, orderId);
return AjaxResult.success(vo); return AjaxResult.success(vo);
} }

1
server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.mdd.front.service.impl; package com.mdd.front.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.RechargeOrder;
import com.mdd.common.entity.setting.DevPayConfig; import com.mdd.common.entity.setting.DevPayConfig;
import com.mdd.common.entity.setting.DevPayWay; import com.mdd.common.entity.setting.DevPayWay;