20191217 去掉旧的注册接口,完善数据

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

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.controller;
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LoginResult;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.req.AccountReq;
 import com.pica.cloud.account.account.server.req.BaseRequest;
@@ -174,7 +175,7 @@ public class AccountController extends AccountBaseController {
                 account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
                 break;
             default:
-                account.setRegisterSource(7);  //H5注册
+                account.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());  //H5注册
         }
         //创建账号
         accountService.createAccount(account);
@@ -310,44 +311,44 @@ public class AccountController extends AccountBaseController {
      * @param req
      * @return
      */
-    @ApiOperation("H5端一键登录功能,无需完善信息 旧接口")
-    @PostMapping("/login-register")
-    public PicaResponse<String> loginRegister(@RequestBody AccountReq req) {
-        this.checkMobilePhone(req.getMobilePhone());
-        req.setPassword(null);  //登录或注册，只能使用验证码
-
-        //判断账号是否已经存在
-        Account account = accountService.getByMobilePhone(req.getMobilePhone());
-        if (account != null) {
-            return this.login(req);  //登录
-        } else {
-            return this.registerOld(req);  //注册
-        }
-    }
-
-    public PicaResponse<String> registerOld(@RequestBody AccountReq req) {
-        this.checkMobilePhone(req.getMobilePhone());
-        this.checkAuthCode(req);
-        String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
-        Account account = new Account();
-        account.setMobilePhone(EncryptUtils.encryptContent(req.getMobilePhone(), EncryptConstants.ENCRYPT_TYPE_MOBILE));
-        switch (deviceType) {  //注册来源
-            case "1":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //pc
-                break;
-            case "2":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_1);  //android
-                break;
-            case "3":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
-                break;
-            default:
-                account.setRegisterSource(7);  //H5注册
-        }
-        //创建账号
-        accountService.createAccount(account);
-        //生成token并返回
-        String newToken = this.generateToken(account, deviceType);
-        return PicaResponse.toResponse(newToken);
-    }
+//    @ApiOperation("H5端一键登录功能,无需完善信息 旧接口")
+//    @PostMapping("/login-register")
+//    public PicaResponse<String> loginRegister(@RequestBody AccountReq req) {
+//        this.checkMobilePhone(req.getMobilePhone());
+//        req.setPassword(null);  //登录或注册，只能使用验证码
+//
+//        //判断账号是否已经存在
+//        Account account = accountService.getByMobilePhone(req.getMobilePhone());
+//        if (account != null) {
+//            return this.login(req);  //登录
+//        } else {
+//            return this.registerOld(req);  //注册
+//        }
+//    }
+
+//    public PicaResponse<String> registerOld(@RequestBody AccountReq req) {
+//        this.checkMobilePhone(req.getMobilePhone());
+//        this.checkAuthCode(req);
+//        String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
+//        Account account = new Account();
+//        account.setMobilePhone(EncryptUtils.encryptContent(req.getMobilePhone(), EncryptConstants.ENCRYPT_TYPE_MOBILE));
+//        switch (deviceType) {  //注册来源
+//            case "1":
+//                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //pc
+//                break;
+//            case "2":
+//                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_1);  //android
+//                break;
+//            case "3":
+//                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
+//                break;
+//            default:
+//                account.setRegisterSource(4);  //H5注册
+//        }
+//        //创建账号
+//        accountService.createAccount(account);
+//        //生成token并返回
+//        String newToken = this.generateToken(account, deviceType);
+//        return PicaResponse.toResponse(newToken);
+//    }
 }

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

