diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java index 39c0a8c..cf31e21 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java @@ -1,13 +1,9 @@ package com.bnyer.common.core.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.bnyer.common.core.annotation.Desensitized; import com.bnyer.common.core.enums.SensitiveTypeEnum; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -38,12 +34,19 @@ public class WithdrawLog extends BaseDomain { private Long creatorId; /** - * 提现金额 + * 可提现金额 */ @TableField(value = "amt") - @ApiModelProperty(value="提现金额") + @ApiModelProperty(value="可提现金额") private BigDecimal amt; + /** + * 手续费 + */ + @TableField(value = "fee") + @ApiModelProperty(value="手续费") + private BigDecimal fee; + /** * 支付宝手机号(加密) */ diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java index 37ceb51..c91dae3 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java @@ -43,7 +43,7 @@ public class TextToImgDto implements Serializable { @ApiModelProperty(value="批量数量") private Integer batchSize; - @ApiModelProperty(value="eta值") + @ApiModelProperty(value="差异强度值") private Double eta; @ApiModelProperty(value="采样器") diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java index 2338a46..3f985fb 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java @@ -40,7 +40,10 @@ public class WithdrawDto implements Serializable { public WithdrawLog extractParam(){ WithdrawLog withdrawLog = new WithdrawLog(); - BeanUtils.copyProperties(this,withdrawLog); + withdrawLog.setCreatorId(this.getCreatorId()); + withdrawLog.setAccountNo(this.getAccountNo()); + withdrawLog.setChannel(this.getChannel()); + withdrawLog.setAmt(this.getAmt()); return withdrawLog; } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 66c03d5..d111d17 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -435,8 +435,8 @@ public class TiktokMiniController extends BaseController { } @ApiOperation(value="获取绘画者ai绘画详情") - @GetMapping(value = "/getAiPaintDetials/{id}") - public AjaxResult getAiPaintDetials(@PathVariable @ApiParam("ai绘画对象id") Long id){ + @GetMapping(value = "/getAiPaintDetails/{id}") + public AjaxResult getAiPaintDetails(@PathVariable @ApiParam("ai绘画对象id") Long id){ return AjaxResult.success(aiPaintService.queryDetails(id)); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java index 284eaf1..d3190b8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java @@ -47,14 +47,22 @@ public class WithdrawLogServiceImpl implements WithdrawLogService { if(creator.getAmt().compareTo(withdrawLog.getAmt()) == -1){ throw new ServiceException("该艺术家当前可提现余额不足,提现失败!", TiktokConstant.CREATOR_AMT_NOT_ENOUGH); } + //原提现金额 + BigDecimal amt = withdrawLog.getAmt(); + //设置手续费 + BigDecimal fee = amt.multiply(new BigDecimal("0.06")); + withdrawLog.setFee(fee); + //设置最终可提现金额 + BigDecimal amtResult = amt.subtract(fee); + withdrawLog.setAmt(amtResult); withdrawLog.setCreateTime(new Date()); withdrawLog.setUpdateTime(new Date()); withdrawLog.setStatus("0"); //生成订单id withdrawLog.setOrderId(IdUtil.getSnowflakeNextIdStr()); //扣除账户余额 - BigDecimal amt = creator.getAmt().subtract(withdrawLog.getAmt()); - creator.setAmt(amt); + BigDecimal creatorAmt = creator.getAmt().subtract(amt); + creator.setAmt(creatorAmt); creatorMapper.updateById(creator); return withdrawLogMapper.insert(withdrawLog); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java index 0a02f95..d80bbdf 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java @@ -28,9 +28,12 @@ public class WithdrawLogVo implements Serializable { @ApiModelProperty(value="艺术家id") private Long creatorId; - @ApiModelProperty(value="提现金额") + @ApiModelProperty(value="可提现金额") private BigDecimal amt; + @ApiModelProperty(value="手续费") + private BigDecimal fee; + @ApiModelProperty(value="收款账号(加密)") @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) private String accountNo; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml index 28b87af..ccec567 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml @@ -8,6 +8,7 @@ + @@ -19,12 +20,12 @@ - id, creator_id, amt, account_no, `status`, create_time, update_time, sort,is_show,order_id,channel,reason + id, creator_id, amt,fee, account_no, `status`, create_time, update_time, sort,is_show,order_id,channel,reason select - id, creator_id, amt, account_no,status,create_time,update_time,order_id,channel,reason + id, creator_id, amt,fee,account_no,status,create_time,update_time,order_id,channel,reason from img_withdraw_log where is_show = '1' and order_id = #{orderId} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java index 7b20c6a..6e5a9b1 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java @@ -211,7 +211,7 @@ public class WithdrawLogServiceImpl implements IWithdrawLogService { throw new ServiceException("该艺术家未绑定支付宝账户!请手动设置!"); } }else if(withdrawLog.getChannel().equals(WithdrawConstant.WECHAT)){ - //TODO 转账到微信待开发 + //TODO 转账到微信待开发，现有为扫码付款，后续要手动给他改这个状态 } log.info("艺术家【{}】订单【{}】提现【{}】元成功!",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),withdrawLog.getAmt()); //TODO 微信推送/企业微信推送提现成功通知