xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支

Browse Source
This commit is contained in:
haown 2023-11-15 10:36:40 +08:00
commit c840df74d1
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.enums.GooodsOrderStatusEnum;
import com.xinelu.common.enums.OrderSourceEnum;
import com.xinelu.common.enums.OrderStatusEnum;
import com.xinelu.common.enums.OrderTypeEnum;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.bean.BeanUtils;
import com.xinelu.common.utils.file.FileUploadUtils;
@ -86,9 +87,20 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService {
@Transactional(rollbackFor = Exception.class)
@Override
public AjaxResult insertGoodsOrderEvaluate(OrderEvaluateAndPictureDTO orderEvaluateAndPictureDTO) {
OrderEvaluateAndPictureDTO orderEvaluate = appOrderEvaluateMapper.selectOrderEvaluateAndPictureByOrderNo(orderEvaluateAndPictureDTO.getOrderNo());
if (Objects.nonNull(orderEvaluate)) {
return AjaxResult.error("当前订单已评价！");
}
//泉医模块评价判断
if (OrderSourceEnum.SPRING_DOCTOR.getInfo().equals(orderEvaluateAndPictureDTO.getOrderSource())) {
GoodsOrder goodsOrder = appOrderEvaluateMapper.selectGoodsOrderByOrderNo(orderEvaluateAndPictureDTO.getOrderNo());
if (Objects.isNull(goodsOrder) || StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo())) {
if (Objects.isNull(goodsOrder)) {
return AjaxResult.error("当前订单以失效，请选择其他订单信息！");
}
if (OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.COMPLETED.getInfo()))) {
return AjaxResult.error("当前订单未确认完成，请完成后进行评价！");
}
if (!OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo()))) {
return AjaxResult.error("当前订单未确认收货，请先确认收货后进行评价！");
}
if (StringUtils.equals(GooodsOrderStatusEnum.EVALUATED.getInfo(), goodsOrder.getOrderStatus())) {
@ -103,6 +115,7 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService {
if (insertOrderEvaluateInfo <= 0) {
throw new ServiceException("评价失败，请联系管理员！");
}
//家医评价终止
if (OrderSourceEnum.FAMILY_DOCTOR.getInfo().equals(orderEvaluateAndPictureDTO.getOrderSource())) {
return AjaxResult.success();
}

5
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
View File

@ -197,7 +197,10 @@ public class NursingOrderServiceImpl implements INursingOrderService {
}
if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) {
List<PatientOrder> data = resultHttp.getData();
data.forEach(item -> item.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo()));
for (PatientOrder patientOrder : data) {
patientOrder.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo());
patientOrder.setOrderType(OrderSourceEnum.FAMILY_DOCTOR.getInfo());
}
List<PatientOrder> orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId());
if (CollectionUtils.isNotEmpty(orderEvaluate) && EVALUATED.equals(nurseOrder.getOrderStatus())) {
for (PatientOrder patientOrder : orderEvaluate) {

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/PatientOrder.java
View File

@ -82,6 +82,10 @@ public class PatientOrder extends BaseDomain implements Serializable {
*/
private String orderSource;
/**
* 科室人员头像地址
*/
private String personPictureUrl;
@Override
public boolean equals(Object o) {

3
xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml
View File

@ -69,7 +69,8 @@
</select>
<select id="selectGoodsOrderByOrderNo" resultType="com.xinelu.manage.domain.goodsOrder.GoodsOrder">
select order_status
select order_status,
order_type
from goods_order
where order_no = #{orderNo}
</select>

8
xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml
View File

@ -128,11 +128,11 @@
gr.update_time appleTime,
(select rf.success_time from refund_info rf where rf.order_no = gr.order_no) update_time,
IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_picture_url FROM hospital_person_info WHERE id =
gr.hospital_person_id ), NULL ) person_picture_url,
gr.hospital_person_id ), NULL ) personPictureUrl,
IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_phone FROM hospital_person_info WHERE id =
gr.hospital_person_id ), NULL ) person_phone,
gr.hospital_person_id ), NULL ) personPhone,
IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT academic_title FROM hospital_person_info WHERE id =
gr.hospital_person_id ), NULL ) academic_title,
gr.hospital_person_id ), NULL ) academicTitle,
gr.hospital_person_name
FROM
goods_order gr
@ -381,7 +381,7 @@
gor.order_type,
god.goods_name orderName,
gad.attribute_piture_url pictureUrl,
hpi.person_picture_url,
hpi.person_picture_url personPictureUrl,
nei.composite_score,
'SPRING_DOCTOR' AS orderSource
FROM