无关风月
2025-04-17 b9b79364ff66e4af1ea82905f087376008d86b73
提现代码
2个文件已修改
3个文件已添加
182 ■■■■■ 已修改文件
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/WithdrawDTO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/resources/bootstrap.yaml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
New file
@@ -0,0 +1,83 @@
package com.ruoyi.admin.controller;
import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.FranchiseeWithdraw;
import com.ruoyi.admin.entity.TFranchiseeBalanceChange;
import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.TFranchiseeBalanceChangeService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.admin.request.WithdrawDTO;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
 * <p>
 * 师傅信息表 前端控制器
 * </p>
 *
 * @author hjl
 * @since 2024-06-03
 */
@RestController
@RequestMapping("/franchisee")
@Api(value = "加盟商迭代新增", tags = "加盟商迭代新增")
public class AppFranchiseeController {
    @Resource
    private TokenService tokenService;
    @Resource
    private FranchiseeService franchiseeService;
    @Resource
    private TFranchiseeBalanceChangeService franchiseeBalanceChangeService;
    @PostMapping("/applyWithdraw")
    @ApiOperation(value = "加盟商申请提现", tags = {"提现"})
    public R check(@RequestBody WithdrawDTO dto) {
        LoginUser loginUser = tokenService.getLoginUser();
        if (loginUser==null){
            return R.fail("登录失效");
        }
        Franchisee franchisee = franchiseeService.getById(loginUser.getUserid());
        if (franchisee.getBalance().subtract(dto.getMoney()).compareTo(BigDecimal.ZERO)>=0){
            BigDecimal subtract = franchisee.getBalance().subtract(dto.getMoney());
            franchisee.setBalance(subtract);
        }else{
            return R.fail("余额不足");
        }
        // 扣去余额 生成余额明细
        TFranchiseeBalanceChange balanceChange = new TFranchiseeBalanceChange();
        balanceChange.setAmount(dto.getMoney());
        balanceChange.setIs_pay(1);
        balanceChange.setFranchiseeName(franchisee.getName());
        balanceChange.setFranchiseeId(franchisee.getId()+"");
        balanceChange.setRemark("余额提现");
        balanceChange.setType(3);
        balanceChange.setIsDelete(0);
        franchiseeBalanceChangeService.save(balanceChange);
        // 生成提现记录
        FranchiseeWithdraw franchiseeWithdraw = new FranchiseeWithdraw();
        franchiseeWithdraw.setChangeId(balanceChange.getId());
        franchiseeWithdraw.setFranchiseeId(Integer.valueOf(balanceChange.getFranchiseeId()));
        franchiseeWithdraw.setStatus(1);
        franchiseeWithdraw.setContent(dto.getContent());
        franchiseeWithdraw.setMoney(dto.getMoney());
        franchiseeWithdraw.setCreateTime(LocalDateTime.now());
        franchiseeWithdraw.setUpdateTime(LocalDateTime.now());
        franchiseeWithdraw.setIsDelete(0);
        return R.ok();
    }
}
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
New file
@@ -0,0 +1,58 @@
package com.ruoyi.admin.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@Data
@ApiModel(description = "加盟商提现记录表")
public class FranchiseeWithdraw {
    @ApiModelProperty(value = "主键ID")
    private Long id;
    @ApiModelProperty(value = "加盟商余额明细记录id")
    private Integer changeId;
    @ApiModelProperty(value = "加盟商id")
    private Integer franchiseeId;
    @ApiModelProperty(value = "状态1待审核 2已通过 3已驳回")
    private Integer status;
    @ApiModelProperty(value = "申请原因")
    private String content;
    @ApiModelProperty(value = "金额")
    private BigDecimal money;
    @ApiModelProperty(value = "结果说明")
    private String result;
    @ApiModelProperty(value = "凭证")
    private String img;
    @ApiModelProperty(value = "创建人")
    private String createBy;
    @ApiModelProperty(value = "操作人")
    private String updateBy;
    @TableField("createTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private LocalDateTime createTime;
    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
    @ApiModelProperty(value = "是否删除 0未删除;1已删除")
    private Integer isDelete;
}
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java
@@ -77,7 +77,7 @@
    private LocalDateTime updateTime;
    @ApiModelProperty(value = "1扣款2充值")
    @ApiModelProperty(value = "1扣款2充值3余额提现4余额提现回退")
    @TableField("type")
    private Integer type;
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/WithdrawDTO.java
New file
@@ -0,0 +1,23 @@
package com.ruoyi.admin.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @author HJL
 * @version 1.0
 * @since 2024-07-09 18:10
 */
@Data
@ApiModel("加盟商提现DTO")
public class WithdrawDTO {
    @ApiModelProperty("申请原因")
    private String content;
    @ApiModelProperty("提现金额")
    private BigDecimal money;
}
ruoyi-service/ruoyi-admin/src/main/resources/bootstrap.yaml
@@ -21,22 +21,22 @@
        server-addr: 127.0.0.1:8848
        service: ${spring.application.name}
        group: DEFAULT_GROUP
        namespace: 5b0cc96f-d058-4986-a46f-64644ff8a467
        namespace: c203d220-3f0c-43f7-88e1-f298717e61e4
        # 线上nacos需要鉴权
#        username: nacos
#        password: nacos
        username: nacos
        password: jdhs_nacos!
        password: nacos
#        username: nacos
#        password: jdhs_nacos!
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
        group: DEFAULT_GROUP
        namespace: 5b0cc96f-d058-4986-a46f-64644ff8a467
        namespace: c203d220-3f0c-43f7-88e1-f298717e61e4
        # 线上nacos需要鉴权
#        username: nacos
#        password: nacos
        username: nacos
        password: jdhs_nacos!
        password: nacos
#        username: nacos
#        password: jdhs_nacos!
        name: ${spring.application.name}
        # 配置文件格式
        file-extension: yml