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

Commit 7920ab56 authored by 胡佳晨's avatar 胡佳晨

支付 show/return Url + orderMasterCode

parent bffb7228
...@@ -419,14 +419,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -419,14 +419,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
} }
if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) { if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) {
httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode()); httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
httpData.add("returnUrl", preParam.getReturnUrl()); httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
} }
if (preParam.getPayType().equals("douyinpay")) { if (preParam.getPayType().equals("douyinpay")) {
httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode()); httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
httpData.add("returnUrl", preParam.getReturnUrl()); httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
} }
if (preParam.getPayType().equals("unionpay")) { if (preParam.getPayType().equals("unionpay")) {
httpData.add("returnUrl", preParam.getReturnUrl()); httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
} }
String returnData = HttpUtil.post(payUrl, httpData); String returnData = HttpUtil.post(payUrl, httpData);
log.info("调用 DRAGON 结果 = " + returnData); log.info("调用 DRAGON 结果 = " + returnData);
...@@ -728,7 +728,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -728,7 +728,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
orderVo.setPaymentType(syncOrderParam.getPaymentType()); orderVo.setPaymentType(syncOrderParam.getPaymentType());
orderVo.setOrderSkuVoIds(skuList); orderVo.setOrderSkuVoIds(skuList);
redisUtils.setGoblinOrder(orderId, orderVo); redisUtils.setGoblinOrder(orderId, orderVo);
redisUtils.setOffCode(orderVo.getWriteOffCode(),orderVo.getMasterOrderCode()); redisUtils.setOffCode(orderVo.getWriteOffCode(), orderVo.getMasterOrderCode());
//删除未支付订单 //删除未支付订单
redisUtils.removeGoblinOrder(null, orderId); redisUtils.removeGoblinOrder(null, orderId);
//mongo //mongo
......
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