caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

一个分销时间展示以及一个字段没有正确的存储值问题处理

Browse Source
This commit is contained in:
Chopper 2022-07-11 18:52:31 +08:00
parent d14b87729a
commit 2c02b816b5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
View File

@ -50,6 +50,9 @@ public class DistributionOrder extends BaseIdEntity {
private String distributionId; private String distributionId;
@ApiModelProperty(value = "分销员名称") @ApiModelProperty(value = "分销员名称")
private String distributionName; private String distributionName;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "解冻日期") @ApiModelProperty(value = "解冻日期")
private Date settleCycle; private Date settleCycle;
@ApiModelProperty(value = "提成金额") @ApiModelProperty(value = "提成金额")

1
framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
View File

@ -73,6 +73,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
} }
//将提现金额存入冻结金额,扣减可提现金额 //将提现金额存入冻结金额,扣减可提现金额
distribution.setCanRebate(CurrencyUtil.sub(distribution.getCanRebate(), applyMoney)); distribution.setCanRebate(CurrencyUtil.sub(distribution.getCanRebate(), applyMoney));
distribution.setCommissionFrozen(CurrencyUtil.add(distribution.getCommissionFrozen(), applyMoney));
distributionService.updateById(distribution); distributionService.updateById(distribution);
//提现申请记录 //提现申请记录
DistributionCash distributionCash = new DistributionCash("D" + SnowFlake.getId(), distribution.getId(), applyMoney, distribution.getMemberName()); DistributionCash distributionCash = new DistributionCash("D" + SnowFlake.getId(), distribution.getId(), applyMoney, distribution.getMemberName());