Merge branch 'login' of http://git.quantgroup.cn/QG/customer-service into login

src/main/java/cn/quantgroup/customer/service/IKaService.java

@@ -24,7 +24,7 @@ public interface IKaService {
      * @param applyOrderNos
      * @return
      */
-    JsonResult<Map<String, String>> findMap(List<String> applyOrderNos);
+    JsonResult<Map<String, String>> findChannelOrderNosByApplyOrderNos(List<String> applyOrderNos);
 
     JsonResult<List<ChannelConfigurationResult>> getAllChannelConfiguration();
 

src/main/java/cn/quantgroup/customer/service/impl/KaServiceImpl.java

@@ -100,7 +100,7 @@ public class KaServiceImpl implements IKaService {
 
 
     @Override
-    public JsonResult<Map<String, String>> findMap(List<String> applyOrderNos) {
+    public JsonResult<Map<String, String>> findChannelOrderNosByApplyOrderNos(List<String> applyOrderNos) {
         String logPre = "KaServiceImpl.findOrderMappingByApplyOrderNos";
         log.info("{},获得渠道订单号 applyOrderNos={}", logPre, applyOrderNos);
 

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -26,7 +26,6 @@ import cn.quantgroup.customer.util.*;
 import cn.quantgroup.riskcontrol.model.AuthenticationUserDetail;
 import cn.quantgroup.user.retbean.XUser;
 import cn.quantgroup.user.retbean.XUserDetail;
-import cn.quantgroup.user.retbean.XUserFullInfo;
 import cn.quantgroup.user.vo.UserSysResult;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Maps;
@@ -439,7 +438,7 @@ public class UserServiceImpl implements IUserService {
         if (CollectionUtils.isNotEmpty(applyOrderList)) {
             //通过申请订单号获得渠道订单号
             List<String> applyOrderNoList = applyOrderList.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
-            JsonResult<Map<String, String>> mapJsonResult = kaService.findMap(applyOrderNoList);
+            JsonResult<Map<String, String>> mapJsonResult = kaService.findChannelOrderNosByApplyOrderNos(applyOrderNoList);
             if (!mapJsonResult.isSuccess()) {
                 return mapJsonResult;
             }