optimize

c7b26302 · Water Wang · aaf1a350 · c7b26302 · c7b26302 · c7b26302
Commit c7b26302 authored Apr 24, 2020 by Water Wang
6 changed files
--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
 package com.yd.api.practitioner.service.impl;
-import com.yd.api.practitioner.vo.login.PractitionerBasicInfo;
 import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
 import com.yd.api.practitioner.vo.rank.AclCustomerFortuneStatistics;
@@ -10,7 +9,7 @@ import com.yd.api.practitioner.vo.rank.PractitionerInfoForAchievement;
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.customer.AclCustomerLog;
 import com.yd.dal.entity.customer.CustomerFileUpload;
-import com.yd.dal.entity.practitioner.PractitionerBasicInfoDAL;
+import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
 import com.yd.dal.entity.practitioner.PractitionerSubordinateInfo;
@@ -69,7 +68,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
            if(28L == practitionerType || isSpecial){//只有寿险的经纪人和注册为经纪人的员工才能登录
                Long practitionerId = practitionerInfo.getPractitionerId();
                Long customerId = practitionerInfo.getCustomerId();
-                PractitionerBasicInfo basicInfo = new PractitionerBasicInfo();
+                com.yd.api.practitioner.vo.login.PractitionerBasicInfo basicInfo = new com.yd.api.practitioner.vo.login.PractitionerBasicInfo();
                BeanUtils.copyProperties(practitionerInfo,basicInfo);
                //获取头像
                Integer targetType = 1, targetUseFor = 1;
@@ -114,7 +113,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
        platform = (platform == null) ? 1 : platform;
        if(!Strings.isNullOrEmpty(mobileNo)){
            //查询该手机号码的经纪人id，是否存在
-            PractitionerBasicInfoDAL practitionerBasicInfo = getPractitionerBasicInfo(mobileNo,platform);
+            PractitionerBasicInfo practitionerBasicInfo = getPractitionerBasicInfo(mobileNo,platform);
            if(practitionerBasicInfo != null){
                String practitionerId = practitionerBasicInfo.getPractitionerId();
                if(!Strings.isNullOrEmpty(practitionerId)){
@@ -151,8 +150,8 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
        return rankInfoList;
    }
-    private PractitionerBasicInfoDAL getPractitionerBasicInfo(String mobileNo, Integer platform) {
+    private PractitionerBasicInfo getPractitionerBasicInfo(String mobileNo, Integer platform) {
-        PractitionerBasicInfoDAL practitionerBasicInfo;
+        PractitionerBasicInfo practitionerBasicInfo;
        if(platform == 1){
            DESTypeHandler jpaCryptoConverter = new DESTypeHandler();
            mobileNo = jpaCryptoConverter.encode(mobileNo);

--- a/yd-api/src/main/java/com/yd/dal/entity/practitioner/PractitionerBasicInfoDAL.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/practitioner/PractitionerBasicInfoDAL.java
 package com.yd.dal.entity.practitioner;
-public class PractitionerBasicInfoDAL {
+public class PractitionerBasicInfo {
    private Long customerId;
    private Long practitionerIdForOnline;
    private String practitionerId;

--- a/yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerMapper.java
 package com.yd.dal.mapper.practitioner;
-import com.yd.dal.entity.practitioner.PractitionerBasicInfoDAL;
+import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
 import org.apache.ibatis.annotations.Param;
@@ -8,11 +8,11 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 public interface PractitionerMapper {
-    PractitionerBasicInfoDAL getPractitionerInfoByMobileNoForOffline(String mobileNo);
+    PractitionerBasicInfo getPractitionerInfoByMobileNoForOffline(String mobileNo);
    List<PractitionerRankInfo> getPractitionerRankInfoForOffline(@Param("time") Integer time);
-    PractitionerBasicInfoDAL getPractitionerInfoByMobileNoForOnline(String mobileNo);
+    PractitionerBasicInfo getPractitionerInfoByMobileNoForOnline(String mobileNo);
    List<PractitionerRankInfo> getPractitionerRankInfoForOnline(@Param("time")Integer time,@Param("practitionerTypeId")Long practitionerTypeId);

--- a/yd-api/src/main/java/com/yd/dal/service/practitioner/PractitionerDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/practitioner/PractitionerDALService.java
 package com.yd.dal.service.practitioner;
-import com.yd.dal.entity.practitioner.PractitionerBasicInfoDAL;
+import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
@@ -12,13 +12,13 @@ public interface PractitionerDALService {
     * @param mobileNo
     * @return
     */
-    PractitionerBasicInfoDAL getPractitionerBasicInfoForOffline(String mobileNo);
+    PractitionerBasicInfo getPractitionerBasicInfoForOffline(String mobileNo);
    /**
     * 线上--通过手机号码获取经纪人的基础信息
     * @param mobileNo
     * @return
     */
-    PractitionerBasicInfoDAL getPractitionerBasicInfoForOnline(String mobileNo);
+    PractitionerBasicInfo getPractitionerBasicInfoForOnline(String mobileNo);
    /**
     * 线下--按照时间进行查询经纪人的排名统计信息

--- a/yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerDALServiceImpl.java
 package com.yd.dal.service.practitioner.impl;
 import com.google.common.base.Strings;
-import com.yd.dal.entity.practitioner.PractitionerBasicInfoDAL;
+import com.yd.dal.entity.practitioner.PractitionerBasicInfo;
 import com.yd.dal.entity.practitioner.PractitionerInfo;
 import com.yd.dal.entity.practitioner.PractitionerRankInfo;
 import com.yd.dal.mapper.practitioner.PractitionerMapper;
@@ -22,7 +22,7 @@ public class PractitionerDALServiceImpl implements PractitionerDALService {
    private PractitionerMapper practitionerMapper;
    @Override
    @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
-    public PractitionerBasicInfoDAL getPractitionerBasicInfoForOffline(String mobileNo) {
+    public PractitionerBasicInfo getPractitionerBasicInfoForOffline(String mobileNo) {
        if(!Strings.isNullOrEmpty(mobileNo)){
            return practitionerMapper.getPractitionerInfoByMobileNoForOffline(mobileNo);
        }else{
@@ -32,7 +32,7 @@ public class PractitionerDALServiceImpl implements PractitionerDALService {
    }
    @Override
-    public PractitionerBasicInfoDAL getPractitionerBasicInfoForOnline(String mobileNo) {
+    public PractitionerBasicInfo getPractitionerBasicInfoForOnline(String mobileNo) {
        if(!Strings.isNullOrEmpty(mobileNo)){
            return practitionerMapper.getPractitionerInfoByMobileNoForOnline(mobileNo);
        }else{

--- a/yd-api/src/main/resources/mapper/practitioner/PractitionerMapper.xml
+++ b/yd-api/src/main/resources/mapper/practitioner/PractitionerMapper.xml
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yd.dal.mapper.practitioner.PractitionerMapper">
-    <resultMap id="base_result_map_practitioner_info" type="com.yd.dal.entity.practitioner.PractitionerBasicInfoDAL">
+    <resultMap id="base_result_map_practitioner_info" type="com.yd.dal.entity.practitioner.PractitionerBasicInfo">
        <result column="customerId" property="customerId"/>
        <result column="practitionerIdForOnline" property="practitionerIdForOnline"/>
        <result column="practitionerId" property="practitionerId"/>