定时任务优化2

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

@@ -135,6 +135,7 @@
         <include refid="table"/>
         <where>
             rebate_status=0
+            and pay_type !=0
             <if test="successTime != null ">
                 AND(
                 YEAR(success_time) = YEAR(#{successTime})
@@ -150,7 +151,6 @@
         <include refid="table"/>
         <where>
             pay_type != 0
-            and user_id != null
             and user_id !=''
             <if test="created != null ">
                 and (YEAR(created) = YEAR(#{created})

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

@@ -439,6 +439,10 @@ public class DayTaskServiceImpl implements DayTaskService {
 
         //当月所有人订单成交总金额/3980/12  向下整
         double moneyMonth = Math.floor(total / 3980 / 12);
+        if (moneyMonth == 0) {
+            return true;
+        }
+
         List<AccountInfo> accountInfoList = new ArrayList<>();
         List<TradeRecord> tradeRecordList = new ArrayList<>();
 
@@ -453,9 +457,6 @@ public class DayTaskServiceImpl implements DayTaskService {
             lastMonthAward = monthManure.getManureAward();
         }
 
-        if (moneyMonth == 0) {
-            return true;
-        }
         for (User user : userList) {
             //获取等级优惠百分比
             MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(), 2);