licailing 5 년 전
부모
커밋
bf56dc3aeb

+ 1 - 1
src/main/java/com/izouma/dingdong/service/AppraisalService.java

@@ -135,7 +135,7 @@ public class AppraisalService {
                         a -> !a.getAppraiseTime().isBefore(LocalDateTime.now().plusMonths(1)))
                         a -> !a.getAppraiseTime().isBefore(LocalDateTime.now().plusMonths(1)))
                         .collect(Collectors.toList()));
                         .collect(Collectors.toList()));
                 break;
                 break;
-                //好评
+            //好评
             case PRAISE:
             case PRAISE:
                 appraisals1.addAll(good);
                 appraisals1.addAll(good);
                 appraisals1.addAll(bad);
                 appraisals1.addAll(bad);

+ 1 - 1
src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -174,7 +174,7 @@ public class OrderInfoService {
         //购物车删除
         //购物车删除
         shoppingCartRepo.deleteById(cart.getId());
         shoppingCartRepo.deleteById(cart.getId());
 
 
-        return orderInfo;
+        return save;
 
 
     }
     }
 
 

+ 0 - 1
src/main/java/com/izouma/dingdong/web/backstage/DeliveryFeeController.java

@@ -11,7 +11,6 @@ import com.izouma.dingdong.utils.excel.ExcelUtils;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;