src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
文件名从 src/main/java/com/mzl/flower/entity/wallet/WalletBillRecord.java 修改 @@ -1,22 +1,23 @@ package com.mzl.flower.entity.wallet; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; import com.mzl.flower.base.BaseAutoEntity; import com.mzl.flower.base.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.math.BigDecimal; /** * @author @TaoJie * @since 2024-10-22 */ @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @TableName("t_wallet_bill_record") public class WalletBillRecord extends BaseAutoEntity { /** * packageName com.mzl.flower.entity.wallet * * @className WithdrawRecord * @date 2024/10/21 * @description 供应商提现记录申请表 */ public class WalletBillRecordDO extends BaseEntity { @ApiModelProperty(value = "供应商Id") private Long supplierId; @@ -31,7 +32,7 @@ private Integer typeDetail; @ApiModelProperty(value = "转账Id") private String transfer_id; private String transferId; @ApiModelProperty(value = "变动方式(增加、减少") private Integer method; src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
文件名从 src/main/java/com/mzl/flower/entity/wallet/Wallet.java 修改 @@ -1,46 +1,77 @@ package com.mzl.flower.entity.wallet; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; import com.mzl.flower.base.BaseAutoEntity; import com.mzl.flower.base.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.math.BigDecimal; /** * @author @TaoJie * @since 2024-10-22 */ @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @TableName("t_wallet") public class Wallet extends BaseAutoEntity { public class WalletDO extends BaseEntity { /** * packageName com.mzl.flower.entity.wallet * @className Wallet * @date 2024/10/21 * @description 钱包表 * 用户ID */ @ApiModelProperty("用户id") private String userId; /** * 供应商ID */ @ApiModelProperty(value = "供应商Id") private Long supplierId; /** * 总金额 */ @ApiModelProperty(value = "总金额") private BigDecimal totalAmount; /** * 可提现金额 */ @ApiModelProperty(value = "可提现金额") private BigDecimal withdrawableAmount; /** * 提现中金额 */ @ApiModelProperty(value = "提现中金额") private BigDecimal withdrawingAmount; /** * 已提现金额 */ @ApiModelProperty(value = "已提现金额") private BigDecimal withdrawnAmount; /** * 结算中金额 */ @ApiModelProperty(value = "结算中金额") private BigDecimal settlingAmount; /** * 总扣款金额 */ @ApiModelProperty(value = "总扣款金额") private BigDecimal totalDeduction; /** * 总交易金额 */ @ApiModelProperty(value = "总交易金额") private BigDecimal totalTransactionAmount; private String totalTransactionAmount; } src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java
文件名从 src/main/java/com/mzl/flower/entity/wallet/WithdrawRecord.java 修改 @@ -1,52 +1,78 @@ package com.mzl.flower.entity.wallet; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; import com.mzl.flower.base.BaseAutoEntity; import java.time.LocalDateTime; import com.mzl.flower.base.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.math.BigDecimal; import java.time.LocalDateTime; /** * @author @TaoJie * @since 2024-10-22 */ @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @TableName("t_withdraw_record") public class WithdrawRecord extends BaseAutoEntity { /** * packageName com.mzl.flower.entity.wallet * * @className WithdrawRecord * @date 2024/10/21 * @description 供应商提现记录申请表 */ public class WithdrawRecordDO extends BaseEntity { /** * 供应商ID */ @ApiModelProperty(value = "供应商Id") private Long supplierId; /** * 提现金额 */ @ApiModelProperty(value = "钱包Id") private Long walletId; @ApiModelProperty(value = "提现金额") private BigDecimal amount; @ApiModelProperty(value = "单次可提现金额") /** * 单次可提现金额 */ @ApiModelProperty(value = "提现金额") private BigDecimal onceWithdrawAmount; /** * 提现状态 */ @ApiModelProperty(value = "提现状态(提现中、提现成功、提现失败)") private Integer withdrawState; /** * 提现方式 */ @ApiModelProperty(value = "提现方式(微信)") private String method; /** * 审核人 */ @ApiModelProperty(value = "审核人") private String approveBy; /** * 审核时间 */ @ApiModelProperty(value = "审核时间") private LocalDateTime approveTime; /** * 审核状态 */ @ApiModelProperty(value = "审核状态(待审核、审核通过、审核不通过)") private Integer approveState; private Integer approverState; /** * 不通过原因 */ @ApiModelProperty(value = "不通过原因") private String rejectReason; } src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
对比新文件 @@ -0,0 +1,16 @@ package com.mzl.flower.mapper.wallet; import com.mzl.flower.entity.wallet.WalletBillRecordDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper 接口 * </p> * * @author @TaoJie * @since 2024-10-22 */ public interface WalletBillRecordMapper extends BaseMapper<WalletBillRecordDO> { } src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
对比新文件 @@ -0,0 +1,16 @@ package com.mzl.flower.mapper.wallet; import com.mzl.flower.entity.wallet.WalletDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper 接口 * </p> * * @author @TaoJie * @since 2024-10-22 */ public interface WalletMapper extends BaseMapper<WalletDO> { } src/main/java/com/mzl/flower/mapper/wallet/WithdrawRecordMapper.java
对比新文件 @@ -0,0 +1,16 @@ package com.mzl.flower.mapper.wallet; import com.mzl.flower.entity.wallet.WithdrawRecordDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper 接口 * </p> * * @author @TaoJie * @since 2024-10-22 */ public interface WithdrawRecordMapper extends BaseMapper<WithdrawRecordDO> { } src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
对比新文件 @@ -0,0 +1,20 @@ package com.mzl.flower.service.impl.wallet; import com.mzl.flower.entity.wallet.WalletBillRecordDO; import com.mzl.flower.mapper.wallet.WalletBillRecordMapper; import com.mzl.flower.service.wallet.WalletBillRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author @TaoJie * @since 2024-10-22 */ @Service public class WalletBillRecordServiceImpl extends ServiceImpl<WalletBillRecordMapper, WalletBillRecordDO> implements WalletBillRecordService { } src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java
对比新文件 @@ -0,0 +1,20 @@ package com.mzl.flower.service.impl.wallet; import com.mzl.flower.entity.wallet.WalletDO; import com.mzl.flower.mapper.wallet.WalletMapper; import com.mzl.flower.service.wallet.WalletService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author @TaoJie * @since 2024-10-22 */ @Service public class WalletServiceImpl extends ServiceImpl<WalletMapper, WalletDO> implements WalletService { } src/main/java/com/mzl/flower/service/impl/wallet/WithdrawRecordServiceImpl.java
对比新文件 @@ -0,0 +1,20 @@ package com.mzl.flower.service.impl.wallet; import com.mzl.flower.entity.wallet.WithdrawRecordDO; import com.mzl.flower.mapper.wallet.WithdrawRecordMapper; import com.mzl.flower.service.wallet.WithdrawRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author @TaoJie * @since 2024-10-22 */ @Service public class WithdrawRecordServiceImpl extends ServiceImpl<WithdrawRecordMapper, WithdrawRecordDO> implements WithdrawRecordService { } src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java
对比新文件 @@ -0,0 +1,16 @@ package com.mzl.flower.service.wallet; import com.mzl.flower.entity.wallet.WalletBillRecordDO; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * 服务类 * </p> * * @author @TaoJie * @since 2024-10-22 */ public interface WalletBillRecordService extends IService<WalletBillRecordDO> { } src/main/java/com/mzl/flower/service/wallet/WalletService.java
对比新文件 @@ -0,0 +1,16 @@ package com.mzl.flower.service.wallet; import com.mzl.flower.entity.wallet.WalletDO; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * 服务类 * </p> * * @author @TaoJie * @since 2024-10-22 */ public interface WalletService extends IService<WalletDO> { } src/main/java/com/mzl/flower/service/wallet/WithdrawRecordService.java
对比新文件 @@ -0,0 +1,16 @@ package com.mzl.flower.service.wallet; import com.mzl.flower.entity.wallet.WithdrawRecordDO; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * 服务类 * </p> * * @author @TaoJie * @since 2024-10-22 */ public interface WithdrawRecordService extends IService<WithdrawRecordDO> { } src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java
对比新文件 @@ -0,0 +1,66 @@ package com.mzl.flower.web.v2.wallet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import com.mzl.flower.entity.wallet.WalletBillRecordDO; import javax.validation.constraints.Min; import javax.validation.constraints.Max; import javax.validation.constraints.Positive; import org.springframework.web.bind.annotation.RestController; /** * @author @TaoJie * @since 2024-10-22 */ @RestController @RequestMapping("/v2/wallet-bill-record") public class WalletBillRecordController extends BaseController { @PostMapping("") public ResponseEntity<ReturnDataDTO> create() { return returnData(R.SUCCESS.getCode(), null); } @PutMapping("/{id}") public ResponseEntity<ReturnDataDTO> update(@PathVariable @Positive(message = "{id.positive}") Integer id) { return returnData(R.SUCCESS.getCode(), null); } @DeleteMapping("/{id}") public ResponseEntity<ReturnDataDTO> delete(@PathVariable @Positive(message = "{id.positive}") Integer id) { return returnData(R.SUCCESS.getCode(), null); } @GetMapping("/{id}") public WalletBillRecordDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) { return null; } @GetMapping("/page") public ResponseEntity<ReturnDataDTO<Page<WalletBillRecordDO>>> page( @RequestParam(name = "page", required = false, defaultValue = "0") @Min(value = 0, message = "{page.number.min}") Integer page, @RequestParam(name = "count", required = false, defaultValue = "10") @Min(value = 1, message = "{page.count.min}") @Max(value = 30, message = "{page.count.max}") Integer count ) { return returnData(R.SUCCESS.getCode(), null); } } src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
对比新文件 @@ -0,0 +1,64 @@ package com.mzl.flower.web.v2.wallet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; import com.mzl.flower.entity.wallet.WalletBillRecordDO; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import com.mzl.flower.entity.wallet.WalletDO; import javax.validation.constraints.Min; import javax.validation.constraints.Max; import javax.validation.constraints.Positive; import org.springframework.web.bind.annotation.RestController; /** * @author @TaoJie * @since 2024-10-22 */ @RestController @RequestMapping("/v2/wallet") public class WalletController extends BaseController { @PostMapping("") public ResponseEntity<ReturnDataDTO> create() { return returnData(R.SUCCESS.getCode(), null); } @PutMapping("/{id}") public ResponseEntity<ReturnDataDTO> update(@PathVariable @Positive(message = "{id.positive}") Integer id) { return returnData(R.SUCCESS.getCode(), null); } @DeleteMapping("/{id}") public ResponseEntity<ReturnDataDTO> delete(@PathVariable @Positive(message = "{id.positive}") Integer id) { return returnData(R.SUCCESS.getCode(), null); } @GetMapping("/{id}") public WalletDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) { return null; } @GetMapping("/page") public ResponseEntity<ReturnDataDTO<Page<WalletDO>>> page( @RequestParam(name = "page", required = false, defaultValue = "0") @Min(value = 0, message = "{page.number.min}") Integer page, @RequestParam(name = "count", required = false, defaultValue = "10") @Min(value = 1, message = "{page.count.min}") @Max(value = 30, message = "{page.count.max}") Integer count ) { return null; } } src/main/java/com/mzl/flower/web/v2/wallet/WithdrawRecordController.java
对比新文件 @@ -0,0 +1,63 @@ package com.mzl.flower.web.v2.wallet; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; import com.mzl.flower.entity.wallet.WalletDO; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import com.mzl.flower.entity.wallet.WithdrawRecordDO; import javax.validation.constraints.Min; import javax.validation.constraints.Max; import javax.validation.constraints.Positive; import org.springframework.web.bind.annotation.RestController; /** * @author @TaoJie * @since 2024-10-22 */ @RestController @RequestMapping("/v2/withdraw-record") public class WithdrawRecordController extends BaseController { @PostMapping("") public ResponseEntity<ReturnDataDTO> create() { return returnData(R.SUCCESS.getCode(), null); } @PutMapping("/{id}") public ResponseEntity<ReturnDataDTO> update(@PathVariable @Positive(message = "{id.positive}") Integer id) { return returnData(R.SUCCESS.getCode(), null); } @DeleteMapping("/{id}") public ResponseEntity<ReturnDataDTO> delete(@PathVariable @Positive(message = "{id.positive}") Integer id) { return returnData(R.SUCCESS.getCode(), null); } @GetMapping("/{id}") public WithdrawRecordDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) { return null; } @GetMapping("/page") public ResponseEntity<ReturnDataDTO<Page<WithdrawRecordDO>>> page( @RequestParam(name = "page", required = false, defaultValue = "0") @Min(value = 0, message = "{page.number.min}") Integer page, @RequestParam(name = "count", required = false, defaultValue = "10") @Min(value = 1, message = "{page.count.min}") @Max(value = 30, message = "{page.count.max}") Integer count ) { return null; } } src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
对比新文件 @@ -0,0 +1,23 @@ <?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.mzl.flower.mapper.wallet.WalletBillRecordMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.mzl.flower.entity.wallet.WalletBillRecordDO"> <id column="id" property="id" /> <result column="create_by" property="createBy" /> <result column="create_time" property="createTime" /> <result column="update_by" property="updateBy" /> <result column="update_time" property="updateTime" /> <result column="deleted" property="deleted" /> <result column="supplier_id" property="supplierId" /> <result column="wallet_id" property="walletId" /> <result column="type" property="type" /> <result column="type_detail" property="typeDetail" /> <result column="transfer_id" property="transferId" /> <result column="original_amount" property="originalAmount" /> <result column="change_amount" property="changeAmount" /> <result column="balance" property="balance" /> </resultMap> </mapper> src/main/resources/mapper/wallet/WalletMapper.xml
对比新文件 @@ -0,0 +1,24 @@ <?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.mzl.flower.mapper.wallet.WalletMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.mzl.flower.entity.wallet.WalletDO"> <id column="id" property="id" /> <result column="deleted" property="deleted" /> <result column="create_by" property="createBy" /> <result column="create_time" property="createTime" /> <result column="update_by" property="updateBy" /> <result column="update_time" property="updateTime" /> <result column="user_id" property="userId" /> <result column="supplier_id" property="supplierId" /> <result column="total_amount" property="totalAmount" /> <result column="withdrawable_amount" property="withdrawableAmount" /> <result column="withdrawing_amount" property="withdrawingAmount" /> <result column="withdrawn_amount" property="withdrawnAmount" /> <result column="settling_amount" property="settlingAmount" /> <result column="total_deduction" property="totalDeduction" /> <result column="total_transaction_amount" property="totalTransactionAmount" /> </resultMap> </mapper> src/main/resources/mapper/wallet/WithdrawRecordMapper.xml
对比新文件 @@ -0,0 +1,24 @@ <?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.mzl.flower.mapper.wallet.WithdrawRecordMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.mzl.flower.entity.wallet.WithdrawRecordDO"> <id column="id" property="id" /> <result column="create_by" property="createBy" /> <result column="create_time" property="createTime" /> <result column="update_by" property="updateBy" /> <result column="update_time" property="updateTime" /> <result column="deleted" property="deleted" /> <result column="supplier_id" property="supplierId" /> <result column="amount" property="amount" /> <result column="once_withdraw_amount" property="onceWithdrawAmount" /> <result column="withdraw_state" property="withdrawState" /> <result column="method" property="method" /> <result column="approve_by" property="approveBy" /> <result column="approve_time" property="approveTime" /> <result column="approver_state" property="approverState" /> <result column="reject_reason" property="rejectReason" /> </resultMap> </mapper>