Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
B
byh-family-doctor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
包
包
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
杨凯
byh-family-doctor
Commits
644160e2
提交
644160e2
authored
3月 19, 2024
作者:
杨凯
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat:家庭医生初始化
上级
eaee40cf
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
26 行增加
和
26 行删除
+26
-26
MobileBenefitPackageClient.java
...ihui/family/doctor/client/MobileBenefitPackageClient.java
+4
-4
MobileBenefitRes.java
...m/ebaiyihui/family/doctor/common/bo/MobileBenefitRes.java
+1
-1
RegisterPatientVo.java
.../ebaiyihui/family/doctor/common/vo/RegisterPatientVo.java
+1
-1
MobileBenefitPackageController.java
...tor/server/controller/MobileBenefitPackageController.java
+4
-4
MobileBenefitPackageService.java
...ly/doctor/server/service/MobileBenefitPackageService.java
+4
-4
MobileBenefitPackageServiceImpl.java
.../server/service/impl/MobileBenefitPackageServiceImpl.java
+12
-12
没有找到文件。
family-doctor-client/src/main/java/com/ebaiyihui/family/doctor/client/MobileBenefitPackageClient.java
浏览文件 @
644160e2
package
com
.
ebaiyihui
.
family
.
doctor
.
client
;
package
com
.
ebaiyihui
.
family
.
doctor
.
client
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
p
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.RegistPatientVo
;
import
com.ebaiyihui.family.doctor.common.vo.Regist
er
PatientVo
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
@@ -22,9 +22,9 @@ public interface MobileBenefitPackageClient {
...
@@ -22,9 +22,9 @@ public interface MobileBenefitPackageClient {
@GetMapping
(
"/h5/login"
)
@GetMapping
(
"/h5/login"
)
@ApiOperation
(
value
=
"登陆并注册就诊卡"
)
@ApiOperation
(
value
=
"登陆并注册就诊卡"
)
public
BaseResponse
<
RegistPatientVo
>
login
(
@RequestParam
(
"token"
)
String
token
);
public
BaseResponse
<
Regist
er
PatientVo
>
login
(
@RequestParam
(
"token"
)
String
token
);
@PostMapping
(
"/benefit/add"
)
@PostMapping
(
"/benefit/add"
)
@ApiOperation
(
value
=
"生成权益订单同步推送"
)
@ApiOperation
(
value
=
"生成权益订单同步推送"
)
public
Result
<
MobileBenefitRes
p
>
addBenefitPackage
(
@RequestBody
List
<
MobileBenefitPackageVo
>
vos
);
public
Result
<
MobileBenefitRes
>
addBenefitPackage
(
@RequestBody
List
<
MobileBenefitPackageVo
>
vos
);
}
}
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/bo/MobileBenefitRes
p
.java
→
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/bo/MobileBenefitRes.java
浏览文件 @
644160e2
...
@@ -9,7 +9,7 @@ import lombok.Data;
...
@@ -9,7 +9,7 @@ import lombok.Data;
* @Description
* @Description
*/
*/
@Data
@Data
public
class
MobileBenefitRes
p
{
public
class
MobileBenefitRes
{
private
String
orderStatus
;
private
String
orderStatus
;
...
...
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/RegistPatientVo.java
→
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/Regist
er
PatientVo.java
浏览文件 @
644160e2
...
@@ -11,7 +11,7 @@ import lombok.Data;
...
@@ -11,7 +11,7 @@ import lombok.Data;
* @Description
* @Description
*/
*/
@Data
@Data
public
class
RegistPatientVo
{
public
class
Regist
er
PatientVo
{
@ApiModelProperty
(
"就诊人信息"
)
@ApiModelProperty
(
"就诊人信息"
)
CardDetailsInfoRespVO
patientInfo
;
CardDetailsInfoRespVO
patientInfo
;
...
...
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/controller/MobileBenefitPackageController.java
浏览文件 @
644160e2
package
com
.
ebaiyihui
.
family
.
doctor
.
server
.
controller
;
package
com
.
ebaiyihui
.
family
.
doctor
.
server
.
controller
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
p
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.RegistPatientVo
;
import
com.ebaiyihui.family.doctor.common.vo.Regist
er
PatientVo
;
import
com.ebaiyihui.family.doctor.server.service.MobileBenefitPackageService
;
import
com.ebaiyihui.family.doctor.server.service.MobileBenefitPackageService
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -31,13 +31,13 @@ public class MobileBenefitPackageController {
...
@@ -31,13 +31,13 @@ public class MobileBenefitPackageController {
@GetMapping
(
"/h5/login"
)
@GetMapping
(
"/h5/login"
)
@ApiOperation
(
value
=
"登陆并注册就诊卡"
)
@ApiOperation
(
value
=
"登陆并注册就诊卡"
)
public
BaseResponse
<
RegistPatientVo
>
login
(
@RequestParam
(
"token"
)
String
token
)
{
public
BaseResponse
<
Regist
er
PatientVo
>
login
(
@RequestParam
(
"token"
)
String
token
)
{
return
mobileBenefitPackageService
.
register
(
token
);
return
mobileBenefitPackageService
.
register
(
token
);
}
}
@PostMapping
(
"/benefit/activate"
)
@PostMapping
(
"/benefit/activate"
)
@ApiOperation
(
value
=
"生成权益订单同步推送"
)
@ApiOperation
(
value
=
"生成权益订单同步推送"
)
public
Result
<
MobileBenefitRes
p
>
addBenefitPackage
(
@RequestBody
List
<
MobileBenefitPackageVo
>
vos
){
public
Result
<
MobileBenefitRes
>
addBenefitPackage
(
@RequestBody
List
<
MobileBenefitPackageVo
>
vos
){
return
mobileBenefitPackageService
.
addBenefitPackage
(
vos
);
return
mobileBenefitPackageService
.
addBenefitPackage
(
vos
);
}
}
}
}
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/MobileBenefitPackageService.java
浏览文件 @
644160e2
package
com
.
ebaiyihui
.
family
.
doctor
.
server
.
service
;
package
com
.
ebaiyihui
.
family
.
doctor
.
server
.
service
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
p
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.RegistPatientVo
;
import
com.ebaiyihui.family.doctor.common.vo.Regist
er
PatientVo
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
java.util.List
;
import
java.util.List
;
...
@@ -17,7 +17,7 @@ import java.util.List;
...
@@ -17,7 +17,7 @@ import java.util.List;
public
interface
MobileBenefitPackageService
{
public
interface
MobileBenefitPackageService
{
BaseResponse
<
RegistPatientVo
>
register
(
String
token
);
BaseResponse
<
Regist
er
PatientVo
>
register
(
String
token
);
Result
<
MobileBenefitRes
p
>
addBenefitPackage
(
List
<
MobileBenefitPackageVo
>
vos
);
Result
<
MobileBenefitRes
>
addBenefitPackage
(
List
<
MobileBenefitPackageVo
>
vos
);
}
}
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/MobileBenefitPackageServiceImpl.java
浏览文件 @
644160e2
...
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.ebaiyihui.card.common.CardServiceApi
;
import
com.ebaiyihui.card.common.CardServiceApi
;
import
com.ebaiyihui.card.common.vo.CardDetailsInfoRespVO
;
import
com.ebaiyihui.card.common.vo.CardDetailsInfoRespVO
;
import
com.ebaiyihui.card.common.vo.RegisterCardReqVO
;
import
com.ebaiyihui.card.common.vo.RegisterCardReqVO
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
p
;
import
com.ebaiyihui.family.doctor.common.bo.MobileBenefitRes
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.bo.Result
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.MobileBenefitPackageVo
;
import
com.ebaiyihui.family.doctor.common.vo.RegistPatientVo
;
import
com.ebaiyihui.family.doctor.common.vo.Regist
er
PatientVo
;
import
com.ebaiyihui.family.doctor.server.common.constants.CommonConstants
;
import
com.ebaiyihui.family.doctor.server.common.constants.CommonConstants
;
import
com.ebaiyihui.family.doctor.server.entity.MobileBenefitPackageEntity
;
import
com.ebaiyihui.family.doctor.server.entity.MobileBenefitPackageEntity
;
import
com.ebaiyihui.family.doctor.server.entity.PatientEntity
;
import
com.ebaiyihui.family.doctor.server.entity.PatientEntity
;
...
@@ -49,7 +49,7 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
...
@@ -49,7 +49,7 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
private
MobileBenefitPackageMapper
mobileBenefitPackageMapper
;
private
MobileBenefitPackageMapper
mobileBenefitPackageMapper
;
@Override
@Override
public
BaseResponse
<
RegistPatientVo
>
register
(
String
token
)
{
public
BaseResponse
<
Regist
er
PatientVo
>
register
(
String
token
)
{
token
=
token
.
replace
(
" "
,
"+"
);
token
=
token
.
replace
(
" "
,
"+"
);
Map
<
String
,
String
>
map
=
JSONObject
.
parseObject
(
DESUtils
.
decrypt
(
token
,
CommonConstants
.
DES_SECRET
),
Map
.
class
);
Map
<
String
,
String
>
map
=
JSONObject
.
parseObject
(
DESUtils
.
decrypt
(
token
,
CommonConstants
.
DES_SECRET
),
Map
.
class
);
log
.
info
(
"解析token结果:{}"
,
map
);
log
.
info
(
"解析token结果:{}"
,
map
);
...
@@ -80,9 +80,9 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
...
@@ -80,9 +80,9 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
return
BaseResponse
.
error
(
"注册就诊卡失败"
);
return
BaseResponse
.
error
(
"注册就诊卡失败"
);
}
}
CardDetailsInfoRespVO
data
=
response
.
getData
();
CardDetailsInfoRespVO
data
=
response
.
getData
();
Regist
PatientVo
registPatientVo
=
new
Regist
PatientVo
();
Regist
erPatientVo
registerPatientVo
=
new
Register
PatientVo
();
registPatientVo
.
setPatientInfo
(
data
);
regist
er
PatientVo
.
setPatientInfo
(
data
);
registPatientVo
.
setActivateOrderId
(
map
.
get
(
"activateOrderId"
));
regist
er
PatientVo
.
setActivateOrderId
(
map
.
get
(
"activateOrderId"
));
String
patientId
=
map
.
get
(
"patient_id"
);
String
patientId
=
map
.
get
(
"patient_id"
);
if
(!
StringUtils
.
isEmpty
(
patientId
))
{
if
(!
StringUtils
.
isEmpty
(
patientId
))
{
// 查询患者信息
// 查询患者信息
...
@@ -108,11 +108,11 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
...
@@ -108,11 +108,11 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
entity
.
setUserId
(
map
.
get
(
"patient_id"
));
entity
.
setUserId
(
map
.
get
(
"patient_id"
));
mobileBenefitPackageMapper
.
update
(
entity
);
mobileBenefitPackageMapper
.
update
(
entity
);
}
}
return
BaseResponse
.
success
(
registPatientVo
);
return
BaseResponse
.
success
(
regist
er
PatientVo
);
}
}
@Override
@Override
public
Result
<
MobileBenefitRes
p
>
addBenefitPackage
(
List
<
MobileBenefitPackageVo
>
vos
)
{
public
Result
<
MobileBenefitRes
>
addBenefitPackage
(
List
<
MobileBenefitPackageVo
>
vos
)
{
log
.
info
(
"推送订单信息:{}"
,
vos
);
log
.
info
(
"推送订单信息:{}"
,
vos
);
try
{
try
{
vos
.
forEach
(
vo
->
{
vos
.
forEach
(
vo
->
{
...
@@ -127,15 +127,15 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
...
@@ -127,15 +127,15 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
return
Result
.
success
(
success
());
return
Result
.
success
(
success
());
}
}
private
MobileBenefitRes
p
success
()
{
private
MobileBenefitRes
success
()
{
MobileBenefitRes
p
resp
=
new
MobileBenefitResp
();
MobileBenefitRes
resp
=
new
MobileBenefitRes
();
resp
.
setOrderStatus
(
"OOS"
);
resp
.
setOrderStatus
(
"OOS"
);
resp
.
setOrderDesc
(
"成功"
);
resp
.
setOrderDesc
(
"成功"
);
return
resp
;
return
resp
;
}
}
private
MobileBenefitRes
p
failed
()
{
private
MobileBenefitRes
failed
()
{
MobileBenefitRes
p
resp
=
new
MobileBenefitResp
();
MobileBenefitRes
resp
=
new
MobileBenefitRes
();
resp
.
setOrderStatus
(
"OOF"
);
resp
.
setOrderStatus
(
"OOF"
);
resp
.
setOrderDesc
(
"失败"
);
resp
.
setOrderDesc
(
"失败"
);
return
resp
;
return
resp
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论