fix

Helius

2022-06-15 684d6e674f231444cbc678b01a9734d804c07a79

fix

 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java

@@ -12,6 +12,7 @@
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.MallOrderItemMapper;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
import cn.hutool.core.collection.CollUtil;
@@ -52,6 +53,9 @@
    @Autowired
    private IMemberProfitService memberProfitService;

    @Autowired
    private IMallAchieveService mallAchieveService;

    /**
     * 普通商品结算
     */
@@ -75,6 +79,8 @@

                memberWalletService.add(score, member.getId(), "score");
                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());

                mallAchieveService.add(item.getId());
            }

            // 普通商品动态分红结算

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

@@ -59,6 +59,7 @@

    private final AgentProducer agentProducer;
    private final IPayService payService;
    private final IMallAchieveService mallAchieveService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -253,6 +254,9 @@
                        if (score.compareTo(BigDecimal.ZERO) > 0) {
                            memberWalletService.add(score, member.getId(), "score");
                            mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());

                            // 添加业绩
                            mallAchieveService.add(orderItem.getId());
                        }
                    }
                }

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

@@ -216,9 +216,6 @@

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

            // 添加业绩
            mallAchieveService.add(item.getId());
        }
    }


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

@@ -33,7 +33,7 @@

    @Test
    public void dynamicProfit() {
        memberProfitService.dynamicProfit(45L);
        memberProfitService.dynamicProfit(59L);
    }

    @Test