From 31dfdc388d3a1a2f1a3a3410e378b24f93087604 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Wed, 21 Aug 2024 15:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=92=A8=E8=AF=A2=E5=B8=88=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scale/service/IReservationService.java    |  2 ++
 .../service/impl/CounselorServiceImpl.java    | 19 +++++++++++++------
 .../service/impl/ReservationServiceImpl.java  |  5 +++++
 .../mapper/scale/ReservationDayMapper.xml     |  2 +-
 .../service/impl/SysUserServiceImpl.java      |  5 +++--
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java
index 66b7c44..7685038 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java
@@ -18,5 +18,7 @@ public interface IReservationService {
 
     List<ReservationDateVo> selectUseDateList(String time, Long counselorId);
 
+    List<ReservationDateVo> selectNotUseDateList(String time, Long counselorId);
+
     List<ReservationOrderVo> selectOrderList(String time, Long counselorId);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java
index 539dcd4..c23bf2e 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java
@@ -150,12 +150,19 @@ public class CounselorServiceImpl implements ICounselorService {
     @Override
     public Boolean updateInfo(CounselorBo bo) {
         Long userId = LoginHelper.getUserId();
-        String name = bo.getName();
-
-        Counselor update = new Counselor();
-        update.setId(userId);
-        //update.setPrice(price);
-        return null;
+        Counselor counselorUpdate = new Counselor();
+        counselorUpdate.setId(userId);
+        counselorUpdate.setProvinceCode(bo.getProvinceCode());
+        counselorUpdate.setCityCode(bo.getCityCode());
+        counselorUpdate.setCountyCode(bo.getCountyCode());
+        boolean counselorFlag = baseMapper.updateById(counselorUpdate) > 0;
+        SysUserBo userUpdate = new SysUserBo();
+        userUpdate.setUserId(userId);
+        userUpdate.setNickName(bo.getName());
+        userUpdate.setSex(bo.getSex());
+        userUpdate.setAddress(bo.getAddress());
+        boolean userFlag = userService.updateUserProfile(userUpdate) > 0;
+        return userFlag && counselorFlag;
     }
 
     /**
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
index 2987899..66a007b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
@@ -76,6 +76,11 @@ public class ReservationServiceImpl implements IReservationService {
         return dayMapper.selectUseDateList(time, counselorId);
     }
 
+    @Override
+    public List<ReservationDateVo> selectNotUseDateList(String time, Long counselorId) {
+        return dayMapper.selectNotUseDateList(time, counselorId);
+    }
+
     @Override
     public List<ReservationOrderVo> selectOrderList(String time, Long counselorId) {
         return dayMapper.selectOrderList(time, counselorId);
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
index a6053a6..4a36cff 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
@@ -16,7 +16,7 @@
     </select>
 
     <select id="selectNotUseDateList" resultType="org.dromara.scale.domain.vo.ReservationDateVo">
-        select rd.id as dayId, DATE_FORMAT(rd.day_time, '%Y-%m-%d') as dayTime, ifnull(t.num, 0) as useNum
+        select rd.id as dayId, DATE_FORMAT(rd.day_time, '%Y-%m-%d') as dayTime, ifnull(t.num, 0) as notUseNum
         from m_reservation_day rd
                  left join (select count(*) as num, day_id
                             from m_reservation_time
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index 3cb4159..1ee9be2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -394,9 +394,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.update(null,
             new LambdaUpdateWrapper<SysUser>()
                 .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
-                .set(SysUser::getPhonenumber, user.getPhonenumber())
-                .set(SysUser::getEmail, user.getEmail())
+                .set(ObjectUtil.isNotNull(user.getPhonenumber()), SysUser::getPhonenumber, user.getPhonenumber())
+                .set(ObjectUtil.isNotNull(user.getEmail()), SysUser::getEmail, user.getEmail())
                 .set(SysUser::getSex, user.getSex())
+                .set(ObjectUtil.isNotNull(user.getAddress()), SysUser::getAddress, user.getAddress())
                 .eq(SysUser::getUserId, user.getUserId()));
     }