fix sql

wisenergy-mapper/src/main/resources/mapper/OrderMapper.xml

@@ -124,6 +124,7 @@
         <include refid="table"/>
         <where>
             user_id=#{userid}
+            and pay_type <![CDATA[ <> ]]> 0
         </where>
     </select>
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DayTaskServiceImpl.java

@@ -523,58 +523,60 @@ public class DayTaskServiceImpl implements DayTaskService {
 
         List<ProgressPrize> addList = new ArrayList<>();
         List<ProgressPrize> updateList = new ArrayList<>();
-        for (TeamPerformanceSortVo teamVo : listVo) {
-            String userId = teamVo.getTeamPerformance().getUserId();
-            Integer userLevel = teamVo.getTeamPerformance().getUserLevel();
-            //获取最大进步奖 百分比
-            MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(userLevel, 3);
-
-            //计算收益
-            double userTeamPerformance = teamVo.getTeamPerformance().getMonthTeamPerformance().doubleValue();
-            double percent = memberPercent.getPercent().doubleValue();
-            double income = number * 3980 * percent * userTeamPerformance / total;
-
-            //获取账户信息
-            AccountInfo accountInfo = accountMapper.getByUserId(userId);
-            //用户月收益  =其他收益+最大进步奖收益
-            BigDecimal earningsMonth = accountInfo.getEarningsMonth().add(BigDecimal.valueOf(income));
-            accountInfo.setEarningsMonth(earningsMonth);
-
-            //用户总收益 =其他总收益 + 最大进步奖收益
-            BigDecimal earningsTotal = accountInfo.getEarningsTotal().add(BigDecimal.valueOf(income));
-            accountInfo.setEarningsTotal(earningsTotal);
-            updateAccountList.add(accountInfo);
-
-            //最大进步奖信息
-            ProgressPrize progressPrize = progressPrizeMapper.getByUserIdYearMonth(userId, yearMonth);
-            if (null == progressPrize) {
-                //新增
-                ProgressPrize addPrize = new ProgressPrize();
-                addPrize.setAwardMoney(income);
-                addPrize.setYearMonth(yearMonth);
-                addPrize.setGrowthRate(0.0);
-                addPrize.setUserId(userId);
-                addList.add(addPrize);
-            } else {
-                progressPrize.setGrowthRate(teamVo.getGrowthRate());
-                progressPrize.setAwardMoney(income);
-                if (income > 0) {
-                    progressPrize.setGrowthRate(teamVo.getGrowthRate());
+        if (number > 0) {
+            for (TeamPerformanceSortVo teamVo : listVo) {
+                String userId = teamVo.getTeamPerformance().getUserId();
+                Integer userLevel = teamVo.getTeamPerformance().getUserLevel();
+                //获取最大进步奖 百分比
+                MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(userLevel, 3);
+
+                //计算收益
+                double userTeamPerformance = teamVo.getTeamPerformance().getMonthTeamPerformance().doubleValue();
+                double percent = memberPercent.getPercent().doubleValue();
+                double income = number * 3980 * percent * userTeamPerformance / total;
+
+                //获取账户信息
+                AccountInfo accountInfo = accountMapper.getByUserId(userId);
+                //用户月收益  =其他收益+最大进步奖收益
+                BigDecimal earningsMonth = accountInfo.getEarningsMonth().add(BigDecimal.valueOf(income));
+                accountInfo.setEarningsMonth(earningsMonth);
+
+                //用户总收益 =其他总收益 + 最大进步奖收益
+                BigDecimal earningsTotal = accountInfo.getEarningsTotal().add(BigDecimal.valueOf(income));
+                accountInfo.setEarningsTotal(earningsTotal);
+                updateAccountList.add(accountInfo);
+
+                //最大进步奖信息
+                ProgressPrize progressPrize = progressPrizeMapper.getByUserIdYearMonth(userId, yearMonth);
+                if (null == progressPrize) {
+                    //新增
+                    ProgressPrize addPrize = new ProgressPrize();
+                    addPrize.setAwardMoney(income);
+                    addPrize.setYearMonth(yearMonth);
+                    addPrize.setGrowthRate(0.0);
+                    addPrize.setUserId(userId);
+                    addList.add(addPrize);
                 } else {
-                    progressPrize.setGrowthRate(0.0);
+                    progressPrize.setGrowthRate(teamVo.getGrowthRate());
+                    progressPrize.setAwardMoney(income);
+                    if (income > 0) {
+                        progressPrize.setGrowthRate(teamVo.getGrowthRate());
+                    } else {
+                        progressPrize.setGrowthRate(0.0);
+                    }
+                    updateList.add(progressPrize);
                 }
-                updateList.add(progressPrize);
             }
-        }
 
-        //获取本月已经存在的最大进步奖列表
-        List<ProgressPrize> prizes = progressPrizeMapper.getByYearMonth(yearMonth);
-
-        //修改或保存最大进步奖信息
-        //  flag  1： 日定时任务  2：月定时任务
-        int flag = 1;
-        return accountManager.updateOrSavePrize(updateAccountList, prizes, addList, updateList, flag);
+            //获取本月已经存在的最大进步奖列表
+            List<ProgressPrize> prizes = progressPrizeMapper.getByYearMonth(yearMonth);
 
+            //修改或保存最大进步奖信息
+            //  flag  1： 日定时任务  2：月定时任务
+            int flag = 1;
+            return accountManager.updateOrSavePrize(updateAccountList, prizes, addList, updateList, flag);
+        }
+        return true;
     }
 
     private void addTeamPerformance(List<User> userList) {