shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-21 01:03:14 +08:00
parent bd9eb02713
commit 96411407b8
12 changed files with 250 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserBankCardController.java Normal file
View File

@@ -0,0 +1,92 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserBankCard;
import com.ruoyi.xq.service.UserBankCardService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
/**
* 用户银行卡
*
* @author 77
* @date 2024-04-21
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/xq/userBankCard")
public class UserBankCardController extends BaseController {
private final UserBankCardService userBankCardService;
/**
* 查询用户银行卡列表
*/
@SaCheckPermission("xq:userBankCard:list")
@GetMapping("/list")
public TableDataInfo<UserBankCard> list(UserBankCard bo, PageQuery pageQuery) {
Page<UserBankCard> page = userBankCardService.page(pageQuery.build());
return TableDataInfo.build(page);
}
/**
* 获取用户银行卡详细信息
*
* @param id 主键
*/
@SaCheckPermission("xq:userBankCard:query")
@GetMapping("/{id}")
public R<UserBankCard> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(userBankCardService.getById(id));
}
/**
* 新增用户银行卡
*/
@SaCheckPermission("xq:userBankCard:add")
@Log(title = "用户银行卡", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@RequestBody UserBankCard bo) {
return toAjax(userBankCardService.save(bo));
}
/**
* 修改用户银行卡
*/
@SaCheckPermission("xq:userBankCard:edit")
@Log(title = "用户银行卡", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@RequestBody UserBankCard bo) {
return toAjax(userBankCardService.updateById(bo));
}
/**
* 删除用户银行卡
*
* @param ids 主键串
*/
@SaCheckPermission("xq:userBankCard:remove")
@Log(title = "用户银行卡", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(userBankCardService.removeBatchByIds(Arrays.asList(ids)));
}
}

10
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStatusAppController.java
View File

