Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 721d99ec58e38a1f586e2bed93cb8f385d1e9bc6

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -1,6 +1,15 @@
package com.ruoyi.account.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.api.model.UserSignRecord;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.account.service.UserSignRecordService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.*;
@@ -73,6 +82,10 @@
   public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
      return appUserService.mobileLogin(mobileLogin);
   }






   @ResponseBody
@@ -348,6 +361,34 @@
      appUserService.onlineRecord();
      return R.ok();
   }
	
	
	
	
	
   /**
    * 根据用户名称模糊搜索用户列表
    * @param name
    * @return
    */
   @PostMapping("/getAppUserByName")
   public R<List<AppUser>> getAppUserByName(@RequestParam("name") String name){
      List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
            .like(AppUser::getName, name));
      return R.ok(list);
   }
	
   /**
    * 根据用户电话模糊搜索用户列表
    * @param phone
    * @return
    */
   @PostMapping("/getAppUserByPhone")
   public R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone){
      List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
            .like(AppUser::getPhone, phone));
      return R.ok(list);
   }

   /**
    * 获取用户列表
@@ -473,17 +514,20 @@



   @GetMapping("/getAppUserByPhone")
   public R<AppUser> getAppUserByPhone(String phone){
      AppUser appUser = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
      return R.ok(appUser);
   }


   @GetMapping("/listByIds")
   List<AppUser> listByIds(List<String> list){
      return appUserService.listByIds(list);
   }
	
	
	
   @PostMapping("/getAppUserByPhone1")
   public R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone){
      AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
            .eq(AppUser::getPhone, phone));
      return R.ok(appUser);
   }

}