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

Skip to content

L
liquidnet-bus-v1
Commit 2a9c6f07 authored by anjiabin's avatar anjiabin
Browse files
Options

Merge remote-tracking branch 'origin/dev' into test

parents eb1c0327 b7652411
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 2a9c6f07
...@@ -546,8 +546,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -546,8 +546,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
String returnData = HttpUtil.post(payUrl, httpData); String returnData = HttpUtil.post(payUrl, httpData);
currentTime = System.currentTimeMillis() - currentTime; currentTime = System.currentTimeMillis() - currentTime;
log.debug("调用 DRAGON 支付 -> time:" + (currentTime) + "毫秒"); log.info("调用 DRAGON 支付 -> time:" + (currentTime) + "毫秒");
log.debug("调用 DRAGON 结果 = " + returnData); log.info("调用 DRAGON 结果 = " + returnData);
PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class); PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
payResultVo.getData().setOrderId(orderTicketId); payResultVo.getData().setOrderId(orderTicketId);
payResultVo.getData().setPrice(orderTickets.getPriceActual()); payResultVo.getData().setPrice(orderTickets.getPriceActual());
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetLoginServiceImpl.java
View file @ 2a9c6f07
...@@ -86,6 +86,9 @@ public class SweetLoginServiceImpl { ...@@ -86,6 +86,9 @@ public class SweetLoginServiceImpl {
HashMap userInfo = new HashMap(); HashMap userInfo = new HashMap();
userInfo.put("unionId", unionId); userInfo.put("unionId", unionId);
userInfo.put("openId", openId); userInfo.put("openId", openId);
userInfo.put("getPhoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());
return ResponseDto.success(userInfo); return ResponseDto.success(userInfo);
} catch (Exception e) { } catch (Exception e) {
......
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