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

Skip to content

L
liquidnet-bus-v1
Commit 0ee4c885 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改 添加 orderlist方法

parent b0c266a2
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 67 deletions
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @ 0ee4c885
...@@ -99,24 +99,24 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -99,24 +99,24 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
AdamRscPolymer01Vo userVo = null; AdamRscPolymer01Vo userVo = null;
if (noZhengzaiOrder(uid)) { if (noZhengzaiOrder(uid)) {
long time1 = System.currentTimeMillis(); long time1 = System.currentTimeMillis();
// userVo = orderUtils.adamAddressEnterMember(uid, null, addressId); userVo = orderUtils.adamAddressEnterMember(uid, null, addressId);
log.info("adam接口调用：" + (System.currentTimeMillis() - time1) + "秒"); log.info("adam接口调用：" + (System.currentTimeMillis() - time1) + "秒");
} }
AdamAddressesVo addressesVo = AdamAddressesVo.getNew(); AdamAddressesVo addressesVo = AdamAddressesVo.getNew();
boolean isMember; boolean isMember;
if (userVo == null) { if (userVo == null) {
// if (noZhengzaiOrder(uid)) { if (noZhengzaiOrder(uid)) {
// throw new Exception("库存不足"); throw new Exception("库存不足");
// } else { } else {
isMember = false; isMember = false;
// addressesVo = null; addressesVo = null;
// } }
addressesVo.setName(""); // addressesVo.setName("");
addressesVo.setProvince(""); // addressesVo.setProvince("");
addressesVo.setCounty(""); // addressesVo.setCounty("");
addressesVo.setCity(""); // addressesVo.setCity("");
addressesVo.setAddress(""); // addressesVo.setAddress("");
addressesVo.setPhone(""); // addressesVo.setPhone("");
} else { } else {
addressesVo = userVo.getAddressesVo(); addressesVo = userVo.getAddressesVo();
switch (userVo.getMembership()) { switch (userVo.getMembership()) {
...@@ -442,64 +442,64 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -442,64 +442,64 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
GoblinPayInnerResultVo payInnerResultVo; GoblinPayInnerResultVo payInnerResultVo;
String payCode; String payCode;
if (preParam.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0 && !preParam.getPayType().equals("huifu")) { if (preParam.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0 && !preParam.getPayType().equals("huifu")) {
// // 调用支付 // 调用支付
// LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString(); LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString();
// httpData.add("type", "PRODUCT"); httpData.add("type", "PRODUCT");
// httpData.add("price", preParam.getPriceActual().toString()); httpData.add("price", preParam.getPriceActual().toString());
//// httpData.add("price","0.01"); // httpData.add("price","0.01");
// httpData.add("name", preParam.getStoreName()); httpData.add("name", preParam.getStoreName());
// httpData.add("detail", preParam.getSkuName()); httpData.add("detail", preParam.getSkuName());
// httpData.add("orderCode", preParam.getOrderMasterCode()); httpData.add("orderCode", preParam.getOrderMasterCode());
// httpData.add("orderId", preParam.getOrderIdList().substring(1)); httpData.add("orderId", preParam.getOrderIdList().substring(1));
// httpData.add("clientIp", CurrentUtil.getCliIpAddr()); httpData.add("clientIp", CurrentUtil.getCliIpAddr());
// httpData.add("notifyUrl", synUrl); httpData.add("notifyUrl", synUrl);
// httpData.add("createDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); httpData.add("createDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
// httpData.add("expireTime", preParam.getExpireTime() + ""); httpData.add("expireTime", preParam.getExpireTime() + "");
// httpData.add("payType", preParam.getPayType()); httpData.add("payType", preParam.getPayType());
// httpData.add("deviceFrom", preParam.getDeviceFrom()); httpData.add("deviceFrom", preParam.getDeviceFrom());
//
// if (preParam.getDeviceFrom().equals("micropay")) {
// httpData.add("authCode", preParam.getAuthCode());
// }
// if (preParam.getDeviceFrom().equals("js") || preParam.getDeviceFrom().equals("applet")) {
// httpData.add("openId", preParam.getOpenId());
// }
// if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) {
// httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
// httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
// }
// if (preParam.getPayType().equals("douyinpay")) {
// httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
// httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
// }
// if (preParam.getPayType().equals("unionpay")) {
// httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
// }
// LinkedMultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
// header.add("Accept", "application/json;charset=UTF-8");
// String returnData = HttpUtil.post(payUrl, httpData, header);
// log.info("调用 DRAGON 结果 = " + returnData);
// ResponseDto<GoblinPayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinPayInnerResultVo>>() {
// });
// payInnerResultVo = GoblinPayInnerResultVo.getNew();
// payInnerResultVo.setCode(dto.getData().getCode());
// payInnerResultVo.setOrderCode(dto.getData().getOrderCode());
// payInnerResultVo.setPayData(dto.getData().getPayData());
// payInnerResultVo.setPayType(preParam.getPayType());
// payInnerResultVo.setPrice(preParam.getPriceActual());
// payCode = payInnerResultVo.getCode();
// payInnerResultVo.setShowUrl(preParam.getShowUrl());
// payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
if (preParam.getDeviceFrom().equals("micropay")) {
httpData.add("authCode", preParam.getAuthCode());
}
if (preParam.getDeviceFrom().equals("js") || preParam.getDeviceFrom().equals("applet")) {
httpData.add("openId", preParam.getOpenId());
}
if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) {
httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
}
if (preParam.getPayType().equals("douyinpay")) {
httpData.add("showUrl", preParam.getShowUrl() + preParam.getOrderMasterCode());
httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
}
if (preParam.getPayType().equals("unionpay")) {
httpData.add("returnUrl", preParam.getReturnUrl() + preParam.getOrderMasterCode());
}
LinkedMultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8");
String returnData = HttpUtil.post(payUrl, httpData, header);
log.info("调用 DRAGON 结果 = " + returnData);
ResponseDto<GoblinPayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinPayInnerResultVo>>() {
});
payInnerResultVo = GoblinPayInnerResultVo.getNew(); payInnerResultVo = GoblinPayInnerResultVo.getNew();
payInnerResultVo.setCode("压测 code"); payInnerResultVo.setCode(dto.getData().getCode());
payInnerResultVo.setOrderCode(preParam.getOrderMasterCode()); payInnerResultVo.setOrderCode(dto.getData().getOrderCode());
payInnerResultVo.setPayData(null); payInnerResultVo.setPayData(dto.getData().getPayData());
payInnerResultVo.setPayType(preParam.getPayType()); payInnerResultVo.setPayType(preParam.getPayType());
payInnerResultVo.setPrice(preParam.getPriceActual()); payInnerResultVo.setPrice(preParam.getPriceActual());
payCode = payInnerResultVo.getCode(); payCode = payInnerResultVo.getCode();
payInnerResultVo.setShowUrl(preParam.getShowUrl()); payInnerResultVo.setShowUrl(preParam.getShowUrl());
payInnerResultVo.setReturnUrl(preParam.getReturnUrl()); payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
// payInnerResultVo = GoblinPayInnerResultVo.getNew();
// payInnerResultVo.setCode("压测 code");
// payInnerResultVo.setOrderCode(preParam.getOrderMasterCode());
// payInnerResultVo.setPayData(null);
// payInnerResultVo.setPayType(preParam.getPayType());
// payInnerResultVo.setPrice(preParam.getPriceActual());
// payCode = payInnerResultVo.getCode();
// payInnerResultVo.setShowUrl(preParam.getShowUrl());
// payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
} else if (preParam.getPayType() == null) { } else if (preParam.getPayType() == null) {
isFree = true; isFree = true;
preParam.setPayType("FREE"); preParam.setPayType("FREE");
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 0ee4c885
...@@ -190,10 +190,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -190,10 +190,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
boolean isMember; boolean isMember;
boolean isOldMember; boolean isOldMember;
if (userVo == null) { if (userVo == null) {
isMember = false; return ResponseDto.failure(ErrorMapping.get("20016"));//没抢到
isOldMember = false; // isMember = false;
addressesVo = null; // isOldMember = false;
entersVos = new ArrayList(); // addressesVo = null;
// entersVos = new ArrayList();
} else { } else {
entersVos = userVo.getEntersVos(); entersVos = userVo.getEntersVos();
addressesVo = userVo.getAddressesVo(); addressesVo = userVo.getAddressesVo();
......
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