|
|
@@ -469,6 +469,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
|
|
|
recordVo.setUserEvaluate(tradeRecord.getSellerEvaluate());
|
|
|
recordVo.setUserRating(tradeRecord.getSellerRating());
|
|
|
}
|
|
|
+ recordVo.setSellerId(tradeRecord.getSellerId());
|
|
|
return recordVo;
|
|
|
} catch (Exception e) {
|
|
|
log.error("SecondTradeRecordServiceImpl.getUserTradeStatus(): Error Msg={}", e.getMessage());
|
|
|
@@ -591,7 +592,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
|
|
|
.orElse(null);
|
|
|
|
|
|
list = list.stream().filter(item -> item.getTransactionTime().equals(minDate)).collect(Collectors.toList());
|
|
|
- return list.isEmpty() ? null : list.get(0);
|
|
|
+ return list.isEmpty() ? null : (1 == list.get(0).getBuyerSignIn() && 1 == list.get(0).getSellerSignIn() ? null : list.get(0));
|
|
|
} catch (Exception e) {
|
|
|
log.error("SecondTradeRecordServiceImpl.hasInTradeRecord(): Error Msg={}", e.getMessage());
|
|
|
throw new Exception(e);
|