‘linchangsheng’ преди 5 месеца
родител
ревизия
8626991047
променени са 1 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 8 2
      mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

+ 8 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

@@ -262,8 +262,14 @@ public class WorkerWarrantyLogic {
 
         WorkerWarrantyDetail workerWarrantyDetail = BeanUtil.toBean(workerWarranty, WorkerWarrantyDetail.class);
 
-        List<WorkerWarrantyRefund> workerWarrantyRefunds = workerWarrantyRefundService.lambdaQuery().eq(WorkerWarrantyRefund::getWarrantyId, warrantyId).list();
-        List<WorkerWarrantyPay> workerWarrantyPays = workerWarrantyPayService.lambdaQuery().eq(WorkerWarrantyPay::getWarrantyId, warrantyId).list();
+        List<WorkerWarrantyRefund> workerWarrantyRefunds = workerWarrantyRefundService.lambdaQuery()
+                .eq(WorkerWarrantyRefund::getWarrantyId, warrantyId)
+                .orderByDesc(WorkerWarrantyRefund::getRefundTime)
+                .list();
+        List<WorkerWarrantyPay> workerWarrantyPays = workerWarrantyPayService.lambdaQuery()
+                .eq(WorkerWarrantyPay::getWarrantyId, warrantyId)
+                .orderByDesc(WorkerWarrantyPay::getPayTime)
+                .list();
 
         workerWarrantyDetail.setWorkerWarrantyPays(workerWarrantyPays);
         workerWarrantyDetail.setWorkerWarrantyRefunds(workerWarrantyRefunds);