返回快递id和增加以及返回医师英文名

src/main/java/com/caimei/mapper/cmMapper/LogisticsMapper.java

@@ -28,4 +28,5 @@ public interface LogisticsMapper {
     List<CertificateLogisticsVo> getCertificateLogistics(Integer authId);
 
     List<LogisticsCompanyVo> getLogisticsCompanyList(Integer companyId);
+    List<LogisticsCompanyVo> getLogisticsvalue(@Param("companyCode")String companyCode);
 }

src/main/java/com/caimei/model/vo/CertificateLogisticsVo.java

@@ -66,4 +66,9 @@ public class CertificateLogisticsVo {
      * json转换物流追踪信息
      */
     private List<RouterVo> routerList;
+
+    /**
+     * 公司id
+     */
+    private Integer companyId;
 }

src/main/java/com/caimei/model/vo/WxDoctorListVo.java

@@ -24,6 +24,9 @@ public class WxDoctorListVo {
     @ApiModelProperty("医师姓名")
     private String doctorName;
 
+    @ApiModelProperty("医师英文名")
+    private List<String> englishName;
+
     @ApiModelProperty("资格证编号")
     private String certificateNo;
 

src/main/java/com/caimei/service/auth/impl/LogisticsServiceImpl.java

@@ -85,6 +85,11 @@ public class LogisticsServiceImpl implements LogisticsService {
                 List<RouterVo> routers = JSONArray.parseArray(info, RouterVo.class);
                 certificateLogistics.setRouterList(routers);
             }
+            //根据companyCode获取快递id
+            List<LogisticsCompanyVo> logisticsvalue = logisticsMapper.getLogisticsvalue(certificateLogistics.getCompanyCode());
+            if(null !=logisticsvalue && logisticsvalue.size()>0){
+                certificateLogistics.setCompanyId(logisticsvalue.get(0).getId());
+            }
         }
         return ResponseJson.success(certificateLogistics);
     }

src/main/resources/mapper/DoctorMapper.xml

@@ -127,7 +127,7 @@
         where doctorId = #{doctorId}
     </select>
     <select id="getWxDoctorList" resultType="com.caimei.model.vo.WxDoctorListVo">
-        select d.id as doctorId, d.doctorType, d.name as doctorName,d.certificateNo,ifnull(cba.authParty,d.clubName) as clubName,d.image as doctorImage
+        select d.id as doctorId, d.doctorType, d.name as doctorName,d.englishName,d.certificateNo,ifnull(cba.authParty,d.clubName) as clubName,d.image as doctorImage
         from cm_brand_doctor d
         left join cm_brand_auth_user au on d.authUserId = au.authUserId
         left join cm_brand_auth cba on d.authId = cba.id and cba.delFlag = 0

src/main/resources/mapper/LogisticsMapper.xml

@@ -23,4 +23,11 @@
         </if>
         order by -sort desc
     </select>
+    <select id="getLogisticsvalue" resultType="com.caimei.model.vo.LogisticsCompanyVo">
+        select id, label as companyName, value as companyCode
+        from sys_dict
+        where type = 'kd_type' and value=#{companyCode}
+        and del_flag = 0
+        order by -sort desc
+    </select>
 </mapper>