记得上下班打卡 | git大法好,push需谨慎

Commit 896a4de4 authored by 胡佳晨's avatar 胡佳晨

修改 下单接口 支持 新小程序支付

parent f36a2319
...@@ -414,7 +414,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -414,7 +414,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
httpData.add("expireTime", "5"); httpData.add("expireTime", "5");
httpData.add("payType", nftOrder.getPayType()); httpData.add("payType", nftOrder.getPayType());
httpData.add("deviceFrom", nftOrder.getDeviceFrom()); httpData.add("deviceFrom", nftOrder.getDeviceFrom());
if (nftOrder.getDeviceFrom().equals("js") || nftOrder.getDeviceFrom().equals("applet")) { if (nftOrder.getDeviceFrom().equals("js") || nftOrder.getDeviceFrom().equals("applet") || nftOrder.getDeviceFrom().equals("appletb")) {
httpData.add("openId", payParam.getOpenId()); httpData.add("openId", payParam.getOpenId());
} }
httpData.add("showUrl", showUrl); httpData.add("showUrl", showUrl);
......
...@@ -434,7 +434,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -434,7 +434,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
if (preParam.getDeviceFrom().equals("micropay")) { if (preParam.getDeviceFrom().equals("micropay")) {
httpData.add("authCode", preParam.getAuthCode()); httpData.add("authCode", preParam.getAuthCode());
} }
if (preParam.getDeviceFrom().equals("js") || preParam.getDeviceFrom().equals("applet")) { if (preParam.getDeviceFrom().equals("js") || preParam.getDeviceFrom().equals("applet") || preParam.getDeviceFrom().equals("appletb")) {
httpData.add("openId", preParam.getOpenId()); httpData.add("openId", preParam.getOpenId());
} }
// if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) { // if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) {
...@@ -698,7 +698,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -698,7 +698,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
httpData.add("payType", param.getPayType()); httpData.add("payType", param.getPayType());
httpData.add("deviceFrom", param.getDeviceFrom()); httpData.add("deviceFrom", param.getDeviceFrom());
if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet")) { if (param.getDeviceFrom().equals("js") || param.getDeviceFrom().equals("applet")|| param.getDeviceFrom().equals("appletb")) {
httpData.add("openId", param.getOpenId()); httpData.add("openId", param.getOpenId());
} }
// if (param.getPayType().equals("alipay") && param.getDeviceFrom().equals("wap")) { // if (param.getPayType().equals("alipay") && param.getDeviceFrom().equals("wap")) {
......
...@@ -637,7 +637,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -637,7 +637,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData.add("expireTime", (orderTickets.getPayCountdownMinute()) + ""); httpData.add("expireTime", (orderTickets.getPayCountdownMinute()) + "");
httpData.add("payType", payOrderParam.getPayType()); httpData.add("payType", payOrderParam.getPayType());
httpData.add("deviceFrom", payOrderParam.getDeviceFrom()); httpData.add("deviceFrom", payOrderParam.getDeviceFrom());
if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet")) { if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet") || payOrderParam.getDeviceFrom().equals("appletb")) {
httpData.add("openId", payOrderParam.getOpenId()); httpData.add("openId", payOrderParam.getOpenId());
} }
if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) { if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
...@@ -766,7 +766,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -766,7 +766,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData.add("payType", payAgainParam.getPayType()); httpData.add("payType", payAgainParam.getPayType());
httpData.add("deviceFrom", payAgainParam.getDeviceFrom()); httpData.add("deviceFrom", payAgainParam.getDeviceFrom());
if (payAgainParam.getDeviceFrom().equals("js") || payAgainParam.getDeviceFrom().equals("applet")) { if (payAgainParam.getDeviceFrom().equals("js") || payAgainParam.getDeviceFrom().equals("applet") || payAgainParam.getDeviceFrom().equals("appletb")) {
httpData.add("openId", payAgainParam.getOpenId()); httpData.add("openId", payAgainParam.getOpenId());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment