This commit is contained in:
dute7liang
2024-01-05 23:22:42 +08:00
parent ab1e56f773
commit 6a4f9315f5
11 changed files with 60 additions and 188 deletions

View File

@@ -1,95 +0,0 @@
package com.ruoyi.cai.controller.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.AccountBusiness;
import com.ruoyi.cai.service.AccountBusinessService;
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.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
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 2023-12-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/cai/accountBusiness")
public class AccountBusinessController extends BaseController {
private final AccountBusinessService accountBusinessService;
/**
* 查询账户业务列表
*/
@SaCheckPermission("cai:accountBusiness:list")
@GetMapping("/list")
public TableDataInfo<AccountBusiness> list(AccountBusiness bo, PageQuery pageQuery) {
Page<AccountBusiness> page = accountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
return TableDataInfo.build(page);
}
/**
* 获取账户业务详细信息
*
* @param id 主键
*/
@SaCheckPermission("cai:accountBusiness:query")
@GetMapping("/{id}")
public R<AccountBusiness> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(accountBusinessService.getById(id));
}
/**
* 新增账户业务
*/
@SaCheckPermission("cai:accountBusiness:add")
@Log(title = "账户业务", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountBusiness bo) {
return toAjax(accountBusinessService.save(bo));
}
/**
* 修改账户业务
*/
@SaCheckPermission("cai:accountBusiness:edit")
@Log(title = "账户业务", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountBusiness bo) {
return toAjax(accountBusinessService.updateById(bo));
}
/**
* 删除账户业务
*
* @param ids 主键串
*/
@SaCheckPermission("cai:accountBusiness:remove")
@Log(title = "账户业务", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(accountBusinessService.removeBatchByIds(Arrays.asList(ids)));
}
}

View File