@@ -48,7 +48,7 @@ public class DoctorController extends AccountBaseController {
     @ApiOperation("修改医生信息接口")
     @PutMapping(value = "/info", produces = "application/json;charset=utf-8")
     public PicaResponse modifyDoctorInfo(@RequestBody Doctor doctor) {
-        doctorService.modifyDoctorInfo(doctor);
+        doctorService.modifyDoctorInfo(doctor,super.getDoctorIdByToken());
         return PicaResponse.toResponse();
     }
 
@@ -64,7 +64,7 @@ public class DoctorController extends AccountBaseController {
         if (doctor != null && doctor.getMobilePhone() != null) {
             AccountUtils.checkMobilePhone(doctor.getMobilePhone());
             AccountUtils.checkPassword(doctor.getPassword());
-            Integer userId = doctorService.addDoctorInfo(doctor);
+            Integer userId = doctorService.addDoctorInfo(doctor,super.getDoctorIdByToken());
             return PicaResponse.toResponse(userId);
         } else {
             throw new AccountException(AccountExceptionEnum.PICA_PARAMS_ERROR);

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

@@ -22,7 +22,7 @@ public interface DoctorService {
      *
      * @param doctor 待修改数据
      */
-    void modifyDoctorInfo(Doctor doctor);
+    void modifyDoctorInfo(Doctor doctor,Long doctorId);
 
     /**
      * 修改医生信息
@@ -36,7 +36,7 @@ public interface DoctorService {
      *
      * @param doctor 新的医生数据
      */
-    Integer addDoctorInfo(Doctor doctor);
+    Integer addDoctorInfo(Doctor doctor,Long doctorId);
 
     /**
      * doctor绑定微信

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

@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.service.AccountService;
@@ -89,8 +90,8 @@ public class AccountServiceImpl implements AccountService {
         accountInfo.setRegTime(currentTime);
         accountInfo.setDeleteFlag(1);
         accountInfo.setSex(0);
-        accountInfo.setRegisterProduct(1);
-        accountInfo.setRegisterSource(5);
+        accountInfo.setRegisterProduct(AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode());
+        accountInfo.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());
         accountInfoDetailMapper.insertSelective(accountInfo);
         Integer acctId = accountInfo.getId();
         //doctor表,存入用户id

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

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.service.impl;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 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.DoctorMapper;
@@ -40,7 +41,7 @@ public class DoctorServiceImpl implements DoctorService {
 
     @Transactional
     @Override
-    public void modifyDoctorInfo(Doctor doctor) {
+    public void modifyDoctorInfo(Doctor doctor,Long doctorId) {
         Integer id = doctor.getId();
         if (id == null) {
             throw new AccountException(AccountExceptionEnum.PICA_PARAMS_ERROR);
@@ -60,7 +61,7 @@ public class DoctorServiceImpl implements DoctorService {
         AccountInfoEntity accountInfoEntity = new AccountInfoEntity();
         accountInfoEntity.setMobilePhone(AESUtil.encryptV0(mobilePhone));
         accountInfoEntity.setId(acctId);
-        accountInfoEntity.setModifiedId(1580052);
+        accountInfoEntity.setModifiedId(doctorId.intValue());
         accountInfoEntity.setModifiedTime(new Date());
         accountInfoDetailMapper.updateByPrimaryKeySelective(accountInfoEntity);
     }
@@ -90,7 +91,7 @@ public class DoctorServiceImpl implements DoctorService {
      */
     @Override
     @Transactional
-    public Integer addDoctorInfo(Doctor doctor) {
+    public Integer addDoctorInfo(Doctor doctor,Long doctorId) {
         String mobilePhone = doctor.getMobilePhone();
         String mobileEncrypt = AESUtil.encryptV0(mobilePhone);
         AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
@@ -104,11 +105,12 @@ public class DoctorServiceImpl implements DoctorService {
         entity.setPassword(password);
         entity.setCreatedTime(currentTime);
         entity.setModifiedTime(currentTime);
-        entity.setModifiedId(1580052);
-        entity.setRegisterProduct(1);
+        entity.setModifiedId(doctorId.intValue());
+        entity.setRegisterProduct(AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode());
         entity.setRegTime(currentTime);
-        entity.setRegisterSource(3);
-        entity.setCreatedId(0);
+        //客服系统新增医生
+        entity.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_ADMIN.getCode());
+        entity.setCreatedId(doctorId.intValue());
         entity.setDeleteFlag(1);
         entity.setSex(doctor.getSex());
         entity.setName(doctor.getName());
@@ -118,8 +120,8 @@ public class DoctorServiceImpl implements DoctorService {
         accountInfoDetailMapper.insertSelective(entity);
         doctor.setAcctId(entity.getId());
         doctor.setMobilePhone(mobileEncrypt);
-        doctor.setModifyId(1580052);
-        doctor.setCreatId(0);
+        doctor.setModifyId(doctorId.intValue());
+        doctor.setCreatId(doctorId.intValue());
         doctor.setCreatTime(currentTime);
         doctor.setModifyTime(new Date());
         doctor.setDeleteFlag(1);