fix 若赠送积分不足，则减去所有赠送积分

Helius

2022-06-17 f61c65658100a64f64cb14c64f27934702d1812e

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java

@@ -19,6 +19,7 @@

import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.Map;

/**
 * @author wzy
@@ -177,7 +178,7 @@
    }

    @Override
    public int reduce(BigDecimal amount, Long memberId, String field) {
    public int reduce(BigDecimal amount, Long memberId, String field, Map<String, BigDecimal> map) {
        int i = 0;
        boolean flag = true;

@@ -195,7 +196,17 @@
                BigDecimal balance = (BigDecimal) declaredField.get(wallet);

                if (amount.compareTo(balance) > 0) {
                    return 2;
                    // 判断 赠送积分，如果剩下赠送积分不等于0且小于amount, 则扣除所有赠送积分
                    if ("score".equals(field)) {
                        if (balance.compareTo(BigDecimal.ZERO) == 0) {
                            return 2;
                        }

                        amount = balance;
                        map.put("amount", amount);
                    } else {
                        return 2;
                    }
                }
                declaredField.set(update, balance.subtract(amount));

@@ -216,6 +227,11 @@
    }

    @Override
    public int reduce(BigDecimal amount, Long memberId, String field) {
        return reduce(amount, memberId, field);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void commissionChange(CommissionChangeDto commissionChange) {
        MallMember member = LoginUserUtil.getLoginUser();