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

xiaoyong931011

2022-06-27 f03a1d7b68997648b15cc6122ce68da9a2e4f672

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

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

@@ -40,7 +40,7 @@
    /**
     * 代理分红
     */
    @Scheduled(cron = "0 0 1 * * ?")
    @Scheduled(cron = "0 30 0 * * ?")
    public void profitJob() {
        memberProfitService.agentProfit(null);
    }
@@ -53,7 +53,7 @@
    /**
     * 感恩奖
     */
    @Scheduled(cron = "0 30 3 * * ?")
    @Scheduled(cron = "0 0 1 * * ?")
    public void thankfulJob() {
        memberProfitService.thankfulProfit(null);
    }
@@ -62,7 +62,7 @@
    /**
     * 静态分红
     */
    @Scheduled(cron = "0 30 2 * * ?")
    @Scheduled(cron = "0 0 0 * * ?")
    public void staticProfitJob() {
        memberProfitService.staticProfit(null);
    }
@@ -70,7 +70,7 @@
    /**
     * 排名奖 每月1号
     */
    @Scheduled(cron = "0 0 3 1 * ?")
    @Scheduled(cron = "0 30 0 1 * ?")
    public void rankJob() {
        memberProfitService.rankProfit();
    }

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

@@ -281,7 +281,7 @@
            }

            BigDecimal income = profit.multiply(profitProp).divide(BigDecimal.valueOf(agentMemberList.size()), 2, RoundingMode.HALF_UP);
            if (income.compareTo(BigDecimal.ZERO) > 0) {
            if (income.compareTo(BigDecimal.ZERO) < 1) {
                continue;
            }


 src/main/resources/application-dev.yml

@@ -19,6 +19,10 @@
          password: 123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://120.27.238.55:3306/db_amz?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
#          username: db_mall
#          password: mall!@#123
#          driver-class-name: com.mysql.cj.jdbc.Driver
#          url: jdbc:mysql://47.111.90.145:3306/db_mall?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）

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

@@ -39,7 +39,7 @@
    }
    @Test
    public void agentProfit() {
        memberProfitService.agentProfit(new Date());
        memberProfitService.agentProfit(null);
    }