Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-account
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.account
pica-cloud-account
提交
30ccb643
提交
30ccb643
编写于
6月 17, 2022
作者:
Peijun.zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add followup create doctor
上级
038aeee1
流水线
#47315
已取消 于阶段
变更
6
流水线
1
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
143 行增加
和
14 行删除
+143
-14
RegisterClient.java
...com/pica/cloud/account/account/client/RegisterClient.java
+4
-3
DocInfoReq.java
...com/pica/cloud/account/account/common/req/DocInfoReq.java
+51
-0
DocInfoResp.java
...om/pica/cloud/account/account/common/req/DocInfoResp.java
+30
-0
CircleUserController.java
...count/account/server/controller/CircleUserController.java
+8
-0
CircleAccountService.java
.../account/account/server/service/CircleAccountService.java
+5
-0
CircleAccountServiceImpl.java
...account/server/service/impl/CircleAccountServiceImpl.java
+45
-11
未找到文件。
client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java
浏览文件 @
30ccb643
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.*
;
import
com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq
;
import
com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq
;
import
com.pica.cloud.foundation.entity.PicaResponse
;
...
...
@@ -31,6 +29,9 @@ public interface RegisterClient {
@PostMapping
(
value
=
"/account/circle/acct"
)
PicaResponse
<
List
<
Integer
>>
register
(
@RequestBody
CircleAcctInitReq
circleAcctInitReq
,
@RequestHeader
(
value
=
"token"
)
String
token
);
@PostMapping
(
value
=
"/account/circle/acct/followup"
)
PicaResponse
<
List
<
DocInfoResp
>>
registerFollowup
(
@RequestBody
List
<
DocInfoReq
>
req
,
@RequestHeader
(
value
=
"token"
)
String
token
);
@PostMapping
(
value
=
"/account/shop/acct"
)
PicaResponse
<
Map
<
String
,
Integer
>>
shopRegister
(
@RequestBody
ShopAcctInitReq
shopAcctInitReq
,
@RequestHeader
(
value
=
"token"
)
String
token
);
...
...
common/src/main/java/com/pica/cloud/account/account/common/req/DocInfoReq.java
0 → 100644
浏览文件 @
30ccb643
package
com
.
pica
.
cloud
.
account
.
account
.
common
.
req
;
/**
* User: Joy
* Description:
* Date: 2022-06-17 15:26
*/
public
class
DocInfoReq
{
private
String
name
;
private
String
mobile
;
private
String
seq
;
// 1 安卓 2 ios 3 web 4 h5 5 admin
private
Integer
source
;
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getMobile
()
{
return
mobile
;
}
public
void
setMobile
(
String
mobile
)
{
this
.
mobile
=
mobile
;
}
public
String
getSeq
()
{
return
seq
;
}
public
void
setSeq
(
String
seq
)
{
this
.
seq
=
seq
;
}
public
Integer
getSource
()
{
return
source
;
}
public
void
setSource
(
Integer
source
)
{
this
.
source
=
source
;
}
}
common/src/main/java/com/pica/cloud/account/account/common/req/DocInfoResp.java
0 → 100644
浏览文件 @
30ccb643
package
com
.
pica
.
cloud
.
account
.
account
.
common
.
req
;
/**
* User: Joy
* Description:
* Date: 2022-06-17 15:27
*/
public
class
DocInfoResp
{
private
String
seq
;
private
Integer
doctorId
;
public
String
getSeq
()
{
return
seq
;
}
public
void
setSeq
(
String
seq
)
{
this
.
seq
=
seq
;
}
public
Integer
getDoctorId
()
{
return
doctorId
;
}
public
void
setDoctorId
(
Integer
doctorId
)
{
this
.
doctorId
=
doctorId
;
}
}
server/src/main/java/com/pica/cloud/account/account/server/controller/CircleUserController.java
浏览文件 @
30ccb643
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
controller
;
import
com.pica.cloud.account.account.common.req.DocInfoReq
;
import
com.pica.cloud.account.account.common.req.DocInfoResp
;
import
com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq
;
import
com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq
;
import
com.pica.cloud.account.account.server.service.CircleAccountService
;
...
...
@@ -36,6 +38,12 @@ public class CircleUserController {
return
PicaResponse
.
toResponse
(
circleAccountService
.
createCircleAccount
(
circleAcctInitReq
));
}
@PostMapping
(
"/acct/followup"
)
@EnabledLoginValidate
public
PicaResponse
<
List
<
DocInfoResp
>>
followupUserInit
(
@RequestBody
List
<
DocInfoReq
>
req
)
{
return
PicaResponse
.
toResponse
(
circleAccountService
.
createFollowupAccount
(
req
));
}
@PostMapping
(
"/acct/decryMobile"
)
@EnabledLoginValidate
public
PicaResponse
<
List
<
Integer
>>
circleUserInitDecryMobile
(
@RequestBody
DiyAcctInitReq
diyAcctInitReq
)
{
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/CircleAccountService.java
浏览文件 @
30ccb643
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
service
;
import
com.pica.cloud.account.account.common.req.DocInfoReq
;
import
com.pica.cloud.account.account.common.req.DocInfoResp
;
import
com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq
;
import
com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq
;
import
com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq
;
...
...
@@ -19,6 +21,9 @@ public interface CircleAccountService {
//创建圈子入口-用户账号
List
<
Integer
>
createCircleAccount
(
CircleAcctInitReq
circleAcctInitReq
);
//随访入口-创建用户账号
List
<
DocInfoResp
>
createFollowupAccount
(
List
<
DocInfoReq
>
initAccoutsReq
);
//批量创建用户- 手机号,姓名
List
<
Integer
>
createDiyAccount
(
DiyAcctInitReq
diyAcctInitReq
);
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/impl/CircleAccountServiceImpl.java
浏览文件 @
30ccb643
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.pica.cloud.account.account.common.req.DocInfoReq
;
import
com.pica.cloud.account.account.common.req.DocInfoResp
;
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.common.req.circle.DiyAcctInit
;
...
...
@@ -75,6 +77,38 @@ public class CircleAccountServiceImpl implements CircleAccountService {
return
savedIds
;
}
@Override
public
List
<
DocInfoResp
>
createFollowupAccount
(
List
<
DocInfoReq
>
initAccoutsReq
)
{
List
<
DocInfoResp
>
respList
=
new
ArrayList
<>();
try
{
for
(
DocInfoReq
acct
:
initAccoutsReq
)
{
DocInfoResp
resp
=
new
DocInfoResp
();
Account
dbAcct
=
accountMapper
.
getByMobilePhone
(
acct
.
getMobile
());
//获取医生表账号信息
if
(
null
==
dbAcct
)
{
Account
account
=
new
Account
();
account
.
setName
(
acct
.
getName
());
account
.
setNickname
(
acct
.
getName
());
account
.
setMobilePhone
(
acct
.
getMobile
());
account
.
setRegisterSource
(
acct
.
getSource
());
accountService
.
createAccount
(
account
,
null
);
logger
.
info
(
"createCircleAccount insert {}"
,
account
.
getId
().
intValue
());
resp
.
setDoctorId
(
account
.
getId
().
intValue
());
resp
.
setSeq
(
acct
.
getSeq
());
}
else
{
resp
.
setDoctorId
(
dbAcct
.
getId
().
intValue
());
resp
.
setSeq
(
acct
.
getSeq
());
logger
.
info
(
"createCircleAccount exist {}"
,
dbAcct
.
getId
().
intValue
());
}
respList
.
add
(
resp
);
}
}
catch
(
Exception
e
)
{
logger
.
error
(
"createCircleAccount error:{}"
,
e
.
getMessage
());
throw
e
;
}
return
respList
;
}
@Override
public
List
<
Integer
>
createDiyAccount
(
DiyAcctInitReq
diyAcctInitReq
)
{
logger
.
info
(
"createDiyAccount:{}"
,
JSONObject
.
toJSONString
(
diyAcctInitReq
));
...
...
@@ -163,18 +197,18 @@ public class CircleAccountServiceImpl implements CircleAccountService {
@Transactional
@Override
public
List
<
Integer
>
registerAndCertify
(
DiyAcctInitReq
diyAcctInitReq
)
{
if
(!
diyAcctInitReq
.
getCode
().
equals
(
"618"
))
{
if
(!
diyAcctInitReq
.
getCode
().
equals
(
"618"
))
{
return
null
;
}
logger
.
info
(
"createDiyAccount:{}"
,
JSONObject
.
toJSONString
(
diyAcctInitReq
));
List
<
Integer
>
savedIds
=
new
ArrayList
<>();
Map
<
Integer
,
DiyAcctInit
>
idCardMap
=
new
HashMap
<>();
Map
<
Integer
,
DiyAcctInit
>
idCardMap
=
new
HashMap
<>();
try
{
if
(
CollectionUtils
.
isNotEmpty
(
diyAcctInitReq
.
getDiyAcctInitList
()))
{
for
(
DiyAcctInit
acctInit
:
diyAcctInitReq
.
getDiyAcctInitList
())
{
if
(!
checkIdNum
(
acctInit
.
getCard
()))
{
if
(!
checkIdNum
(
acctInit
.
getCard
()))
{
throw
new
PicaException
(
PicaResultCode
.
PARAM_IS_INVALID
.
code
(),
"身份证号格式错误:"
+
acctInit
.
getCard
());
}
...
...
@@ -203,7 +237,7 @@ public class CircleAccountServiceImpl implements CircleAccountService {
}
// 对这批医生进行实名认证状态更新;
for
(
Integer
id
:
savedIds
)
{
for
(
Integer
id
:
savedIds
)
{
try
{
// check 身份证号是否已被他人使用
String
encryCard
=
EncryptUtils
.
encryptContent
(
idCardMap
.
get
(
id
).
getCard
(),
EncryptConstants
.
ENCRYPT_TYPE_DOCTOR_IDNO
);
...
...
@@ -211,22 +245,22 @@ public class CircleAccountServiceImpl implements CircleAccountService {
Account
accountCard
=
accountMapper
.
getByCard
(
encryCard
);
String
encryMobile
=
EncryptUtils
.
encryptContent
(
idCardMap
.
get
(
id
).
getDecryMobile
(),
EncryptConstants
.
ENCRYPT_TYPE_MOBILE
);
if
(
accountCard
!=
null
&&
!
accountCard
.
getMobilePhone
().
equals
(
encryMobile
))
{
if
(
accountCard
!=
null
&&
!
accountCard
.
getMobilePhone
().
equals
(
encryMobile
))
{
throw
new
PicaException
(
PicaResultCode
.
PARAM_IS_INVALID
.
code
(),
"身份证号已被使用:"
+
idCardMap
.
get
(
id
).
getCard
());
}
Account
doctor
=
accountMapper
.
selectById
(
id
);
boolean
updateFlag
=
false
;
if
(
doctor
.
getStatus
()
!=
null
&&
doctor
.
getStatus
()
!=
3
)
{
if
(
doctor
.
getStatus
()
!=
null
&&
doctor
.
getStatus
()
!=
3
)
{
doctor
.
setStatus
(
3
);
updateFlag
=
true
;
}
if
(
doctor
.
getCertifyStatus
()
!=
null
&&
doctor
.
getCertifyStatus
()
!=
3
)
{
if
(
doctor
.
getCertifyStatus
()
!=
null
&&
doctor
.
getCertifyStatus
()
!=
3
)
{
doctor
.
setCertifyStatus
(
3
);
updateFlag
=
true
;
}
if
(!
updateFlag
)
{
if
(!
updateFlag
)
{
continue
;
}
doctor
.
setName
(
idCardMap
.
get
(
id
).
getUserName
());
...
...
@@ -249,7 +283,7 @@ public class CircleAccountServiceImpl implements CircleAccountService {
}
public
static
void
main
(
String
[]
args
)
{
Map
map
=
getBirthdayAgeSex
(
"310115198210277251"
);
Map
map
=
getBirthdayAgeSex
(
"310115198210277251"
);
System
.
out
.
println
(
map
);
}
...
...
@@ -273,14 +307,14 @@ public class CircleAccountServiceImpl implements CircleAccountService {
boolean
flag
=
true
;
if
(
number
.
length
==
15
)
{
for
(
int
x
=
0
;
x
<
number
.
length
;
x
++)
{
if
(!
flag
){
if
(!
flag
)
{
return
new
HashMap
<
String
,
String
>();
}
flag
=
Character
.
isDigit
(
number
[
x
]);
}
}
else
if
(
number
.
length
==
18
)
{
for
(
int
x
=
0
;
x
<
number
.
length
-
1
;
x
++)
{
if
(!
flag
){
if
(!
flag
)
{
return
new
HashMap
<
String
,
String
>();
}
flag
=
Character
.
isDigit
(
number
[
x
]);
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录