优化月度奖励列表

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

@@ -135,7 +135,6 @@
         <where>
             rebate_status=0
             <if test="successTime != null ">
-                and success_time &lt; #{successTime}
                 AND(
                 YEAR(success_time) = YEAR(#{successTime})
                 AND MONTH(success_time) = MONTH(#{successTime}))

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

@@ -93,7 +93,7 @@
         where
         p.user_id=u.user_id
         and p.`year_month` = #{yearMonth}
-        order by p.`growth_rate` desc,u.create_time desc,p.award_money desc
+        order by p.`growth_rate` desc,p.award_money desc,u.create_time desc
     </select>
 
 </mapper>
\ No newline at end of file

wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java

@@ -70,7 +70,7 @@ public class AccountManager {
         BigDecimal performanceMonth = accountInfo.getEarningsMonth().add(bigDecimal);
         accountInfo.setEarningsMonth(performanceMonth.setScale(2, RoundingMode.HALF_UP));
 
-        BigDecimal performanceTotal = accountInfo.getEarningsMonth().add(bigDecimal);
+        BigDecimal performanceTotal = accountInfo.getEarningsTotal().add(bigDecimal);
         accountInfo.setEarningsTotal(performanceTotal.setScale(2, RoundingMode.HALF_UP));
 
         //2、修改订单返佣状态：已返佣 1

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

@@ -83,7 +83,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
             if (RebateStatusEnum.NO_REBATE.getCode().equals(orderInfo.getRebateStatus()) && successTime <= time) {
                 //获取用户信息
                 User user = usersMapper.getByUserId(orderInfo.getUserId());
-                if (null == user) {
+                if (null == user || user.getUserLevel() == 0) {
                     continue;
                 }
 
@@ -94,7 +94,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
                 }
 
                 //获取返佣比例
-                MemberPercent memberpercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(), MemberPercentEnum.REBATE.getCode());
+                MemberPercent memberpercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(),
+                        MemberPercentEnum.REBATE.getCode());
                 if (null == memberpercent) {
                     continue;
                 }