Merge branch 'dev-circle-20200630' into 'release'

Dev circle 20200630

reviewcode赵培军

See merge request !35

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.3.5</version>
+    <version>1.0.3.6</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.4</version>
+            <version>1.0.1.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

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

@@ -3,10 +3,14 @@ package com.pica.cloud.account.account.client;
 import com.pica.cloud.account.account.common.req.EncryptEntity;
 import com.pica.cloud.account.account.common.req.LoginResult;
 import com.pica.cloud.account.account.common.req.OCINRequest;
+import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
 
 /**
  * Created on 2019/10/16 17:28
@@ -22,4 +26,8 @@ public interface RegisterClient {
     @PostMapping(value = "/account/register/ocin")
     PicaResponse register(@RequestBody OCINRequest ocinRequest);
 
-}
+    @PostMapping(value = "/account/circle/acct")
+    PicaResponse<List<Integer>> register(@RequestBody CircleAcctInitReq circleAcctInitReq, @RequestHeader(value = "token") String token);
+
+
+}
\ No newline at end of file

common/pom.xml

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

common/src/main/java/com/pica/cloud/account/account/common/req/circle/CircleAcctInit.java

+package com.pica.cloud.account.account.common.req.circle;
+
+/**
+ * @DESCRIPTOIN:
+ * @AUTHOR: joy
+ * @DATE:2020/6/21 11:01 上午
+ */
+public class CircleAcctInit {
+
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getEncryMobile() {
+        return encryMobile;
+    }
+
+    public void setEncryMobile(String encryMobile) {
+        this.encryMobile = encryMobile;
+    }
+
+    private String encryMobile;
+
+}

common/src/main/java/com/pica/cloud/account/account/common/req/circle/CircleAcctInitReq.java

+package com.pica.cloud.account.account.common.req.circle;
+
+import java.util.List;
+
+/**
+ * @DESCRIPTOIN:
+ * @AUTHOR: joy
+ * @DATE:2020/6/21 11:02 上午
+ */
+public class CircleAcctInitReq {
+
+    private List<CircleAcctInit> circleAcctInitList;
+
+    private Integer registerSource; // 1 安卓 2 ios 3 web 4 h5 5 admin
+
+    private Integer circleId;
+
+    public List<CircleAcctInit> getCircleAcctInitList() {
+        return circleAcctInitList;
+    }
+
+    public void setCircleAcctInitList(List<CircleAcctInit> circleAcctInitList) {
+        this.circleAcctInitList = circleAcctInitList;
+    }
+
+    public Integer getRegisterSource() {
+        return registerSource;
+    }
+
+    public void setRegisterSource(Integer registerSource) {
+        this.registerSource = registerSource;
+    }
+
+    public Integer getCircleId() {
+        return circleId;
+    }
+
+    public void setCircleId(Integer circleId) {
+        this.circleId = circleId;
+    }
+}

server/pom.xml

@@ -138,7 +138,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.1.4</version>
+            <version>1.0.1.6</version>
         </dependency>
 
         <dependency>

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

+package com.pica.cloud.account.account.server.controller;
+
+import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
+import com.pica.cloud.account.account.server.service.CircleAccountService;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @DESCRIPTOIN:
+ * @AUTHOR: joy
+ * @DATE:2020/6/21 10:22 上午
+ */
+@Api(description = "")
+@RestController
+@RequestMapping("/circle")
+public class CircleUserController {
+    private Logger logger = LoggerFactory.getLogger(CircleUserController.class);
+
+    @Autowired
+    private CircleAccountService circleAccountService;
+
+    @PostMapping("/acct")
+    @EnabledLoginValidate
+    public PicaResponse<List<Integer>> circleUserInit(@RequestBody CircleAcctInitReq circleAcctInitReq) {
+        return PicaResponse.toResponse(circleAccountService.createCircleAccount(circleAcctInitReq));
+    }
+
+}

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

+package com.pica.cloud.account.account.server.service;
+
+
+import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
+import com.pica.cloud.account.account.server.entity.Account;
+import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ */
+public interface CircleAccountService {
+
+
+    //创建圈子入口-用户账号
+    List<Integer> createCircleAccount(CircleAcctInitReq circleAcctInitReq);
+
+
+}

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

@@ -91,7 +91,11 @@ public class AccountServiceImpl implements AccountService {
         accountInfo.setDeleteFlag(1);
         accountInfo.setSex(0);
         accountInfo.setRegisterProduct(AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode());
-        accountInfo.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());
+        if(null != account.getRegisterSource() && 0 != account.getRegisterSource()){
+            accountInfo.setRegisterSource(account.getRegisterSource());
+        }else {
+            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/CircleAccountServiceImpl.java

+package com.pica.cloud.account.account.server.service.impl;
+
+import com.pica.cloud.account.account.common.req.circle.CircleAcctInit;
+import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
+import com.pica.cloud.account.account.server.entity.Account;
+import com.pica.cloud.account.account.server.mapper.AccountMapper;
+import com.pica.cloud.account.account.server.service.CircleAccountService;
+import com.pica.cloud.account.account.server.service.AccountService;
+import groovy.util.logging.Log;
+import groovy.util.logging.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @DESCRIPTOIN:
+ * @AUTHOR: joy
+ * @DATE:2020/6/21 10:25 上午
+ */
+@Service
+public class CircleAccountServiceImpl implements CircleAccountService {
+
+    private static Logger logger = LoggerFactory.getLogger(CircleAccountServiceImpl.class);
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private AccountMapper accountMapper;
+
+    @Override
+    @Transactional
+    public List<Integer> createCircleAccount(CircleAcctInitReq circleAcctInitReq) {
+        List<CircleAcctInit> circleAcctInits = circleAcctInitReq.getCircleAcctInitList();
+        List<Integer> savedIds = new ArrayList<>();
+        try {
+            for(CircleAcctInit acct : circleAcctInits){
+                Account dbAcct = accountMapper.getByMobilePhone(acct.getEncryMobile());  //获取医生表账号信息
+                if(null == dbAcct){
+                    Account account = new Account();
+                    account.setNickname(acct.getUserName());
+                    account.setMobilePhone(acct.getEncryMobile());
+                    account.setRegisterSource(circleAcctInitReq.getRegisterSource());
+                    accountService.createAccount(account);
+                    savedIds.add(account.getId().intValue());
+                }else {
+                    savedIds.add(dbAcct.getId().intValue());
+                }
+            }
+        }catch (Exception e){
+            logger.error("createCircleAccount error:{}",e.getMessage());
+            throw e;
+        }
+
+        return savedIds;
+    }
+
+}