陶杰
2024-09-02 1c8b2509fe7d990fd0b9f9ed6b338c6203d54758
src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -85,13 +85,15 @@
        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())){
            if(point.getTotalPoint()!= null && point.getTotalPoint()!=0 && point.getTotalPoint()>= detail.getPoint()){
                point.setTotalPoint(point.getTotalPoint() - detail.getPoint());
            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.setTotalPoint(0);
                detail.setPoint(point.getTotalPoint());
                detail.setRemarks(detail.getRemarks()+",积分不足,扣除剩余积分"+point.getTotalPoint());
                point.setUsedPoint(point.getUsedPoint() + balancePoint);
                detail.setPoint(balancePoint);
                detail.setRemarks(detail.getRemarks()+",积分不足,扣除积分"+balancePoint);
            }
        }
        if(isAdd){