评论筛选，订单商家拒单

src/main/java/com/izouma/dingdong/service/AppraisalService.java

@@ -127,9 +127,6 @@ public class AppraisalService {
         //默认时间排序
         appraisals.sort((a, b) -> b.getAppraiseTime().compareTo(a.getAppraiseTime()));
 
-        List<Appraisal> good = appraisals.stream().filter(Appraisal::getGoodsLike).collect(Collectors.toList());
-        List<Appraisal> bad = appraisals.stream().filter(a -> !a.getGoodsLike()).collect(Collectors.toList());
-
         List<Appraisal> appraisals1 = new ArrayList<>();
         switch (appraisalSort) {
             //最新
@@ -140,22 +137,16 @@ public class AppraisalService {
                 break;
             //好评
             case PRAISE:
-                appraisals1.addAll(good);
-                appraisals1.addAll(bad);
+                appraisals1.addAll(appraisals.stream().filter(Appraisal::getGoodsLike).collect(Collectors.toList()));
                 break;
             //差评
             case BAD_REVIEW:
-                appraisals1.addAll(bad);
-                appraisals1.addAll(good);
+                appraisals1.addAll(appraisals.stream().filter(a -> !a.getGoodsLike()).collect(Collectors.toList()));
                 break;
             //有图
             case HAVE_PIC:
-                List<Appraisal> pic = appraisals.stream().filter(a -> StrUtil.isNotBlank(a.getImg()))
-                        .collect(Collectors.toList());
-                List<Appraisal> noPic = appraisals.stream().filter(a -> StrUtil.isBlank(a.getImg()))
-                        .collect(Collectors.toList());
-                appraisals1.addAll(pic);
-                appraisals1.addAll(noPic);
+                appraisals1.addAll(appraisals.stream().filter(a -> StrUtil.isNotBlank(a.getImg()))
+                        .collect(Collectors.toList()));
                 break;
             default:
                 appraisals1.addAll(appraisals);

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -257,13 +257,14 @@ public class OrderInfoService {
             orderInfo.setRiderStatus(RiderStatus.NOT_RECEIVED);
 
         } else {
+            //退款流程
+            OrderRefundApply apply = orderRefundApplyService.apply(orderId, RefundReason.MERCHANT_REJECTION, "商家拒单退款", null);
+            orderRefundApplyService.audit(apply.getId(), true, false);
+
             orderInfo.setMerchantStatus(MerchantStatus.REJECTED);
             orderInfo.setCancel(true);
             orderInfo.setStatus(OrderStatus.CANCELLED);
             orderInfo.setReason(RefundReason.MERCHANT_REJECTION);
-            //退款流程
-            OrderRefundApply apply = orderRefundApplyService.apply(orderId, RefundReason.MERCHANT_REJECTION, "商家拒单退款", null);
-            orderRefundApplyService.audit(apply.getId(), true, false);
         }
         return orderInfoRepo.save(orderInfo);
     }

src/test/java/com/izouma/dingdong/service/AppraisalServiceTest.java

@@ -55,7 +55,7 @@ public class AppraisalServiceTest {
 
     @Test
     public void testShow(){
-        System.out.println(appraisalService.appraisalsSort(1252L, AppraisalSort.HAVE_PIC));
+        System.out.println(appraisalService.appraisalsSort(189L, AppraisalSort.HAVE_PIC));
     }
 
     @Test