Merge branch 'dev-circle-20200630' into release

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

@@ -41,4 +41,6 @@ public interface AccountUnionMapper {
      * @param unionId
      */
     void updateUnionStatus(String unionId);
+
+    int deleteByAcctId(Integer id);
 }
\ No newline at end of file

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

@@ -6,10 +6,7 @@ import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
-import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
-import com.pica.cloud.account.account.server.mapper.DoctorEducationMapper;
-import com.pica.cloud.account.account.server.mapper.DoctorHospitalMapper;
-import com.pica.cloud.account.account.server.mapper.DoctorMapper;
+import com.pica.cloud.account.account.server.mapper.*;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -49,6 +46,9 @@ public class DoctorServiceImpl implements DoctorService {
     @Autowired
     private DoctorHospitalMapper doctorHospitalMapper;
 
+    @Autowired
+    private AccountUnionMapper accountUnionMapper;
+
     @Override
     public Doctor getDoctorInfo(Integer id) {
         return doctorMapper.selectByPrimaryKey(id);
@@ -98,6 +98,8 @@ public class DoctorServiceImpl implements DoctorService {
             acctMap.put("modifyId",modifyId);
             acctMap.put("acctId",acctId.longValue());
             accountInfoDetailMapper.updateDeleteByPrimaryKey(acctMap);
+
+            accountUnionMapper.deleteByAcctId(acctId);
         } else {
             throw new AccountException(AccountExceptionEnum.PICA_NOT_REGISTER);
         }

server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java

@@ -169,7 +169,7 @@ public class TokenUtils {
 //                cacheClient.hset(value, "token", newToken);
 //            }
         } catch (Exception ex) {
-            logger.error("生成token异常：{}" + ex.getMessage(), ex);
+            logger.error("生成token异常：{}",ex.getMessage());
         }
         return newToken;
     }

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

@@ -24,6 +24,12 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
 
+    <update id="deleteByAcctId" parameterType="java.lang.Integer">
+    update account_union
+    set delete_flag = 2,modified_time=NOW()
+    where acct_id = #{acctId} and delete_flag = 1
+    </update>
+
     <!--通过unionId查询用户信息-->
     <select id="selectByUnionId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select