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

Commit 8a22b9fb authored by 胡佳晨's avatar 胡佳晨

再次支付修改

parent ca6ec4cb
...@@ -659,15 +659,15 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -659,15 +659,15 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
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")) {
httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getOrderId()); httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId()); httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
} }
if (param.getPayType().equals("douyinpay")) { if (param.getPayType().equals("douyinpay")) {
httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getOrderId()); httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId()); httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
} }
if (param.getPayType().equals("unionpay")) { if (param.getPayType().equals("unionpay")) {
httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId()); httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
} }
String returnData = HttpUtil.post(payUrl, httpData); String returnData = HttpUtil.post(payUrl, httpData);
log.debug("调用 DRAGON 结果 = " + returnData); log.debug("调用 DRAGON 结果 = " + returnData);
...@@ -680,8 +680,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -680,8 +680,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
payInnerResultVo.setOrderId(storeOrderVo.getMasterOrderCode()); payInnerResultVo.setOrderId(storeOrderVo.getMasterOrderCode());
payInnerResultVo.setPayType(param.getPayType()); payInnerResultVo.setPayType(param.getPayType());
payInnerResultVo.setPrice(price); payInnerResultVo.setPrice(price);
payInnerResultVo.setShowUrl(param.getShowUrl() + storeOrderVo.getOrderId()); payInnerResultVo.setShowUrl(param.getShowUrl() + storeOrderVo.getMasterOrderCode());
payInnerResultVo.setReturnUrl(param.getReturnUrl() + storeOrderVo.getOrderId()); payInnerResultVo.setReturnUrl(param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
//redis //redis
storeOrderVo.setPayType(param.getPayType()); storeOrderVo.setPayType(param.getPayType());
storeOrderVo.setDeviceFrom(param.getDeviceFrom()); storeOrderVo.setDeviceFrom(param.getDeviceFrom());
......
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