From 89598da689214657b2f749b8f00d025126ae4d29 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Fri, 31 Mar 2023 18:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86H5=E7=AB=AF=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdd/front/service/impl/PayServiceImpl.java    | 15 ++++++++++++---
 .../com/mdd/front/validate/PaymentValidate.java   |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

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 9c8cce29..2660d35f 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
@@ -7,6 +7,7 @@ import com.mdd.common.entity.setting.DevPayConfig;
 import com.mdd.common.entity.setting.DevPayWay;
 import com.mdd.common.entity.user.User;
 import com.mdd.common.entity.user.UserAuth;
+import com.mdd.common.enums.ClientEnum;
 import com.mdd.common.enums.LogMoneyEnum;
 import com.mdd.common.enums.PaymentEnum;
 import com.mdd.common.exception.OperateException;
@@ -28,11 +29,10 @@ import com.mdd.front.vo.pay.PayWayListVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -168,6 +168,15 @@ public class PayServiceImpl implements IPayService {
                     requestV3.setOutTradeNo(params.getOutTradeNo());
                     requestV3.setOrderAmount(params.getOrderAmount());
                     requestV3.setDescription(params.getDescription());
+                    Object result = WxPayDriver.unifiedOrder(requestV3);
+                    if (terminal == ClientEnum.H5.getCode()) {
+                        Assert.notNull(params.getRedirectUrl(), "redirectUrl参数缺失");
+                        Map<String, String> map = new LinkedHashMap<>();
+                        String h5Url = result.toString();
+                        h5Url += "&showCheck=true&scene="+params.getAttach()+"&redirect_url="+params.getRedirectUrl();
+                        map.put("url", h5Url);
+                        return map;
+                    }
                     return WxPayDriver.unifiedOrder(requestV3);
             }
         } catch (Exception e) {
diff --git a/server/like-front/src/main/java/com/mdd/front/validate/PaymentValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/PaymentValidate.java
index 88a30119..292ad037 100644
--- a/server/like-front/src/main/java/com/mdd/front/validate/PaymentValidate.java
+++ b/server/like-front/src/main/java/com/mdd/front/validate/PaymentValidate.java
@@ -26,6 +26,9 @@ public class PaymentValidate implements Serializable {
     @ApiModelProperty("订单ID")
     private Integer orderId;
 
+    @ApiModelProperty(value = "重定向链接: H5端需要")
+    private String redirectUrl;
+
     @ApiModelProperty(value = "用户ID", notes = "该参数无需传递")
     private Integer userId;