Commit e18a985e authored by licc's avatar licc

优化收益明细接口

parent ca4e1bdf
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
user_id=#{userId} user_id=#{userId}
and trade_type=#{tradeType} and trade_type=#{tradeType}
AND( AND(
YEAR(t.create_time) = YEAR(#{yearMonth}) YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(t.create_time) = MONTH(#{yearMonth}) AND MONTH(create_time) = MONTH(#{yearMonth}))
</where> </where>
order by create_time desc order by create_time desc
limit 1 limit 1
...@@ -257,12 +257,12 @@ ...@@ -257,12 +257,12 @@
from from
<include refid="table"/> <include refid="table"/>
<where> <where>
status=0 status=1
and user_id=#{userId} and user_id=#{userId}
and trade_type=1 and trade_type=2
AND( AND(
YEAR(t.create_time) = YEAR(#{yearMonth}) YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(t.create_time) = MONTH(#{yearMonth}) AND MONTH(create_time) = MONTH(#{yearMonth}))
</where> </where>
</select> </select>
......
...@@ -89,6 +89,7 @@ public class AccountManager { ...@@ -89,6 +89,7 @@ public class AccountManager {
tradeRecord.setTradeType(TradeRecordEnum.ORDER_REBATE.getCode()); tradeRecord.setTradeType(TradeRecordEnum.ORDER_REBATE.getCode());
tradeRecord.setTradeNo(orderInfo.getTid()); tradeRecord.setTradeNo(orderInfo.getTid());
tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode()); tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode());
tradeRecord.setMoney(bigDecimal);
recordMapper.add(tradeRecord); recordMapper.add(tradeRecord);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment