钱包接口优化

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

@@ -113,7 +113,7 @@
         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=0)
         and user_id=#{userId}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/MoneyPackageDetailVo.java

@@ -29,9 +29,9 @@ public class MoneyPackageDetailVo {
     List<IncomeDetailVo> list;
 
     /**
-     * 累计收益
+     * 本月累计收益
      */
-    @ApiModelProperty(value = "累计收益", name = "totalIncome")
+    @ApiModelProperty(value = "本月累计收益", name = "totalIncome")
     private BigDecimal totalIncome;
 
 

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

@@ -132,7 +132,7 @@ public class WalletServiceImpl implements WalletService {
 
         MoneyPackageDetailVo detailVo = new MoneyPackageDetailVo();
         detailVo.setUserId(userId);
-        detailVo.setTotalIncome(accountInfo.getEarningsTotal());
+        detailVo.setTotalIncome(accountInfo.getEarningsMonth());
 
         //获取本月交易记录
         List<TradeRecord> list = getTradeRecordList(userId);