| ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-admin/src/main/resources/application-test.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateAppUserDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -1,15 +1,20 @@ package com.ruoyi.web.controller.api; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.dto.UpdateAppUserDto; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.query.AppUserListQuery; import com.ruoyi.system.service.TAppUserService; 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.web.bind.annotation.*; import javax.annotation.Resource; @@ -24,25 +29,69 @@ */ @RestController @RequestMapping("/t-app-user") @Api(tags = "用户管理") @Api(tags = "(嘉视达)用户管理") public class TAppUserController { @Resource private TAppUserService appUserService; @Autowired private RedisTemplate redisTemplate; @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) { 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/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/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/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>