Merge remote-tracking branch 'origin/master'

“mitao”

2025-12-20 4cd8f0c449c71191458d16b2155b4062ef063f3e

Merge remote-tracking branch 'origin/master'

 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();
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java

@@ -284,7 +284,7 @@
            // base64
            String img = Base64.getEncoder().encodeToString(result);
            // 后台用户的小程序码
            redisTemplate.opsForValue().set("ADMIN_WX_IMG" + user.getCode(), img);
            redisTemplate.opsForValue().set("ADMIN_WX_IMG" + user.getUserId(), img);
        }
        return R.ok();
    }
@@ -305,11 +305,12 @@
        {
            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }

        user.setUpdateBy(getUsername());
        if(StringUtils.isNotEmpty(user.getPassword())){
            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        }
        // 移除之前的二维码
        redisTemplate.delete("ADMIN_WX_IMG" + user.getUserId());
        return R.ok(userService.updateUser(user));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java

@@ -72,7 +72,7 @@
    /**
     * 查看系统配置-协议管理详情
     */
    @ApiOperation(value = "查看系统配置-协议管理详情",notes = "配置类型 类型 1=用户注册隐私协议，2=大礼包购买协议，3=实物商品购买协议，4=关于我们  5=积分规则，6=金币兑换图文说明，7=普通商品模块展示配置  8实物商品展示")
    @ApiOperation(value = "查看系统配置-协议管理详情",notes = "配置类型 类型 1=用户注册隐私协议，2=大礼包购买协议，3=实物商品购买协议，4=关于我们  5=积分规则，6=金币兑换图文说明，7=普通商品模块展示配置  8实物商品展示   9启动页")
    @GetMapping(value = "/getDetailById")
    public R<THtmlConfig> getDetailById(@RequestParam Integer configType) {
        THtmlConfig sysConfig = htmlConfigService.getOne(Wrappers.<THtmlConfig>lambdaQuery().eq(THtmlConfig::getConfigType, configType)

 ruoyi-admin/src/main/resources/application-test.yml

@@ -194,8 +194,8 @@
wx:
  url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
  conf:
    appId: 11
    secretId: 22
    appId: wx87744e4e4094a829
    secretId: c322159083d844e63dff458b5e54c4c9
payment:
  wx:
    # 微信appid

 ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateAppUserDto.java

New file
@@ -0,0 +1,30 @@
package com.ruoyi.system.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("修改用户信息Dto")
public class UpdateAppUserDto {
    @ApiModelProperty(value = "用户id")
    private Integer id;


    @ApiModelProperty(value = "推广状态（0=关闭，1=打开）")
    private Integer promotionStatus;


    @ApiModelProperty(value = "角色（1=游客，2=营销员，3=合伙人）")
    private Integer userType;

    @ApiModelProperty(value = "推荐人id")
    private Integer referrerUserId;

    @ApiModelProperty(value = "推广号")
    private String code;

    @ApiModelProperty(value = "经销商id")
    private Integer companyId;
}

 ruoyi-system/src/main/java/com/ruoyi/system/export/AppUserGoldImport.java

New file
@@ -0,0 +1,14 @@
package com.ruoyi.system.export;

import cn.afterturn.easypoi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "用户金币导入")
public class AppUserGoldImport {
    @Excel(name = "用户手机号", width = 20)
    private String userPhone;
    @Excel(name = "金币", width = 20)
    private String gold;
}

 ruoyi-system/src/main/java/com/ruoyi/system/export/AppUserImport.java

New file
@@ -0,0 +1,34 @@
package com.ruoyi.system.export;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "用户导入")
public class AppUserImport {

    @ApiModelProperty(value = "用户名")
    private String username;

    @ApiModelProperty(value = "联系电话")
    private String phone;

    @ApiModelProperty(value = "性别")
    private String sex;

    @ApiModelProperty(value = "出生日期")
    private String birth;

    @ApiModelProperty(value = "角色")
    private String role;

    @ApiModelProperty(value = "推广号")
    private String code;

    @ApiModelProperty(value = "推荐人推广号")
    private String referrerCode;

    @ApiModelProperty(value = "经销商推广号")
    private String dealerCode;
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserVisitMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TAppUserVisit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 用户访问记录 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-12-08
 */
public interface TAppUserVisitMapper extends BaseMapper<TAppUserVisit> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -64,6 +65,7 @@

    @ApiModelProperty(value = "生日")
    @TableField("birthday")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate birthday;

    @ApiModelProperty(value = "微信openid")
@@ -76,6 +78,7 @@

    @ApiModelProperty(value = "注册时间")
    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "累计积分")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUserVisit.java

New file
@@ -0,0 +1,43 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 用户访问记录
 * </p>
 *
 * @author xiaochen
 * @since 2025-12-08
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_visit")
@ApiModel(value="TAppUserVisit对象", description="用户访问记录")
public class TAppUserVisit implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Integer appUserId;

    @ApiModelProperty(value = "访问日期")
    @TableField("visit_date")
    private LocalDate visitDate;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TGoldChangeRecord.java

@@ -54,7 +54,7 @@

    @ApiModelProperty(value = "操作人id")
    @TableField("create_user_id")
    private Integer createUserId;
    private Long createUserId;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java

@@ -30,7 +30,7 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "类型 1=用户注册隐私协议，2=大礼包购买协议，3=实物商品购买协议，4=关于我们  5=积分规则，6=金币兑换图文说明，7=普通商品模块展示配置  8实物商品展示")
    @ApiModelProperty(value = "类型 1=用户注册隐私协议，2=大礼包购买协议，3=实物商品购买协议，4=关于我们  5=积分规则，6=金币兑换图文说明，7=普通商品模块展示配置  8实物商品展示  9启动页")
    @TableField("config_type")
    private Integer configType;


 ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserVisitService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TAppUserVisit;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 用户访问记录 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-12-08
 */
public interface TAppUserVisitService extends IService<TAppUserVisit> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserVisitServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TAppUserVisit;
import com.ruoyi.system.mapper.TAppUserVisitMapper;
import com.ruoyi.system.service.TAppUserVisitService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 用户访问记录 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-12-08
 */
@Service
public class TAppUserVisitServiceImpl extends ServiceImpl<TAppUserVisitMapper, TAppUserVisit> implements TAppUserVisitService {

}

 ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml

@@ -25,7 +25,7 @@
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TAppUser">
        select t1.* from t_app_user t1
        where  1=1
        where    t1.status != 3
        <if test="query.nickName != null and query.nickName != ''">
            and t1.nick_name like concat('%',#{query.nickName},'%')
        </if>
@@ -36,7 +36,6 @@
        <if test="query.status != null">
            and t1.status = #{query.status}
        </if>
          AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}

        order by t1.create_time desc
    </select>

 ruoyi-system/src/main/resources/mapper/system/TAppUserVisitMapper.xml

New file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TAppUserVisitMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TAppUserVisit">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="visit_date" property="visitDate" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, visit_date
    </sql>

</mapper>