@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.dto.app.userstatus.UserStatusInfoAppVo;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateMasterAppReq;
import com.ruoyi.xq.service.UserStatusService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,6 +31,15 @@ public class UserStatusAppController {
return R.ok(vo);
}
@PostMapping("/updateMaster")
@Operation(summary = "修改当前用户主状态")
@Log(title = "修改当前用户主状态", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Void> updateMaster(@RequestBody UserStatusUpdateMasterAppReq req){
req.setUserId(LoginHelper.getUserId());
userStatusService.updateStatusMaster(req);
return R.ok();
}
@PostMapping("/update")
@Operation(summary = "修改当前用户状态")
@Log(title = "修改当前用户状态", businessType = BusinessType.OTHER, isSaveDb = false)

47
ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserBankCard.java Normal file
View File

@@ -0,0 +1,47 @@
package com.ruoyi.xq.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 用户银行卡对象 xq_user_bank_card
*
* @author 77
* @date 2024-04-21
*/
@Data
@TableName("xq_user_bank_card")
public class UserBankCard implements Serializable {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 用户ID
*/
private Long userId;
/**
* 用户号
*/
private String usercode;
/**
* 支付宝-姓名
*/
private String aliName;
/**
* 支付宝-账号
*/
private String aliCard;
private LocalDateTime createTime;
private LocalDateTime updateTime;
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/userstatus/UserStatusUpdateAppReq.java
View File

@@ -7,11 +7,6 @@ import lombok.Data;
public class UserStatusUpdateAppReq {
@Schema(description = "用户ID")
private Long userId;
/**
* 征婚状态 1-寻找中 2-已脱单 3-隐藏资料
*/
@Schema(description = "征婚状态 1-寻找中 2-已脱单 3-隐藏资料")
private Integer personalsStatus;
/**
* 谁可查看头像 1-所有用户 2-VIP用户 3-实名用户 4-实名认证且VIP用户 5-不公开
*/

15
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/userstatus/UserStatusUpdateMasterAppReq.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.xq.dto.app.userstatus;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class UserStatusUpdateMasterAppReq {
@Schema(description = "用户ID")
private Long userId;
/**
* 征婚状态 1-寻找中 2-已脱单 3-隐藏资料
*/
@Schema(description = "征婚状态 1-寻找中 2-已脱单 3-隐藏资料")
private Integer personalsStatus;
}

14
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserBankCardMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.ruoyi.xq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.xq.domain.UserBankCard;
/**
* 用户银行卡Mapper接口
*
* @author 77
* @date 2024-04-21
*/
public interface UserBankCardMapper extends BaseMapper<UserBankCard> {
}

14
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserBankCardService.java Normal file
View File

@@ -0,0 +1,14 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.UserBankCard;
/**
* 用户银行卡Service接口
*
* @author 77
* @date 2024-04-21
*/
public interface UserBankCardService extends IService<UserBankCard> {
}

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStatusService.java
View File

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateMasterAppReq;
/**
* 用户状态Service接口
@@ -20,4 +21,6 @@ public interface UserStatusService extends IService<UserStatus> {
void updateStatus(UserStatusUpdateAppReq req);
Page<UserStatusAdminVo> pageAdmin(PageQuery pageQuery, UserStatusAdminVo bo);
void updateStatusMaster(UserStatusUpdateMasterAppReq req);
}

20
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserBankCardServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.UserBankCard;
import com.ruoyi.xq.mapper.UserBankCardMapper;
import com.ruoyi.xq.service.UserBankCardService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 用户银行卡Service业务层处理
*
* @author 77
* @date 2024-04-21
*/
@RequiredArgsConstructor
@Service
public class UserBankCardServiceImpl extends ServiceImpl<UserBankCardMapper,UserBankCard> implements UserBankCardService {
}

1
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStarServiceImpl.java
View File

@@ -27,7 +27,6 @@ public class UserStarServiceImpl extends ServiceImpl<UserStarMapper,UserStar> im
@Autowired
private UserService userService;
/**
*
* @Schema(description = "1-关注 2-取消关注")
*/
@Override

25
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.domain.UserVip;
import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateMasterAppReq;
import com.ruoyi.xq.enums.ErrorEnum;
import com.ruoyi.xq.enums.userstatus.PersonalsStatusEnum;
import com.ruoyi.xq.enums.userstatus.ShowAvatarEnum;
@@ -47,16 +48,8 @@ public class UserStatusServiceImpl extends ServiceImpl<UserStatusMapper,UserStat
}
UserStatus update = new UserStatus();
update.setId(userStatus.getId());
update.setUpdateTime(LocalDateTime.now());
update.setPersonalsStatus(req.getPersonalsStatus());
update.setAllowTransMobile(req.getAllowTransMobile());
update.setAllowTransWx(req.getAllowTransWx());
if(req.getPersonalsStatus() != null && (PersonalsStatusEnum.CAO.getCode().equals(req.getPersonalsStatus())
|| PersonalsStatusEnum.HIDING.getCode().equals(req.getPersonalsStatus()))){
update.setShowAvatar(ShowAvatarEnum.NO.getCode());
}else{
update.setShowAvatar(req.getShowAvatar());
}
this.updateById(update);
}
@@ -64,4 +57,20 @@ public class UserStatusServiceImpl extends ServiceImpl<UserStatusMapper,UserStat
public Page<UserStatusAdminVo> pageAdmin(PageQuery pageQuery, UserStatusAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(),bo);
}
@Override
public void updateStatusMaster(UserStatusUpdateMasterAppReq req) {
UserStatus userStatus = this.getByUserId(req.getUserId());
Integer personalsStatus = req.getPersonalsStatus();
UserStatus update = new UserStatus();
update.setId(userStatus.getId());
update.setUpdateTime(LocalDateTime.now());
if(req.getPersonalsStatus() != null && (PersonalsStatusEnum.CAO.getCode().equals(personalsStatus)
|| PersonalsStatusEnum.HIDING.getCode().equals(personalsStatus))){
update.setShowAvatar(ShowAvatarEnum.NO.getCode()); // 已脱单和隐藏资料，则强制不允许看头像
}else{
update.setShowAvatar(ShowAvatarEnum.ALL.getCode());
}
this.updateById(update);
}
}

18
ruoyi-xq/src/main/resources/mapper/xq/UserBankCardMapper.xml Normal file
View File

@@ -0,0 +1,18 @@
<?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.xq.mapper.UserBankCardMapper">
<resultMap type="com.ruoyi.xq.domain.UserBankCard" id="UserBankCardResult">
<result property="id" column="id"/>
<result property="userId" column="user_id"/>
<result property="usercode" column="usercode"/>
<result property="aliName" column="ali_name"/>
<result property="aliCard" column="ali_card"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>