@@ -4,12 +4,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.AccountChangeLog;
import com.ruoyi.cai.dto.admin.CaiDictVo;
import com.ruoyi.cai.enums.AccountChangeEnum;
import com.ruoyi.cai.service.AccountChangeLogService;
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.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
@@ -21,6 +24,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* 账户明细
@@ -36,6 +41,17 @@ public class AccountChangeLogController extends BaseController {
private final AccountChangeLogService accountChangeLogService;
@GetMapping("/listChangeType")
public R<List<CaiDictVo>> listChangeType(){
List<CaiDictVo> res = Arrays.stream(AccountChangeEnum.values()).map(i -> {
CaiDictVo vo = new CaiDictVo();
vo.setValue(i.getCode() + "");
vo.setLabel(i.getAdminName());
return vo;
}).collect(Collectors.toList());
return R.ok(res);
}
/**
* 查询账户明细列表
*/

View File

@@ -45,8 +45,10 @@ public class AccountChangeLog implements Serializable {
/**
* 名称
*/
private String cateName;
private String cateAdminName;
private String cateAppName;
private Long traceId;
private String traceLinkType;
/**
* 变化值,为正 或者为负
*/

View File

@@ -0,0 +1,9 @@
package com.ruoyi.cai.dto.admin;
import lombok.Data;
@Data
public class CaiDictVo {
private String value;
private String label;
}

View File

@@ -8,7 +8,7 @@ import lombok.Data;
@Schema(description = "用户银行卡修改入参")
public class AccountAliBankCardRes {
@Schema(description = "ID")
private Integer id;
private Long id;
/**
* 持卡人姓名
*/

View File

@@ -6,45 +6,50 @@ import lombok.Getter;
public enum AccountChangeEnum {
// 用户端
USER_RECHARGE(101,"充值",""),
USER_RECHARGE(101,"充值","购买紫贝","RECHARGE",""),
// A2(102,"注册奖励","增加充值的紫贝"),
// A3(103,"首充奖励","增加充值的紫贝"),
USER_GIFT(104,"送出礼物",""),
USER_GUARD(105,"送出守护",""),
USER_VIDEO(106,"视频支出",""),
A7(107,"聊天支出",""),
WITHDRAW(108,"提现",""),
USER_GIFT(104,"送出礼物","送出礼物","GIFT",""),
USER_GUARD(105,"送出守护","送出守护","GUARD",""),
USER_VIDEO(106,"视频支出","视频支出","VIDEO",""),
A7(107,"聊天支出","聊天支出","",""),
WITHDRAW(108,"提现","提现","","WITHDRAW"),
// 主播端
ANCHOR_GIFT(201,"收到礼物",""),
ANCHOR_GUARD(202,"收到守护",""),
ANCHOR_VIDEO(203,"视频收入",""),
ANCHOR_GIFT(201,"收到礼物","收到礼物","GIFT",""),
ANCHOR_GUARD(202,"收到守护","收到守护","GUARD",""),
ANCHOR_VIDEO(203,"视频收入","视频收入","VIDEO",""),
// 分销
ONE_RECHARGE(301,"充值分成",""),
ONE_GIFT(302,"礼物分成",""),
ONE_GUARD(303,"守护分成",""),
ONE_VIDEO(304,"视频分成",""),
ONE_RECHARGE(301,"充值分成","邀请奖励","RECHARGE",""),
ONE_GIFT(302,"礼物分成","邀请奖励","GIFT",""),
ONE_GUARD(303,"守护分成","邀请奖励","GUARD",""),
ONE_VIDEO(304,"视频分成","邀请奖励","VIDEO",""),
// 工会
UNION_GIFT(401,"礼物工会分成",""),
UNION_GUARD(402,"守护工会分成",""),
UNION_VIDEO(403,"视频工会分成",""),
UNION_GIFT(401,"礼物工会分成","工会提成","GIFT",""),
UNION_GUARD(402,"守护工会分成","工会提成","GUARD",""),
UNION_VIDEO(403,"视频工会分成","工会提成","VIDEO",""),
// 系统
SYSTEM_COIN_INCS(1001,"系统调账","后台人工调增余额"),
SYSTEM_COIN_DECR(1002,"系统调账","后台人工调减余额"),
SYSTEM_INCOME_COIN_INCS(1003,"系统调账","后台人工调增收益"),
SYSTEM_INCOME_COIN_DECR(1004,"系统调账","后台人工调减收益"),
SYSTEM_COIN_INCS(1001,"后台新增余额","系统调账","RECHARGE","后台人工调增余额"),
SYSTEM_COIN_DECR(1002,"后台减少余额","系统调账","RECHARGE","后台人工调减余额"),
SYSTEM_INCOME_COIN_INCS(1003,"后台新增收益","系统调账","RECHARGE","后台人工调增收益"),
SYSTEM_INCOME_COIN_DECR(1004,"后台减小收益","系统调账","RECHARGE","后台人工调减收益"),
;
private final Integer code;
private final String name;
private final String adminName;
private final String appName;
private final String traceIdLink;
private final String desc;
AccountChangeEnum(Integer code, String name, String desc) {
AccountChangeEnum(Integer code, String adminName, String appName, String traceIdLink, String desc) {
this.code = code;
this.name = name;
this.adminName = adminName;
this.appName = appName;
this.traceIdLink = traceIdLink;
this.desc = desc;
}
}

View File

@@ -1,14 +0,0 @@
package com.ruoyi.cai.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.cai.domain.AccountBusiness;
/**
* 账户业务Mapper接口
*
* @author 77
* @date 2023-12-22
*/
public interface AccountBusinessMapper extends BaseMapper<AccountBusiness> {
}

View File

@@ -1,14 +0,0 @@
package com.ruoyi.cai.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.AccountBusiness;
/**
* 账户业务Service接口
*
* @author 77
* @date 2023-12-22
*/
public interface AccountBusinessService extends IService<AccountBusiness> {
}

View File

@@ -1,17 +0,0 @@
package com.ruoyi.cai.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.AccountBusiness;
import com.ruoyi.cai.mapper.AccountBusinessMapper;
import com.ruoyi.cai.service.AccountBusinessService;
import org.springframework.stereotype.Service;
/**
* 账户业务Service业务层处理
*
* @author 77
* @date 2023-12-22
*/
@Service
public class AccountBusinessServiceImpl extends ServiceImpl<AccountBusinessMapper, AccountBusiness> implements AccountBusinessService {
}

View File

@@ -32,10 +32,11 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
log.setTraceId(traceId);
log.setAccountType(rechargeTypeEnum.getCode());
log.setCateId(accountChangeEnum.getCode());
log.setCateName(accountChangeEnum.getName());
log.setCateAppName(accountChangeEnum.getAppName());
log.setCateAdminName(accountChangeEnum.getAdminName());
log.setTraceLinkType(accountChangeEnum.getTraceIdLink());
log.setRemark(accountChangeEnum.getDesc());
log.setChangeValue(price);
// log.setRemark();
log.setIsAdmin(admin);
this.save(log);
return log;

View File

@@ -1,21 +0,0 @@
<?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.cai.mapper.AccountBusinessMapper">
<resultMap type="com.ruoyi.cai.domain.AccountBusiness" id="CaiAccountBusinessResult">
<result property="id" column="id"/>
<result property="cateId" column="cate_id"/>
<result property="businessName" column="business_name"/>
<result property="businessCode" column="business_code"/>
<result property="businessDesc" column="business_desc"/>
<result property="accountType" column="account_type"/>
<result property="accountTypeCode" column="account_type_code"/>
<result property="remark" column="remark"/>
<result property="status" column="status"/>
<result property="createTime" column="create_time"/>
</resultMap>
</mapper>