소스 검색

bug#1120修改

qrs 3 주 전
부모
커밋
74ff7a2ded
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

+ 2 - 1
alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -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);