From 4cd8f0c449c71191458d16b2155b4062ef063f3e Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 20 十二月 2025 17:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 282 insertions(+), 2 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 1d1bcf3..5ae8138 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,18 +1,46 @@
package com.ruoyi.web.controller.api;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.framework.web.service.TokenService;
+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.query.AppUserListQuery;
import com.ruoyi.system.service.TAppUserService;
+import com.ruoyi.system.service.TCompanyService;
+import com.ruoyi.system.service.TGoldChangeRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -24,29 +52,281 @@
*/
@RestController
@RequestMapping("/t-app-user")
-@Api(tags = "用户管理")
+@Api(tags = "(嘉视达)用户管理")
public class TAppUserController {
+
+
@Resource
private TAppUserService appUserService;
+
+
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+ private TokenService tokenService;
+
+ @Autowired
+ private TCompanyService companyService;
+
+ @Autowired
+ private TGoldChangeRecordService goldChangeRecordService;
+
@ApiOperation(value = "用户管理分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TAppUser>> pageList(@RequestBody AppUserListQuery query) {
return R.ok(appUserService.pageList(query));
}
+
+
@ApiOperation(value = "修改状态")
@GetMapping(value = "/changeStatus")
@Log(title = "小程序用户-修改状态", businessType = BusinessType.UPDATE)
- public R pageList(@RequestParam String id) {
+ public R pageList(@RequestParam Integer id) {
TAppUser appUser = appUserService.getById(id);
appUser.setStatus(appUser.getStatus()==1?2:1);
appUserService.updateById(appUser);
return R.ok();
}
+
+
+ @ApiOperation(value = "修改用户信息")
+ @PostMapping(value = "/updateAppUser")
+ @Log(title = "小程序用户-修改用户信息", businessType = BusinessType.UPDATE)
+ public R updateAppUser(@RequestBody UpdateAppUserDto dto) {
+
+ 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("推广号已存在");
+ }
+ }
+ TAppUser appUser = appUserService.getById(dto.getId());
+ String code = appUser.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){
+ appUser.setPromotionStatus(dto.getPromotionStatus());
+ }
+ if(dto.getUserType()!=null){
+ appUser.setUserType(dto.getUserType());
+ }
+ if(dto.getReferrerUserId()!=null){
+ appUser.setReferrerUserId(dto.getReferrerUserId());
+ }
+ if(dto.getCompanyId()!=null){
+ appUser.setCompanyId(dto.getCompanyId());
+ }
+ appUserService.updateById(appUser);
+ return R.ok();
+ }
+
+
@ApiOperation(value = "查看详情")
@GetMapping(value = "/detail")
public R<TAppUser> detail(@RequestParam String id) {
return R.ok(appUserService.getById( id));
}
+
+
+ @Log(title = "小程序用户-金币导入", businessType = BusinessType.IMPORT)
+ @ApiOperation(value = "小程序用户-金币导入")
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ @PostMapping("/importGold")
+ public R<String> importGold(@RequestPart("file") MultipartFile file) {
+
+ Long userId = tokenService.getLoginUser().getUserId();
+
+ List<AppUserGoldImport> imports = new ArrayList<>();
+ ImportParams params = new ImportParams();
+ params.setHeadRows(1); //表头行数
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ imports = ExcelImportUtil.importExcel(inputStream,
+ AppUserGoldImport.class, params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServiceException("金币导入失败!");
+ } finally {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ if (CollectionUtils.isEmpty(imports)) {
+ throw new ServiceException("金币导入数据为空!");
+ }
+ JSONObject result = new JSONObject();
+ int i = 1;
+ for (AppUserGoldImport appUserGoldImport : imports) {
+ if (!StringUtils.hasLength(appUserGoldImport.getUserPhone())){
+ result.append("第"+i+"行：[", "用户手机号"+"]不能为空");
+ continue;
+ }
+ 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+"行：[", "用户不存在"+"]");
+ continue;
+ }
+ BigDecimal totalPrice= BigDecimal.ZERO;
+ try {
+ totalPrice= new BigDecimal(appUserGoldImport.getGold());
+ user.setGoldBalance(user.getGoldBalance().add(totalPrice).setScale(2, RoundingMode.HALF_UP));
+ } catch (Exception e) {
+ result.append("第"+i+"行：[", "金币"+"]格式错误");
+ continue;
+ }
+
+ // 添加变更记录
+ TGoldChangeRecord goldChangeRecord = new TGoldChangeRecord();
+ goldChangeRecord.setAppUserId(user.getId());
+ goldChangeRecord.setType(1);
+ goldChangeRecord.setPrice(totalPrice);
+ goldChangeRecord.setBalance(user.getGoldBalance());
+ goldChangeRecord.setCreateUserId(userId);
+ goldChangeRecordService.save(goldChangeRecord);
+
+ appUserService.updateById( user);
+ i++;
+ }
+ if(!result.isEmpty()){
+ return R.fail(result.toString());
+ }
+ return R.ok();
+ }
+
+
+
+ @Log(title = "小程序用户-用户导入", businessType = BusinessType.IMPORT)
+ @ApiOperation(value = "小程序用户-用户导入")
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ @PostMapping("/importUser")
+ public R<String> importUser(@RequestPart("file") MultipartFile file) {
+
+ List<AppUserImport> imports = new ArrayList<>();
+ ImportParams params = new ImportParams();
+ params.setHeadRows(1); //表头行数
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ imports = ExcelImportUtil.importExcel(inputStream,
+ AppUserImport.class, params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServiceException("小程序用户导入失败!");
+ } finally {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ if (CollectionUtils.isEmpty(imports)) {
+ throw new ServiceException("小程序用户导入数据为空!");
+ }
+ JSONObject result = new JSONObject();
+ int i = 1;
+ for (AppUserImport appUserImport : imports) {
+ if (!StringUtils.hasLength(appUserImport.getUsername())){
+ result.append("第"+i+"行：[", "用户名"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(appUserImport.getPhone())){
+ result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(appUserImport.getSex())){
+ result.append("第"+i+"行：[", "性别"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(appUserImport.getBirth())){
+ result.append("第"+i+"行：[", "出生日期"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(appUserImport.getRole())){
+ result.append("第"+i+"行：[", "角色"+"]不能为空");
+ continue;
+ }
+ 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+"行：[", "联系电话已存在"+"]");
+ 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+"行：[", "推广号已存在"+"]");
+ continue;
+ }
+
+ String sex = appUserImport.getSex();
+ Integer gender = "男".equals(sex) ? 1 : "女".equals(sex) ? 2 : null;
+ if(gender==null){
+ result.append("第"+i+"行：[", "性别"+"]格式错误");
+ continue;
+ }
+
+ String birth = appUserImport.getBirth();
+ LocalDate birthday = null;
+ try {
+ birthday = LocalDate.parse(birth);
+ } catch (Exception e) {
+ 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+"行：[", "角色"+"]格式错误");
+ continue;
+ }
+
+ TAppUser tAppUser = new TAppUser();
+ tAppUser.setName(appUserImport.getUsername());
+ tAppUser.setCode(appUserImport.getCode());
+ tAppUser.setPhone(appUserImport.getPhone());
+ tAppUser.setGender(gender);
+ tAppUser.setBirthday(birthday);
+ tAppUser.setUserType(userType);
+
+ 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){
+ tAppUser.setReferrerUserId(referrerUser.getId());
+ tAppUser.setReferrerStatus(1);
+ tAppUser.setReferrerTime(LocalDateTime.now());
+ }
+ }
+ 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){
+ tAppUser.setCompanyId(one.getId());
+ }
+ appUserService.save( user);
+ i++;
+ }
+ if(!result.isEmpty()){
+ return R.fail(result.toString());
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1