fix

Hentua

2023-04-25 7d90518f2a1300a98157c13dc80e17f0241140ca

fix

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

@@ -92,8 +92,8 @@
        DataDictionaryCustom indrectDicPropDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RECOMMEND_BONUS.getType(), DataDictionaryEnum.RECOMMEND_BONUS.getCode());

        for (MallOrderItem item : items) {
            // 减去成本后算收益
            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
            // 减去成本后算收益 减去积分付款
            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt())).subtract(orderInfo.getScoreAmount());
            if (amount.compareTo(BigDecimal.ZERO) < 1) {
                continue;
            }
@@ -483,7 +483,7 @@
        BigDecimal hundred = new BigDecimal(100);
        for (MallOrderItem item : items) {
            // 减去成本后算收益
            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt())).subtract(orderInfo.getScoreAmount());
            if (amount.compareTo(BigDecimal.ZERO) < 1) {
                continue;
            }

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

@@ -41,8 +41,13 @@
//    @Autowired
//    private IAgentService agentService;
//
//    @Autowired
//    private IMemberProfitService memberProfitService;
    @Autowired
    private IMemberProfitService memberProfitService;

    @Test
    public void profitTest() {
        memberProfitService.directProfit(10L);
    }
//
//    @Autowired
//    private IApiMallOrderInfoService iApiMallOrderInfoService;