优化

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java

@@ -13,7 +13,9 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -115,4 +117,7 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
     @Select("select url from user_face where sys_user_id = #{userId}")
     String getFace(Long userId);
 
+    @Update("update user_face set phone = #{phone} where sys_user_id = #{userId}")
+    String updateFace(@Param("userId") Long userId, @Param("phone")String phone);
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -221,10 +221,16 @@ public class MemberUserServiceImpl implements MemberUserService {
     @Transactional(rollbackFor = Exception.class)
     public void updateUser(Long userId, AppMemberUserUpdateReqVO reqVO) {
         // 校验存在
-        validateUserExists(userId);
+        MemberUserDO memberUserDO = validateUserExists(userId);
+
         // 校验手机唯一
         validateMobileUnique(userId, reqVO.getMobile());
 
+        //修改人脸手机号
+        if (StrUtil.isNotBlank(reqVO.getMobile()) && reqVO.getMobile().equals(memberUserDO.getMobile())){
+            memberUserMapper.updateFace(userId,reqVO.getMobile());
+        }
+
         MemberUserDO updateObj = BeanUtils.toBean(reqVO, MemberUserDO.class).setId(userId);
         memberUserMapper.updateById(updateObj);
         userExpandService.updateUserExpandByuserId(userId,reqVO);
@@ -322,6 +328,11 @@ public class MemberUserServiceImpl implements MemberUserService {
         MemberUserDO memberUserDO = validateUserExists(updateReqVO.getId());
         // 校验手机唯一
         validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile());
+
+        //修改人脸手机号
+        if (StrUtil.isNotBlank(updateReqVO.getMobile()) && updateReqVO.getMobile().equals(memberUserDO.getMobile())){
+            memberUserMapper.updateFace(updateReqVO.getId(),updateReqVO.getMobile());
+        }
         // 校验卡号
         if(StringUtils.isNotBlank(updateReqVO.getCardId())){
             adminCardService.checkCard(updateReqVO.getCardId());

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/AppDevuceController.java

@@ -80,8 +80,9 @@ public class AppDevuceController {
     @GetMapping("/dishes/list")
     @Operation(summary = "获得菜品列表")
     public  CommonResult<List<DishesRespVO>> getDishesList(@RequestParam("carteenId") Long carteenId,
-                                                          @RequestParam("dishecType")Long dishecType) {
+                                                          @RequestParam("dishecType")Long dishecType,
-        List<DishesDO> dishesList = devuceService.getDishesList(carteenId,dishecType);
+                                                           @RequestParam("dishesName")String dishesName) {
+        List<DishesDO> dishesList = devuceService.getDishesList(carteenId,dishecType,dishesName);
         return success(BeanUtils.toBean(dishesList, DishesRespVO.class));
     }
     @GetMapping("/list")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java

@@ -65,7 +65,7 @@ public interface DevuceService {
      */
     DishesDO getDevuceList();
 
-    List<DishesDO> getDishesList(Long carteenId,Long dishecType);
+    List<DishesDO> getDishesList(Long carteenId,Long dishecType,String dishesName);
     /**
      * @Description: 获取菜品分类
      * @Author: qjq

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java

@@ -160,7 +160,7 @@ public class DevuceServiceImpl implements DevuceService {
     }
 
     @Override
-    public List<DishesDO> getDishesList(Long carteenId,Long dishecType) {
+    public List<DishesDO> getDishesList(Long carteenId,Long dishecType,String dishesName) {
         //获取已绑定的菜品id
 //        List<Long> collect = devuceMapper.selectList(new LambdaQueryWrapperX<DevuceDO>()
 //                .eq(DevuceDO::getBind, DevuceDO.BIND))
@@ -182,7 +182,8 @@ public class DevuceServiceImpl implements DevuceService {
         return   dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
                     .eq(DishesDO::getCarteenId,carteenId)
                     .gt(DishesDO::getId,94)
-                    .eq(DishesDO::getDishecType,dishecType).orderByDesc(DishesDO::getId));
+                    .eq(DishesDO::getDishecType,dishecType).orderByDesc(DishesDO::getId)
+                    .like(StrUtil.isNotBlank(dishesName),DishesDO::getDishesName,dishesName));
 //        }
 
     }