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

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -546,8 +546,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         currentTime = System.currentTimeMillis();
         String returnData = HttpUtil.post(payUrl, httpData);
         currentTime = System.currentTimeMillis() - currentTime;
-        log.debug("调用 DRAGON 支付 -> time:" + (currentTime) + "毫秒");
-        log.debug("调用 DRAGON 结果 = " + returnData);
+        log.info("调用 DRAGON 支付 -> time:" + (currentTime) + "毫秒");
+        log.info("调用 DRAGON 结果 = " + returnData);
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
         payResultVo.getData().setOrderId(orderTicketId);
         payResultVo.getData().setPrice(orderTickets.getPriceActual());

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetLoginServiceImpl.java

@@ -86,6 +86,9 @@ public class SweetLoginServiceImpl {
             HashMap userInfo = new HashMap();
             userInfo.put("unionId", unionId);
             userInfo.put("openId", openId);
+            userInfo.put("getPhoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
+            userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
+            userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());
 
             return ResponseDto.success(userInfo);
         } catch (Exception e) {