积分问题

gongzuming

2024-09-09 1b4dc09ca65d7109a7686d4cb0486b74eb9f0114

积分问题

 src/main/java/com/mzl/flower/entity/point/CustomerPoint.java

@@ -26,4 +26,7 @@

    @ApiModelProperty("过期积分")
    private Integer expiredPoint;

    @ApiModelProperty("系统扣减积分")
    private Integer deductionPoint;
}

 src/main/java/com/mzl/flower/service/point/CustomerPointService.java

@@ -79,21 +79,24 @@
            point.setTotalPoint(0);
            point.setUsedPoint(0);
            point.setExpiredPoint(0);
            point.setDeductionPoint(0);
            point.create(SecurityUtils.getUserId());
        }

        if(POINT_CHANGE_TYPE.add.name().equals(detail.getChangeType())){
            point.setTotalPoint(point.getTotalPoint() + detail.getPoint());
        }else if(POINT_CHANGE_TYPE.reduce.name().equals(detail.getChangeType())){
            Integer balancePoint = point.getTotalPoint() - point.getUsedPoint()-point.getExpiredPoint();//可用积分
            balancePoint = balancePoint.intValue()>0?balancePoint.intValue():0;
            if(balancePoint.intValue() >= detail.getPoint().intValue()){
                point.setUsedPoint(point.getUsedPoint() + detail.getPoint());
            }else{
                //积分不足，直接清0
                point.setUsedPoint(point.getUsedPoint() + balancePoint);
                detail.setPoint(balancePoint);
                detail.setRemarks(detail.getRemarks()+",积分不足，扣除积分"+balancePoint);
            if(POINT_TYPE.deduction.name().equals(detail.getType())){ //积分扣减
                Integer balancePoint = point.getTotalPoint() - point.getUsedPoint()-point.getExpiredPoint()-point.getDeductionPoint();//可用积分
                balancePoint = balancePoint.intValue()>0?balancePoint.intValue():0;
                if(balancePoint.intValue() >= detail.getPoint().intValue()){
                    point.setDeductionPoint(point.getDeductionPoint() + detail.getPoint());
                }else{
                    //积分不足，直接清0
                    point.setDeductionPoint(point.getUsedPoint() + balancePoint);
                    detail.setPoint(balancePoint);
                    detail.setRemarks(detail.getRemarks()+",积分不足，扣除积分"+balancePoint);
                }
            }
        }
        if(isAdd){