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

Commit a7c402d6 authored by 胡佳晨's avatar 胡佳晨

修改 下单 获取 用户信息失败逻辑 返回库存不足,不能上线 目前 userVo 必定 == null 为了复现bug

parent 949b22e4
......@@ -185,15 +185,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
addressId = payOrderParam.getAddressId();
}
AdamRscPolymer01Vo userVo = orderUtils.adamAddressEnterMember(uid, enterIds, addressId);
userVo = null;
List<AdamEntersVo> entersVos;
AdamAddressesVo addressesVo;
boolean isMember;
boolean isOldMember;
if (userVo == null) {
isMember = false;
isOldMember = false;
addressesVo = null;
entersVos = new ArrayList();
// isMember = false;
// isOldMember = false;
// addressesVo = null;
// entersVos = new ArrayList();
return ResponseDto.failure(ErrorMapping.get("20016"));
} else {
entersVos = userVo.getEntersVos();
addressesVo = userVo.getAddressesVo();
......@@ -643,11 +645,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData.add("showUrl", payOrderParam.getShowUrl() + orderTicketId);
httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId);
}
if(payOrderParam.getPayType().equals("douyinpay")){
if (payOrderParam.getPayType().equals("douyinpay")) {
httpData.add("showUrl", payOrderParam.getShowUrl() + orderTicketId);
httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId);
}
if(payOrderParam.getPayType().equals("unionpay")){
if (payOrderParam.getPayType().equals("unionpay")) {
httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId);
}
log.debug("调用 DRAGON 参数 = " + httpData.toString());
......@@ -769,11 +771,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData.add("showUrl", payAgainParam.getShowUrl() + payAgainParam.getOrderId());
httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
}
if(payAgainParam.getPayType().equals("douyinpay")){
if (payAgainParam.getPayType().equals("douyinpay")) {
httpData.add("showUrl", payAgainParam.getShowUrl() + payAgainParam.getOrderId());
httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
}
if(payAgainParam.getPayType().equals("unionpay")){
if (payAgainParam.getPayType().equals("unionpay")) {
httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
}
String returnData = HttpUtil.post(payUrl, httpData);
......
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