From c30851026169acc0f330825d90baf435edb4341d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 10:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 202 ++++++++++++++++++++++++++++++----------
ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchUpdateIntegralDto.java | 17 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java | 6 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java | 3
ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml | 16 +++
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | 10 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralChangeRecord.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java | 3
8 files changed, 210 insertions(+), 52 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 5ae8138..fd5d5cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -1,28 +1,36 @@
package com.ruoyi.web.controller.api;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.BatchUpdateIntegralDto;
import com.ruoyi.system.dto.UpdateAppUserDto;
import com.ruoyi.system.export.AppUserGoldImport;
import com.ruoyi.system.export.AppUserImport;
-import com.ruoyi.system.model.TAppUser;
-import com.ruoyi.system.model.TCompany;
-import com.ruoyi.system.model.TGoldChangeRecord;
+import com.ruoyi.system.export.BigGiftPackageImport;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.AppUserListQuery;
+import com.ruoyi.system.query.BigGiftPackageQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TCompanyService;
import com.ruoyi.system.service.TGoldChangeRecordService;
+import com.ruoyi.system.service.TIntegralChangeRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.transaction.annotation.Propagation;
@@ -33,14 +41,18 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -57,7 +69,7 @@
@Resource
- private TAppUserService appUserService;
+ private TAppUserService appUserService;
@Autowired
@@ -72,6 +84,9 @@
@Autowired
private TGoldChangeRecordService goldChangeRecordService;
+ @Autowired
+ private TIntegralChangeRecordService integralChangeRecordService;
+
@ApiOperation(value = "用户管理分页列表")
@PostMapping(value = "/pageList")
@@ -85,7 +100,7 @@
@Log(title = "小程序用户-修改状态", businessType = BusinessType.UPDATE)
public R pageList(@RequestParam Integer id) {
TAppUser appUser = appUserService.getById(id);
- appUser.setStatus(appUser.getStatus()==1?2:1);
+ appUser.setStatus(appUser.getStatus() == 1 ? 2 : 1);
appUserService.updateById(appUser);
return R.ok();
}
@@ -96,7 +111,7 @@
@Log(title = "小程序用户-修改用户信息", businessType = BusinessType.UPDATE)
public R updateAppUser(@RequestBody UpdateAppUserDto dto) {
- if(dto.getCode()!=null && !dto.getCode().isEmpty()){
+ if (dto.getCode() != null && !dto.getCode().isEmpty()) {
long count = appUserService.count(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getCode, dto.getCode()).ne(TAppUser::getId, dto.getId()));
if (count > 0) {
return R.fail("推广号已存在");
@@ -104,21 +119,21 @@
}
TAppUser appUser = appUserService.getById(dto.getId());
String code = appUser.getCode();
- if(dto.getCode()!=null && !dto.getCode().isEmpty() && !code.equals(dto.getCode())){
+ if (dto.getCode() != null && !dto.getCode().isEmpty() && !code.equals(dto.getCode())) {
appUser.setCode(dto.getCode());
// 移除之前的二维码
redisTemplate.delete("USER_WX_IMG" + appUser.getId());
}
- if(dto.getPromotionStatus()!=null){
+ if (dto.getPromotionStatus() != null) {
appUser.setPromotionStatus(dto.getPromotionStatus());
}
- if(dto.getUserType()!=null){
+ if (dto.getUserType() != null) {
appUser.setUserType(dto.getUserType());
}
- if(dto.getReferrerUserId()!=null){
+ if (dto.getReferrerUserId() != null) {
appUser.setReferrerUserId(dto.getReferrerUserId());
}
- if(dto.getCompanyId()!=null){
+ if (dto.getCompanyId() != null) {
appUser.setCompanyId(dto.getCompanyId());
}
appUserService.updateById(appUser);
@@ -129,7 +144,7 @@
@ApiOperation(value = "查看详情")
@GetMapping(value = "/detail")
public R<TAppUser> detail(@RequestParam String id) {
- return R.ok(appUserService.getById( id));
+ return R.ok(appUserService.getById(id));
}
@@ -165,26 +180,26 @@
JSONObject result = new JSONObject();
int i = 1;
for (AppUserGoldImport appUserGoldImport : imports) {
- if (!StringUtils.hasLength(appUserGoldImport.getUserPhone())){
- result.append("第"+i+"行：[", "用户手机号"+"]不能为空");
+ if (!StringUtils.hasLength(appUserGoldImport.getUserPhone())) {
+ result.append("第" + i + "行：[", "用户手机号" + "]不能为空");
continue;
}
- if (!StringUtils.hasLength(appUserGoldImport.getGold())){
- result.append("第"+i+"行：[", "金币"+"]不能为空");
+ if (!StringUtils.hasLength(appUserGoldImport.getGold())) {
+ result.append("第" + i + "行：[", "金币" + "]不能为空");
continue;
}
TAppUser user = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, appUserGoldImport.getUserPhone()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));
- if (user==null){
- result.append("第"+i+"行：[", "用户不存在"+"]");
+ if (user == null) {
+ result.append("第" + i + "行：[", "用户不存在" + "]");
continue;
}
- BigDecimal totalPrice= BigDecimal.ZERO;
+ BigDecimal totalPrice = BigDecimal.ZERO;
try {
- totalPrice= new BigDecimal(appUserGoldImport.getGold());
+ totalPrice = new BigDecimal(appUserGoldImport.getGold());
user.setGoldBalance(user.getGoldBalance().add(totalPrice).setScale(2, RoundingMode.HALF_UP));
} catch (Exception e) {
- result.append("第"+i+"行：[", "金币"+"]格式错误");
+ result.append("第" + i + "行：[", "金币" + "]格式错误");
continue;
}
@@ -197,15 +212,14 @@
goldChangeRecord.setCreateUserId(userId);
goldChangeRecordService.save(goldChangeRecord);
- appUserService.updateById( user);
+ appUserService.updateById(user);
i++;
}
- if(!result.isEmpty()){
+ if (!result.isEmpty()) {
return R.fail(result.toString());
}
return R.ok();
}
-
@Log(title = "小程序用户-用户导入", businessType = BusinessType.IMPORT)
@@ -238,46 +252,46 @@
JSONObject result = new JSONObject();
int i = 1;
for (AppUserImport appUserImport : imports) {
- if (!StringUtils.hasLength(appUserImport.getUsername())){
- result.append("第"+i+"行：[", "用户名"+"]不能为空");
+ if (!StringUtils.hasLength(appUserImport.getUsername())) {
+ result.append("第" + i + "行：[", "用户名" + "]不能为空");
continue;
}
- if (!StringUtils.hasLength(appUserImport.getPhone())){
- result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ if (!StringUtils.hasLength(appUserImport.getPhone())) {
+ result.append("第" + i + "行：[", "联系电话" + "]不能为空");
continue;
}
- if (!StringUtils.hasLength(appUserImport.getSex())){
- result.append("第"+i+"行：[", "性别"+"]不能为空");
+ if (!StringUtils.hasLength(appUserImport.getSex())) {
+ result.append("第" + i + "行：[", "性别" + "]不能为空");
continue;
}
- if (!StringUtils.hasLength(appUserImport.getBirth())){
- result.append("第"+i+"行：[", "出生日期"+"]不能为空");
+ if (!StringUtils.hasLength(appUserImport.getBirth())) {
+ result.append("第" + i + "行：[", "出生日期" + "]不能为空");
continue;
}
- if (!StringUtils.hasLength(appUserImport.getRole())){
- result.append("第"+i+"行：[", "角色"+"]不能为空");
+ if (!StringUtils.hasLength(appUserImport.getRole())) {
+ result.append("第" + i + "行：[", "角色" + "]不能为空");
continue;
}
- if (!StringUtils.hasLength(appUserImport.getCode())){
- result.append("第"+i+"行：[", "推广号"+"]不能为空");
+ if (!StringUtils.hasLength(appUserImport.getCode())) {
+ result.append("第" + i + "行：[", "推广号" + "]不能为空");
continue;
}
TAppUser user = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, appUserImport.getPhone()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));
- if (user!=null){
- result.append("第"+i+"行：[", "联系电话已存在"+"]");
+ if (user != null) {
+ result.append("第" + i + "行：[", "联系电话已存在" + "]");
continue;
}
TAppUser user1 = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getCode, appUserImport.getCode()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));
- if (user1!=null){
- result.append("第"+i+"行：[", "推广号已存在"+"]");
+ if (user1 != null) {
+ result.append("第" + i + "行：[", "推广号已存在" + "]");
continue;
}
String sex = appUserImport.getSex();
Integer gender = "男".equals(sex) ? 1 : "女".equals(sex) ? 2 : null;
- if(gender==null){
- result.append("第"+i+"行：[", "性别"+"]格式错误");
+ if (gender == null) {
+ result.append("第" + i + "行：[", "性别" + "]格式错误");
continue;
}
@@ -286,14 +300,14 @@
try {
birthday = LocalDate.parse(birth);
} catch (Exception e) {
- result.append("第"+i+"行：[", "出生日期"+"]格式错误");
+ result.append("第" + i + "行：[", "出生日期" + "]格式错误");
continue;
}
String role = appUserImport.getRole();
Integer userType = "游客".equals(role) ? 1 : "营销员".equals(role) ? 2 : "合伙人".equals(role) ? 3 : null;
- if(userType==null){
- result.append("第"+i+"行：[", "角色"+"]格式错误");
+ if (userType == null) {
+ result.append("第" + i + "行：[", "角色" + "]格式错误");
continue;
}
@@ -305,28 +319,114 @@
tAppUser.setBirthday(birthday);
tAppUser.setUserType(userType);
- if(appUserImport.getReferrerCode()!=null){
+ if (appUserImport.getReferrerCode() != null) {
TAppUser referrerUser = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getCode, appUserImport.getReferrerCode()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));
- if(referrerUser!=null){
+ if (referrerUser != null) {
tAppUser.setReferrerUserId(referrerUser.getId());
tAppUser.setReferrerStatus(1);
tAppUser.setReferrerTime(LocalDateTime.now());
}
}
- if(appUserImport.getDealerCode()!=null){
+ if (appUserImport.getDealerCode() != null) {
}
TCompany one = companyService.getOne(new LambdaQueryWrapper<TCompany>().eq(TCompany::getCode, appUserImport.getDealerCode()).ne(TCompany::getStatus, 3).last("LIMIT 1"));
- if(one!=null){
+ if (one != null) {
tAppUser.setCompanyId(one.getId());
}
- appUserService.save( user);
+ appUserService.save(user);
i++;
}
- if(!result.isEmpty()){
+ if (!result.isEmpty()) {
return R.fail(result.toString());
}
return R.ok();
}
+
+ @ApiOperation(value = "小程序用户导出")
+ @PostMapping(value = "/exportAppUser")
+ @Log(title = "小程序用户-导出", businessType = BusinessType.EXPORT)
+ public void exportAppUser(@RequestBody AppUserListQuery query) {
+
+ List<TAppUser> list = appUserService.exportAppUser(query);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TAppUser.class, list);
+ HttpServletResponse response = WebUtils.response();
+ assert response != null;
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("小程序用户导出信息.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+ @ApiOperation(value = "一键清空金币")
+ @GetMapping(value = "/clearGold")
+ @Log(title = "小程序用户-一键清空金币", businessType = BusinessType.UPDATE)
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ public R clearGold() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ List<TAppUser> list = appUserService.list();
+
+ ArrayList<TGoldChangeRecord> tGoldChangeRecords = new ArrayList<>();
+ for (TAppUser user : list) {
+
+ TGoldChangeRecord tGoldChangeRecord = new TGoldChangeRecord();
+ tGoldChangeRecord.setAppUserId(user.getId());
+ tGoldChangeRecord.setPrice(user.getGoldBalance());
+ tGoldChangeRecord.setBalance(BigDecimal.ZERO);
+ tGoldChangeRecord.setType(2);
+ tGoldChangeRecord.setCreateUserId(userId);
+ tGoldChangeRecords.add(tGoldChangeRecord);
+ }
+
+ goldChangeRecordService.saveBatch(tGoldChangeRecords);
+ appUserService.update(new LambdaUpdateWrapper<TAppUser>().set(TAppUser::getGoldBalance, 0));
+ return R.ok();
+
+ }
+
+
+ @ApiOperation(value = "批量修改积分")
+ @PostMapping(value = "/batchUpdateGold")
+ @Log(title = "小程序用户-批量修改积分", businessType = BusinessType.UPDATE)
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ public R batchUpdateGold(@RequestBody BatchUpdateIntegralDto dto) {
+ Long userId = tokenService.getLoginUser().getUserId();
+ List<Integer> userIds = dto.getUserIds();
+ List<TAppUser> tAppUsers = appUserService.listByIds(userIds);
+ List<TIntegralChangeRecord> tIntegralChangeRecords = new ArrayList<>();
+ for (TAppUser tAppUser : tAppUsers) {
+ TIntegralChangeRecord tIntegralChangeRecord = new TIntegralChangeRecord();
+ tIntegralChangeRecord.setAppUserId(tAppUser.getId());
+ tIntegralChangeRecord.setOldBalance(new BigDecimal(tAppUser.getAccumulativeIntegral()));
+ tIntegralChangeRecord.setPrice(new BigDecimal(dto.getIntegral()));
+ tIntegralChangeRecord.setCreateUserId(userId);
+ tIntegralChangeRecords.add(tIntegralChangeRecord);
+
+ tAppUser.setAccumulativeIntegral(dto.getIntegral());
+ }
+ integralChangeRecordService.saveBatch(tIntegralChangeRecords);
+ appUserService.updateBatchById(tAppUsers);
+ return R.ok();
+
+
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchUpdateIntegralDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchUpdateIntegralDto.java
new file mode 100644
index 0000000..0323faf
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchUpdateIntegralDto.java
@@ -0,0 +1,17 @@
+package com.ruoyi.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("批量更新积分参数")
+public class BatchUpdateIntegralDto {
+ @ApiModelProperty("用户ids")
+ private List<Integer> userIds;
+
+ @ApiModelProperty("积分")
+ private Integer integral;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
index 1499092..381048c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
@@ -27,4 +27,7 @@
List<PromotionPageListVo> promotionPageListExport(@Param("query") PromotionPageListQuery query);
+ List<TAppUser> exportAppUser(@Param("query") AppUserListQuery query);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
index cbcfa97..5fcd6f8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -41,14 +42,17 @@
@ApiModelProperty(value = "姓名")
@TableField("name")
+ @Excel(name = "用户名", width = 20,orderNum = "1")
private String name;
@ApiModelProperty(value = "头像")
@TableField("profile_photo")
+ @Excel(name = "头像", width = 20, imageType = 1,type = 2,orderNum = "0")
private String profilePhoto;
@ApiModelProperty(value = "推广号")
@TableField("code")
+ @Excel(name = "推广号", width = 20,orderNum = "2")
private String code;
@ApiModelProperty(value = "推广二维码地址")
@@ -57,15 +61,18 @@
@ApiModelProperty(value = "手机号")
@TableField("phone")
+ @Excel(name = "联系电话", width = 20,orderNum = "3")
private String phone;
@ApiModelProperty(value = "性别（1=男，2=女）")
@TableField("gender")
+ @Excel(name = "性别", width = 20,orderNum = "4",replace = {"男_1","女_2"})
private Integer gender;
@ApiModelProperty(value = "生日")
@TableField("birthday")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "出生日期", width = 20,orderNum = "5",format = "yyyy-MM-dd")
private LocalDate birthday;
@ApiModelProperty(value = "微信openid")
@@ -74,11 +81,13 @@
// 1:游客;2:营销员;3:合伙人;
@ApiModelProperty(value = "角色（1=游客，2=营销员，3=合伙人）")
@TableField("user_type")
+ @Excel(name = "角色", width = 20,orderNum = "7",replace = {"游客_1","营销员_2","合伙人_3"})
private Integer userType;
@ApiModelProperty(value = "注册时间")
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "注册时间", width = 20,orderNum = "6",format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "历史累计积分")
@@ -111,6 +120,7 @@
@ApiModelProperty(value = "状态（1=正常，2=冻结，3=删除）")
@TableField("status")
+ @Excel(name = "状态", width = 20,orderNum = "8",replace = {"正常_1","冻结_2","删除_3"})
private Integer status;
@ApiModelProperty(value = "股东ID")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralChangeRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralChangeRecord.java
index 5b147e2..db94898 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralChangeRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralChangeRecord.java
@@ -54,7 +54,10 @@
@ApiModelProperty(value = "操作人id")
@TableField("create_user_id")
- private Integer createUserId;
+ private Long createUserId;
+ @ApiModelProperty(value = "修改前积分余额")
+ @TableField("old_balance")
+ private BigDecimal oldBalance;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
index d311741..e3565a9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
@@ -41,4 +41,7 @@
List<PromotionPageListVo> promotionPageListExport(@Valid PromotionPageListQuery query);
+ List<TAppUser> exportAppUser(AppUserListQuery query);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
index ce048e1..9291154 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -144,4 +144,10 @@
return list;
}
+
+ @Override
+ public List<TAppUser> exportAppUser(AppUserListQuery query) {
+ List<TAppUser> list = this.baseMapper.exportAppUser(query);
+ return list;
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
index 7b8967f..e54ef9b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
@@ -83,5 +83,21 @@
</if>
order by t1.create_time desc
</select>
+ <select id="exportAppUser" resultType="com.ruoyi.system.model.TAppUser">
+ select t1.* from t_app_user t1
+ where t1.status != 3
+ <if test="query.nickName != null and query.nickName != ''">
+ and t1.nick_name like concat('%',#{query.nickName},'%')
+ </if>
+
+ <if test="query.phoneNumber != null and query.phoneNumber != ''">
+ and t1.phone_number like concat('%',#{query.phoneNumber},'%')
+ </if>
+ <if test="query.status != null">
+ and t1.status = #{query.status}
+ </if>
+
+ order by t1.create_time desc
+ </select>
</mapper>
--
Gitblit v1.7.1