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

分销佣金为空时计算错误

Browse Source
This commit is contained in:
17600048398 2023-03-15 16:22:03 +08:00
parent a81faf4ba4
commit 21d66f719d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
View File

@ -32,10 +32,11 @@ public class Distribution extends BaseEntity {
public Distribution(String memberId, String memberName, DistributionApplyDTO distributionApplyDTO) { public Distribution(String memberId, String memberName, DistributionApplyDTO distributionApplyDTO) {
this.memberId = memberId; this.memberId = memberId;
this.memberName = memberName; this.memberName = memberName;
distributionOrderCount=0; this.distributionOrderCount=0;
this.rebateTotal=0D;
this.canRebate=0D;
this.commissionFrozen=0D;
this.distributionStatus = DistributionStatusEnum.APPLY.name(); this.distributionStatus = DistributionStatusEnum.APPLY.name();
commissionFrozen=0D;
canRebate=0D;
BeanUtil.copyProperties(distributionApplyDTO, this); BeanUtil.copyProperties(distributionApplyDTO, this);
} }
@ -52,13 +53,13 @@ public class Distribution extends BaseEntity {
private String idNumber; private String idNumber;
@ApiModelProperty(value = "分销总额") @ApiModelProperty(value = "分销总额")
private Double rebateTotal = 0D; private Double rebateTotal ;
@ApiModelProperty(value = "可提现金额") @ApiModelProperty(value = "可提现金额")
private Double canRebate = 0D; private Double canRebate ;
@ApiModelProperty(value = "冻结金额") @ApiModelProperty(value = "冻结金额")
private Double commissionFrozen = 0D; private Double commissionFrozen ;
@ApiModelProperty(value = "分销订单数") @ApiModelProperty(value = "分销订单数")
private Integer distributionOrderCount; private Integer distributionOrderCount;

10
framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java
View File

@ -19,8 +19,8 @@ public interface DistributionMapper extends BaseMapper<Distribution> {
* @param commissionFrozen 分销金额 * @param commissionFrozen 分销金额
* @param distributionId 分销员ID * @param distributionId 分销员ID
*/ */
@Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + @Update("UPDATE li_distribution set commission_frozen = (IFNULL(commission_frozen,0)+#{commissionFrozen}) " +
", rebate_total=(rebate_total+#{commissionFrozen}) WHERE id = #{distributionId}") ", rebate_total=(IFNULL(rebate_total,0)+#{commissionFrozen}) WHERE id = #{distributionId}")
void subCanRebate(Double commissionFrozen, String distributionId); void subCanRebate(Double commissionFrozen, String distributionId);
/** /**
@ -29,9 +29,9 @@ public interface DistributionMapper extends BaseMapper<Distribution> {
* @param commissionFrozen 分销金额 * @param commissionFrozen 分销金额
* @param distributionId 分销员ID * @param distributionId 分销员ID
*/ */
@Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + @Update("UPDATE li_distribution set commission_frozen = (IFNULL(commission_frozen,0)+#{commissionFrozen}) " +
", rebate_total=(rebate_total+#{commissionFrozen}) " + ", rebate_total=(IFNULL(rebate_total,0)+#{commissionFrozen}) " +
", distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") ", distribution_order_count=(IFNULL(distribution_order_count,0)+1) WHERE id = #{distributionId}")
void addCanRebate(Double commissionFrozen, String distributionId); void addCanRebate(Double commissionFrozen, String distributionId);
} }