Merge branch 'dev-union-20201228' into 'release'

Dev union 20201228



See merge request !71

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.4.5</version>
+    <version>1.0.5.0</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.1.9</version>
+            <version>1.0.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

client/src/main/java/com/pica/cloud/account/account/client/AccountInfoClient.java

 package com.pica.cloud.account.account.client;
 
 import com.pica.cloud.account.account.common.req.AccountInfoReq;
+import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -32,4 +33,8 @@ public interface AccountInfoClient {
     @GetMapping(value = "/account/account/innerDoctors")
     PicaResponse<List<Integer>> getDoctorsByInnerOrg();
 
+    @GetMapping(value = "/account/info/doctor/union")
+    PicaResponse<DoctorUnionResp> getDoctorByUnionid( @RequestParam(value = "unionid") String unionid);
+
+
 }

common/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-common</artifactId>
-    <version>1.0.1.9</version>
+    <version>1.0.2.0</version>
     <name>pica-cloud-account-common</name>
     <packaging>jar</packaging>
 

common/src/main/java/com/pica/cloud/account/account/common/resp/DoctorUnionResp.java

+package com.pica.cloud.account.account.common.resp;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 根据医生unionid查询医生是否存在
+ * @author wangxinxu
+ * @create 2020/12/28
+ */
+@ApiModel
+public class DoctorUnionResp {
+
+    private Integer doctorId;
+
+    private Integer status;
+
+    public Integer getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Integer doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

server/pom.xml

@@ -151,7 +151,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.1.9</version>
+            <version>1.0.2.0</version>
         </dependency>
 
         <dependency>

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountInfoController.java

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.common.req.AccountInfoReq;
+import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
 import com.pica.cloud.account.account.server.entity.AccountWeChatInfoEntity;
 import com.pica.cloud.account.account.server.service.AccountInfoService;
 import com.pica.cloud.account.account.server.service.WechatService;
@@ -8,7 +9,6 @@ import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -66,4 +66,11 @@ public class AccountInfoController extends AccountBaseController {
         return PicaResponse.toResponse(wechatService.getAccountWechatInfoBatch(docIds));
     }
 
+    @ApiOperation(value = "根据unionid查看个人认证信息")
+    @GetMapping(value = "/doctor/union", produces = "application/json;charset=UTF-8")
+    public PicaResponse<DoctorUnionResp> getDoctorByUnionid(@RequestParam(value = "unionid") String unionid) {
+
+        DoctorUnionResp personalInfoDto = wechatService.getDoctorByUnionid(unionid);
+        return PicaResponse.toResponse(personalInfoDto);
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java

 package com.pica.cloud.account.account.server.mapper;
 
 
+import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
 import com.pica.cloud.account.account.server.entity.Doctor;
-import com.pica.cloud.account.account.server.entity.DoctorEntity;
 import com.pica.cloud.account.account.server.entity.PICAPDoctor;
 import com.pica.cloud.account.account.server.model.WechatInfoDto;
 import org.apache.ibatis.annotations.Param;
@@ -119,5 +119,7 @@ public interface DoctorMapper {
 
     List<Integer> getDoctorsByInnerOrg(List<String> list);
 
+    DoctorUnionResp getDoctorByAcctId(Long acctId);
+
 
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/service/WechatService.java

 package com.pica.cloud.account.account.server.service;
 
+import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
 import com.pica.cloud.account.account.server.entity.AccountWeChatInfoEntity;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 
@@ -12,4 +13,6 @@ public interface WechatService {
 
     Map<Integer,String> getAccountWechatInfoBatch(List<Integer> docIds);
 
+    DoctorUnionResp getDoctorByUnionid(String unionid);
+
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/WechatServiceImpl.java

 package com.pica.cloud.account.account.server.service.impl;
 
+import com.pica.cloud.account.account.common.resp.DoctorUnionResp;
+import com.pica.cloud.account.account.server.entity.AccountUnionEntity;
 import com.pica.cloud.account.account.server.entity.AccountWeChatInfoEntity;
 import com.pica.cloud.account.account.server.mapper.AccountWeChatInfoMapper;
 import com.pica.cloud.account.account.server.mapper.DoctorMapper;
 import com.pica.cloud.account.account.server.model.WechatInfoDto;
+import com.pica.cloud.account.account.server.service.AccountUnionService;
 import com.pica.cloud.account.account.server.service.WechatService;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
-import io.swagger.models.auth.In;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -28,6 +27,9 @@ public class WechatServiceImpl implements WechatService {
     @Autowired
     private AccountWeChatInfoMapper weChatInfoMapper;
 
+    @Autowired
+    private AccountUnionService accountUnionService;
+
     @Override
     public AccountWeChatInfoEntity getAccountWechatInfo(PicaUser user) {
         String unionId = doctorMapper.getUnionIdByDoctorId(user.getId());
@@ -72,4 +74,14 @@ public class WechatServiceImpl implements WechatService {
 
         return doctorOpenMap;
     }
+
+    @Override
+    public DoctorUnionResp getDoctorByUnionid(String unionid){
+        AccountUnionEntity accountUnionEntity = accountUnionService.selectInfoByUnionId(unionid);
+        DoctorUnionResp doctorUnionfoModel = new DoctorUnionResp();
+        if (StringUtil.isNotNull(accountUnionEntity)) {
+            doctorUnionfoModel = doctorMapper.getDoctorByAcctId(accountUnionEntity.getAcctId());
+        }
+        return doctorUnionfoModel;
+    }
 }

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -1087,5 +1087,10 @@
         select id from p_doctor where (hospital like ('云鹊%') or hospital LIKE ('测试%')) and delete_flag = 1;
     </select>
 
+    <select id="getDoctorByAcctId" resultType="com.pica.cloud.account.account.common.resp.DoctorUnionResp" parameterType="java.lang.Long">
+    select d.id as doctorId,  d.status
+      from p_doctor d
+        where d.acct_id = #{acctId} and d.delete_flag = 1
+    </select>
 
 </mapper>
\ No newline at end of file