优化收益明细接口

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

@@ -244,8 +244,8 @@
             user_id=#{userId}
             and trade_type=#{tradeType}
             AND(
-            YEAR(t.create_time) = YEAR(#{yearMonth})
-            AND MONTH(t.create_time) = MONTH(#{yearMonth})
+            YEAR(create_time) = YEAR(#{yearMonth})
+            AND MONTH(create_time) = MONTH(#{yearMonth}))
         </where>
         order by create_time desc
         limit 1
@@ -257,12 +257,12 @@
         from
         <include refid="table"/>
         <where>
-            status=0
+            status=1
             and user_id=#{userId}
-            and trade_type=1
+            and trade_type=2
             AND(
-            YEAR(t.create_time) = YEAR(#{yearMonth})
-            AND MONTH(t.create_time) = MONTH(#{yearMonth})
+            YEAR(create_time) = YEAR(#{yearMonth})
+            AND MONTH(create_time) = MONTH(#{yearMonth}))
         </where>
     </select>
 

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

@@ -89,6 +89,7 @@ public class AccountManager {
         tradeRecord.setTradeType(TradeRecordEnum.ORDER_REBATE.getCode());
         tradeRecord.setTradeNo(orderInfo.getTid());
         tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode());
+        tradeRecord.setMoney(bigDecimal);
         recordMapper.add(tradeRecord);
     }