From a0bc860a06e1aa9eca7609bef0f0747776d8fb04 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 16 Apr 2021 14:33:46 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
index ad73027..d671aae 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
@@ -119,32 +119,28 @@
//最大人数
int maxPeople = MapUtils.getIntValue(map, "maxPeople");
//预约时间
- String appointmments = JSONArray.toJSONString(map.get("appointments"));
+ List<AppointmentTime> appointmments = JSONArray.parseArray(JSONArray.toJSONString(map.get("appointments")), AppointmentTime.class);
AdvisoryDoctorInfo advisoryDoctorInfo = baseMapper.selectById(Long.parseLong(id));
if (advisoryDoctorInfo == null) {
return ResultBody.failed().msg("查询医生信息失败");
}
- AdvisoryDoctorInfo adi = new AdvisoryDoctorInfo();
- adi.setId(Long.parseLong(id));
- adi.setPrice(price);
- adi.setMaxPeople(maxPeople);
+ advisoryDoctorInfo.setPrice(price);
+ advisoryDoctorInfo.setMaxPeople(maxPeople);
- int b = baseMapper.updateById(adi);
+ int b = baseMapper.updateById(advisoryDoctorInfo);
if (b == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return ResultBody.failed().msg("操作失败");
}
- if (StringUtils.isNotBlank(appointmments)) {
+ if (appointmments != null && appointmments.size() > 0) {
appointmentTimeService.delByAdvisoryId(Long.parseLong(id));
- List<AppointmentTime> times = JSONArray.parseArray(appointmments, AppointmentTime.class);
- for (AppointmentTime time : times) {
+ for (AppointmentTime time : appointmments) {
time.setAdvisoryId(Long.parseLong(id));
appointmentTimeService.saveOrUpdate(time);
}
-
}
return ResultBody.ok().msg("操作成功");
--
Gitblit v1.8.0