充值赠送

src/main/java/com/edgec/browserbackend/account/service/impl/PayBackServiceImpl.java

@@ -3,11 +3,13 @@ package com.edgec.browserbackend.account.service.impl;
 import com.edgec.browserbackend.account.service.PayBackService;
 import com.edgec.browserbackend.browser.domain.PayBack;
 import com.edgec.browserbackend.browser.repository.PayBackRepository;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author xuxin
@@ -27,26 +29,36 @@ public class PayBackServiceImpl implements PayBackService {
 
     @Override
     public List<PayBack> updatePayBack(PayBack payBack) {
-        //List<PayBack> list = payBackRepository.findByPay(payBack.getPay());
-        /*if(list.size() > 0 && payBack.getPay() > 0){
+        List<PayBack> list = filterPay(payBack.getPay());
+        if(list.size() > 0 && payBack.getPay() > 0) {
             list.forEach(payBackRepository::delete);
             payBackRepository.insert(payBack);
-        }*/
-        return findAll();
+        }
+        return sortPay();
+    }
+
+    @NotNull
+    private List<PayBack> filterPay(int pay) {
+        return payBackRepository.findAll().stream().filter(x -> x.getPay() == pay).collect(Collectors.toList());
     }
 
     @Override
     public List<PayBack> createPayBack(PayBack payBack) {
-        //List<PayBack> list = payBackRepository.findByPay(payBack.getPay());
-        /*if(list.size() == 0 && payBack.getPay() > 0){
+        List<PayBack> list = filterPay(payBack.getPay());
+        if(list.size() == 0 && payBack.getPay() > 0){
             payBackRepository.insert(payBack);
-        }*/
-        return findAll();
+        }
+        return sortPay();
     }
 
     @Override
     public List<PayBack> deletePayBack(Integer pay) {
-        //payBackRepository.findByPay(pay).forEach(payBackRepository::delete);
-        return findAll();
+        filterPay(pay).forEach(payBackRepository::delete);
+        return sortPay();
+    }
+
+    @NotNull
+    private List<PayBack> sortPay() {
+        return findAll().stream().sorted(Comparator.comparing(PayBack::getPay)).collect(Collectors.toList());
     }
 }