Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-08-17 cf7f9a5533ab0cb981049f5d54885694eebdcc48

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

@@ -3,6 +3,7 @@
import cc.mrbird.febs.mall.entity.MallOrderItem;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.MallOrderItemMapper;
import cc.mrbird.febs.mall.quartz.OrderSettlementJob;
import cc.mrbird.febs.mall.service.IAgentService;
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
@@ -39,14 +40,14 @@
    }
    @Test
    public void agentProfit() {
        memberProfitService.agentProfit(new Date());
        memberProfitService.agentProfit(null);
    }


    @Test
    public void staticProfit() {
        memberProfitService.staticProfit(new Date());
    }
//    @Test
//    public void staticProfit() {
//        memberProfitService.staticProfit(new Date());
//    }

    @Test
    public void thankfulProfit() {
@@ -92,4 +93,24 @@
    public void changeAmount(Map<String, Integer> amount) {
        amount.put("amount", 2);
    }

    @Test
    public void scorePool(){
        memberProfitService.scorePool();
    }

    @Test
    public void staticProfit(){
        memberProfitService.staticProfit(null);
    }

    @Autowired
    private OrderSettlementJob orderSettlementJob;

    @Test
    public void orderSettlementJobTest() {
//        orderSettlementJob.normalGoodsSettlementJob();

        mallAchieveService.add(83L);
    }
}