修改月度收益明细返回奖项名称

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

@@ -113,9 +113,9 @@
         date_format(create_time,'%Y-%m') as yearMonth
         FROM
         <include refid="table"/>
-        WHERE date_format(create_time,'%Y-%m') &lt; date_format(now(),'%Y-%m')
+        WHERE date_format(create_time,'%Y-%m') &lt;= date_format(now(),'%Y-%m')
         and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
-        and (status=1 or status=3)
+        and (status=1 or status=0)
         and user_id=#{userId}
         group by user_id ,create_time;
     </select>

wisenergy-model/src/main/java/cn/wisenergy/model/enums/TradeRecordEnum.java

@@ -12,17 +12,17 @@ public enum TradeRecordEnum {
      */
     WITHDRAW_DEPOSIT(1, "提现"),
 
-    ORDER_REBATE(2, "订单返佣"),
+    ORDER_REBATE(2, "返佣奖"),
 
     PLACE_ORDER(3, "订单下单"),
 
-    MONTHLY_FERTILIZER(4, "月度肥料"),
+    MONTHLY_FERTILIZER(4, "月度肥料奖"),
 
     CULTIVATING_PRIZE(5, "培育奖"),
 
     SALARY_REWARD(6, "工资奖励"),
 
-    PROGRESS_PRIZE(7, "最大进步奖"),
+    PROGRESS_PRIZE(7, "进步奖"),
 
     RUN_CENTER_SUBSIDY(8, "运营中心补贴");
     private Integer code;