fix

Helius

2022-06-17 e313eb29a51511abdf346e86183b328dcaf4a862

fix

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

@@ -157,6 +157,9 @@

        List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId);
        for (MallOrderItem item : items) {
            item.setHasSettle(1);
            mallOrderItemMapper.updateById(item);

            // 减去成本后算收益
            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
            if (amount.compareTo(BigDecimal.ZERO) < 1) {
@@ -237,9 +240,6 @@
                moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
            }
            // =======隔代奖== end =====

            item.setHasSettle(1);
            mallOrderItemMapper.updateById(item);
        }
    }


 src/test/java/cc/mrbird/febs/ProfitTest.java

@@ -57,7 +57,7 @@

    @Test
    public void directorProfitTest() {
        memberProfitService.storeAndDirectorProfit(new Date());
        memberProfitService.storeAndDirectorProfit(null);
    }

    @Autowired