...
|
...
|
@@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl; |
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
import com.yohoufo.common.utils.DateUtil;
|
|
|
import com.yohoufo.dal.order.BuyerOrderGoodsMapper;
|
|
|
import com.yohoufo.dal.order.SellerOrderGoodsMapper;
|
|
|
import com.yohoufo.dal.order.TradeBillsMapper;
|
...
|
...
|
@@ -15,6 +16,7 @@ import com.yohoufo.order.model.bo.TradeBillsSummaryBo; |
|
|
import com.yohoufo.order.model.response.AssetsDetailsResponse;
|
|
|
import com.yohoufo.order.service.cache.AssetsDetailsViewCache;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
...
|
...
|
@@ -108,7 +110,11 @@ public class AssetsService { |
|
|
|
|
|
BillTradeStatus billTradeStatus = BillTradeStatus.getTradeTypeByCode(bills.getTradeStatus());
|
|
|
bo.setTradeStatus(billTradeStatus.getCode());
|
|
|
bo.setTradeStatusDesc(billTradeStatus.getDesc());
|
|
|
Optional.of(bills.getCreateTime())
|
|
|
// 2020-01-01 以后账单
|
|
|
.filter(createTime -> createTime >= 1577808000)
|
|
|
.map(createTime -> billTradeStatus.getDesc())
|
|
|
.ifPresent(bo::setTradeStatusDesc);
|
|
|
if (billTradeStatus == BillTradeStatus.WAIT_APPLY_CASH) {
|
|
|
bo.getLinks().add("applyCash");
|
|
|
}
|
...
|
...
|
|