Merge branch 'dev' into 'mp-server-test'

同步跳转参数

See merge request quanshu/mp-server!1045

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -173,9 +173,11 @@ public class WalletServiceImpl implements IWalletService {
     String orderId = String.valueOf(bizIdGenerator.newId());
     String tradeNo = DateUtil.getDateNowYmd() + DateUtil.getRandom(14);
     // 返回页面拼接
+
+    String returnUrl = ysReturnUrl;
     if (BizTypeEnum.TICKET_ORDER.equals(bizType)) {
       UserTicketOrder userTicketOrder = userTicketOrderService.getById(bizId);
-      ysReturnUrl = ysReturnUrl + "?boxId=" + userTicketOrder.getBoxId() + "&orderId=" + bizId + "&istry=0";
+      returnUrl = returnUrl + "?boxId=" + userTicketOrder.getBoxId() + "&orderId=" + bizId + "&istry=0";
     }
     params.put("method", YsPayMethodConstants.H5_PAY_METHOD);
     params.put("partner_id", partnerId);
@@ -183,7 +185,7 @@ public class WalletServiceImpl implements IWalletService {
     params.put("charset", Constants.CHARSET_UTF_8);
     params.put("sign_type", "RSA");
     params.put("notify_url", ysPayNotifyUrl);
-    params.put("return_url", ysReturnUrl);
+    params.put("return_url", returnUrl);
     params.put("seller_id", partnerId);
     params.put("version","3.0");
     params.put("out_trade_no", tradeNo);