DingXiaoYu 2 tahun lalu
induk
melakukan
6688e456a0

+ 0 - 54
src/main/java/com/seecoder/BlueWhale/controller/OrderController.java

@@ -1,54 +0,0 @@
-package com.seecoder.BlueWhale.controller;
-
-import com.seecoder.BlueWhale.service.OrderService;
-import com.seecoder.BlueWhale.vo.OrderVO;
-import com.seecoder.BlueWhale.vo.ResultVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-@RestController
-@RequestMapping("/api/orders")
-public class OrderController {
-
-    @Autowired
-    OrderService orderService;
-
-    @PostMapping
-    public ResultVO<OrderVO> create(@RequestBody OrderVO orderVO){
-        return ResultVO.buildSuccess(orderService.create(orderVO));
-    }
-
-    @GetMapping
-    public ResultVO<List<OrderVO>> getAllOrders(){
-        return ResultVO.buildSuccess(orderService.getAllOrders());
-    }
-
-    @GetMapping("/{id}")
-    public ResultVO<OrderVO> getOrder(@PathVariable(value = "id")Integer id){
-        return ResultVO.buildSuccess(orderService.getOrder(id));
-    }
-
-    @PostMapping("/pay")
-    public ResultVO<Boolean> pay(@RequestParam("orderId") Integer orderId){
-        return ResultVO.buildSuccess(orderService.pay(orderId));
-    }
-
-    @PostMapping("/deliver")
-    public ResultVO<Boolean> deliver(@RequestParam("orderId") Integer orderId){
-        return ResultVO.buildSuccess(orderService.deliver(orderId));
-    }
-
-    @PostMapping("/get")
-    public ResultVO<Boolean> get(@RequestParam("orderId") Integer orderId){
-        return ResultVO.buildSuccess(orderService.get(orderId));
-    }
-    
-    @PostMapping("/comment")
-    public ResultVO<Boolean> comment(@RequestParam("orderId") Integer orderId, @RequestParam("comment") String comment, @RequestParam("rating") Integer rating){
-        return ResultVO.buildSuccess(orderService.comment(orderId, comment, rating));
-    }
-
-}

+ 0 - 5
src/main/java/com/seecoder/BlueWhale/controller/ProductController.java

@@ -1,7 +1,6 @@
 package com.seecoder.BlueWhale.controller;
 
 import com.seecoder.BlueWhale.service.ProductService;
-import com.seecoder.BlueWhale.vo.CommentVO;
 import com.seecoder.BlueWhale.vo.ProductVO;
 import com.seecoder.BlueWhale.vo.ResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +35,4 @@ public class ProductController {
         return ResultVO.buildSuccess(productService.getProduct(id));
     }
 
-    @GetMapping("/comment")
-    public ResultVO<List<CommentVO>> getComments(@RequestParam("productId")Integer productId){
-        return ResultVO.buildSuccess(productService.getComments(productId));
-    }
 }

+ 0 - 5
src/main/java/com/seecoder/BlueWhale/enums/OrderStatusEnum.java

@@ -1,5 +0,0 @@
-package com.seecoder.BlueWhale.enums;
-
-public enum OrderStatusEnum {
-    UNPAID,UNSEND,UNGET,UNCOMMENT,DONE;
-}

+ 0 - 5
src/main/java/com/seecoder/BlueWhale/enums/OrderTypeEnum.java

@@ -1,5 +0,0 @@
-package com.seecoder.BlueWhale.enums;
-
-public enum OrderTypeEnum {
-    DELIVERY,PICKUP;
-}

+ 0 - 12
src/main/java/com/seecoder/BlueWhale/exception/BlueWhaleException.java

@@ -38,16 +38,4 @@ public class BlueWhaleException extends RuntimeException{
         return new BlueWhaleException("商品不存在!");
     }
 
-    public static BlueWhaleException orderNotExists(){
-        return new BlueWhaleException("订单不存在!");
-    }
-
-    public static BlueWhaleException orderStatusError(){
-        return new BlueWhaleException("订单状态错误!");
-    }
-
-    public static BlueWhaleException stockNotEnough(){
-        return new BlueWhaleException("库存不足!");
-    }
-
 }

+ 0 - 84
src/main/java/com/seecoder/BlueWhale/po/Order.java

@@ -1,84 +0,0 @@
-package com.seecoder.BlueWhale.po;
-
-import com.seecoder.BlueWhale.enums.OrderStatusEnum;
-import com.seecoder.BlueWhale.enums.OrderTypeEnum;
-import com.seecoder.BlueWhale.vo.OrderVO;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.Date;
-
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@Entity
-@Table(name = "`order`") //order是数据库保留字段,使用要加引号
-public class Order {
-        
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "id")
-    private Integer id;
-
-    @Basic
-    @Column(name = "user_id")
-    private Integer userId;
-
-    @Basic
-    @Column(name = "product_id")
-    private Integer productId;
-
-    @Basic
-    @Column(name = "amount")
-    private Integer amount;
-
-    @Basic
-    @Column(name = "paid")
-    private Double paid;
-
-    @Basic
-    @Column(name = "type")
-    @Enumerated(EnumType.STRING)
-    private OrderTypeEnum type;
-
-    @Basic
-    @Column(name = "content")
-    private String content;
-
-    @Basic
-    @Column(name = "rating")
-    private Integer rating;
-
-    @Basic
-    @Column(name = "status")
-    @Enumerated(EnumType.STRING)
-    private OrderStatusEnum status;
-
-    @Basic
-    @Column(name = "create_time")
-    private Date createTime;
-
-    @Basic
-    @Column(name = "finish_time")
-    private Date finishTime;
-
-    public OrderVO toVO(){
-        OrderVO orderVO=new OrderVO();
-        orderVO.setAmount(this.amount);
-        orderVO.setContent(this.content);
-        orderVO.setCreateTime(this.createTime);
-        orderVO.setFinishTime(this.finishTime);
-        orderVO.setId(this.id);
-        orderVO.setPaid(this.paid);
-        orderVO.setProductId(this.productId);
-        orderVO.setRating(this.rating);
-        orderVO.setStatus(this.status);
-        orderVO.setType(this.type);
-        orderVO.setUserId(this.userId);
-        return orderVO;
-    }
-}

+ 0 - 15
src/main/java/com/seecoder/BlueWhale/repository/OrderRepository.java

@@ -1,15 +0,0 @@
-package com.seecoder.BlueWhale.repository;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import com.seecoder.BlueWhale.po.Order;
-
-public interface OrderRepository extends JpaRepository<Order, Integer> {
-    List<Order> findByUserId(Integer userId);
-
-    List<Order> findByProductIdAndFinishTimeNotNull(Integer productId);
-
-
-}

+ 0 - 22
src/main/java/com/seecoder/BlueWhale/service/OrderService.java

@@ -1,22 +0,0 @@
-package com.seecoder.BlueWhale.service;
-
-import com.seecoder.BlueWhale.vo.OrderVO;
-
-import java.util.List;
-
-public interface OrderService {
-    OrderVO create(OrderVO orderVO);
-
-    List<OrderVO> getAllOrders();
-
-    OrderVO getOrder(Integer id);
-
-    Boolean pay(Integer orderId);
-
-    Boolean deliver(Integer orderId);
-
-    Boolean get(Integer orderId);
-
-    Boolean comment(Integer orderId, String comment, Integer rating);
-
-}

+ 0 - 3
src/main/java/com/seecoder/BlueWhale/service/ProductService.java

@@ -2,8 +2,6 @@ package com.seecoder.BlueWhale.service;
 
 import java.util.List;
 
-import com.seecoder.BlueWhale.enums.CategoryEnum;
-import com.seecoder.BlueWhale.vo.CommentVO;
 import com.seecoder.BlueWhale.vo.ProductVO;
 
 public interface ProductService {
@@ -15,5 +13,4 @@ public interface ProductService {
 
     ProductVO getProduct(Integer id);
 
-    List<CommentVO> getComments(Integer productId);
 }

+ 0 - 163
src/main/java/com/seecoder/BlueWhale/serviceImpl/OrderServiceImpl.java

@@ -1,163 +0,0 @@
-package com.seecoder.BlueWhale.serviceImpl;
-
-import com.seecoder.BlueWhale.enums.OrderStatusEnum;
-import com.seecoder.BlueWhale.exception.BlueWhaleException;
-import com.seecoder.BlueWhale.po.Order;
-import com.seecoder.BlueWhale.po.Product;
-import com.seecoder.BlueWhale.po.Store;
-import com.seecoder.BlueWhale.po.User;
-import com.seecoder.BlueWhale.repository.OrderRepository;
-import com.seecoder.BlueWhale.repository.ProductRepository;
-import com.seecoder.BlueWhale.repository.StoreRepository;
-import com.seecoder.BlueWhale.service.OrderService;
-import com.seecoder.BlueWhale.util.SecurityUtil;
-import com.seecoder.BlueWhale.vo.OrderVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class OrderServiceImpl implements OrderService {
-
-    @Autowired
-    OrderRepository orderRepository;
-
-    @Autowired
-    SecurityUtil securityUtil;
-
-    @Autowired
-    StoreRepository storeRepository;
-
-    @Autowired
-    ProductRepository productRepository;
-
-    @Override
-    public OrderVO create(OrderVO orderVO) {
-        Order order = orderVO.toPO();
-        order.setUserId(securityUtil.getCurrentUser().getId());
-        order.setStatus(OrderStatusEnum.UNPAID);
-        order.setCreateTime(new Date());
-        orderRepository.save(order);
-        return wrapWithProductId(order.toVO());
-    }
-
-    @Override
-    public List<OrderVO> getAllOrders() {
-        User user=securityUtil.getCurrentUser();
-        List<Order> orders = null;
-        switch (user.getRole()){
-            case CUSTOMER:
-                orders = orderRepository.findByUserId(user.getId());
-                break;
-            case STAFF:
-                Integer storeId=user.getStoreId();
-                orders = orderRepository.findAll().stream()
-                        .filter(x-> storeId.equals(productRepository.findById(x.getProductId()).get().getStoreId()))
-                        .collect(Collectors.toList());
-                break;
-            case MANAGER:
-            case CEO:
-                orders = orderRepository.findAll();
-                break;
-        }
-        return orders.stream().map(x->wrapWithProductId(x.toVO())).collect(Collectors.toList());
-    }
-
-    @Override
-    public OrderVO getOrder(Integer id) {
-        return wrapWithProductId(orderRepository.findById(id).get().toVO());
-    }
-
-    @Override
-    public Boolean pay(Integer orderId) {
-        User user=securityUtil.getCurrentUser();
-        Order order = orderRepository.findById(orderId).orElse(null);
-        if(order == null){
-            throw BlueWhaleException.orderNotExists();
-        }
-        if(order.getStatus() != OrderStatusEnum.UNPAID){
-            throw BlueWhaleException.orderStatusError();
-        }
-        Product product=productRepository.findById(order.getProductId()).get();
-        order.setPaid(product.getPrice()*order.getAmount());
-        order.setStatus(OrderStatusEnum.UNSEND);
-        orderRepository.save(order);
-        return true;
-    }
-
-    @Override
-    public Boolean deliver(Integer orderId) {
-        Order order = orderRepository.findById(orderId).orElse(null);
-        if(order == null){
-            throw BlueWhaleException.orderNotExists();
-        }
-        if(order.getStatus() != OrderStatusEnum.UNSEND){
-            throw BlueWhaleException.orderStatusError();
-        }
-        Product product = productRepository.findById(order.getProductId()).get();
-        if (product.getStock()<order.getAmount()){
-            throw BlueWhaleException.stockNotEnough();
-        }
-        order.setStatus(OrderStatusEnum.UNGET);
-        orderRepository.save(order);
-        product.setSalesAmount(product.getSalesAmount()+order.getAmount());
-        product.setStock(product.getStock()-order.getAmount());
-        productRepository.save(product);
-        return true;
-    }
-
-    @Override
-    public Boolean get(Integer orderId) {
-        Order order = orderRepository.findById(orderId).orElse(null);
-        if(order == null){
-            throw BlueWhaleException.orderNotExists();
-        }
-        if(order.getStatus() != OrderStatusEnum.UNGET){
-            throw BlueWhaleException.orderStatusError();
-        }
-        order.setStatus(OrderStatusEnum.UNCOMMENT);
-        orderRepository.save(order);
-        return true;
-    }
-
-    @Override
-    public Boolean comment(Integer orderId, String comment, Integer rating) {
-        Order order = orderRepository.findById(orderId).orElse(null);
-        if(order == null){
-            throw BlueWhaleException.orderNotExists();
-        }
-        if(order.getStatus() != OrderStatusEnum.UNCOMMENT){
-            throw BlueWhaleException.orderStatusError();
-        }
-        order.setContent(comment);
-        order.setRating(rating);
-        order.setStatus(OrderStatusEnum.DONE);
-        order.setFinishTime(new Date());
-        orderRepository.save(order);
-
-        Product product = productRepository.findById(order.getProductId()).get();
-        Double currentProductRating = product.getRating();
-        product.setRating((currentProductRating*product.getNumber()+rating)/(product.getNumber()+1));
-        product.setNumber(product.getNumber()+1);
-        productRepository.save(product);
-
-        Store store = storeRepository.findById(product.getStoreId()).get();
-        Double currentStoreRating = store.getRating();
-        store.setRating((currentStoreRating*store.getNumber()+rating)/(store.getNumber()+1));
-        store.setNumber(store.getNumber()+1);
-        storeRepository.save(store);
-        return true;
-    }
-
-    private OrderVO wrapWithProductId(OrderVO orderVO){
-        Integer productId=orderVO.getProductId();
-        Product product=productRepository.findById(productId).get();
-        orderVO.setProductName(product.getName());
-        orderVO.setPrice(product.getPrice());
-        orderVO.setStoreId(product.getStoreId());
-        return orderVO;
-    }
-}

+ 0 - 29
src/main/java/com/seecoder/BlueWhale/serviceImpl/ProductServiceImpl.java

@@ -1,20 +1,15 @@
 package com.seecoder.BlueWhale.serviceImpl;
 
 import com.seecoder.BlueWhale.exception.BlueWhaleException;
-import com.seecoder.BlueWhale.po.Order;
 import com.seecoder.BlueWhale.po.Product;
 import com.seecoder.BlueWhale.po.Store;
-import com.seecoder.BlueWhale.repository.OrderRepository;
 import com.seecoder.BlueWhale.repository.ProductRepository;
 import com.seecoder.BlueWhale.repository.StoreRepository;
-import com.seecoder.BlueWhale.repository.UserRepository;
 import com.seecoder.BlueWhale.service.ProductService;
-import com.seecoder.BlueWhale.vo.CommentVO;
 import com.seecoder.BlueWhale.vo.ProductVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -27,15 +22,6 @@ public class ProductServiceImpl implements ProductService {
     @Autowired
     StoreRepository storeRepository;
 
-    @Autowired
-    EntityManager entityManager;
-
-    @Autowired
-    OrderRepository orderRepository;
-
-    @Autowired
-    UserRepository userRepository;
-
     @Override
     public Boolean create(ProductVO productVO) {
         if (productRepository.findByStoreIdAndName(productVO.getStoreId(),productVO.getName())!=null){
@@ -78,19 +64,4 @@ public class ProductServiceImpl implements ProductService {
         }
         return product.toVO();
     }
-
-    @Override
-    public List<CommentVO> getComments(Integer productId) {
-        List<Order> orders=orderRepository.findByProductIdAndFinishTimeNotNull(productId);
-        return orders.stream().map(x->{
-            CommentVO commentVO=new CommentVO();
-            commentVO.setOrderId(x.getId());
-            commentVO.setRating(x.getRating());
-            commentVO.setTime(x.getFinishTime());
-            commentVO.setComment(x.getContent());
-            commentVO.setUserId(x.getUserId());
-            commentVO.setUserName(userRepository.findById(x.getUserId()).get().getName());
-            return commentVO;
-        }).collect(Collectors.toList());
-    }
 }

+ 0 - 1
src/main/java/com/seecoder/BlueWhale/serviceImpl/UserServiceImpl.java

@@ -9,7 +9,6 @@ import com.seecoder.BlueWhale.po.User;
 import com.seecoder.BlueWhale.service.UserService;
 import com.seecoder.BlueWhale.util.SecurityUtil;
 import com.seecoder.BlueWhale.util.TokenUtil;
-import com.seecoder.BlueWhale.vo.OrderVO;
 import com.seecoder.BlueWhale.vo.UserVO;
 
 import java.util.Date;

+ 0 - 5
src/main/java/com/seecoder/BlueWhale/serviceImpl/strategy/CalculateStrategy.java

@@ -1,5 +0,0 @@
-package com.seecoder.BlueWhale.serviceImpl.strategy;
-
-public interface CalculateStrategy {
-    Double calculate(Double price);
-}

+ 0 - 6
src/main/java/com/seecoder/BlueWhale/serviceImpl/strategy/Context.java

@@ -1,6 +0,0 @@
-package com.seecoder.BlueWhale.serviceImpl.strategy;
-
-public class Context {
-    private CalculateStrategy calculateStrategy;
-
-}

+ 0 - 9
src/main/java/com/seecoder/BlueWhale/serviceImpl/strategy/FillReductionCouponCalculateStrategy.java

@@ -1,9 +0,0 @@
-package com.seecoder.BlueWhale.serviceImpl.strategy;
-
-public class FillReductionCouponCalculateStrategy implements CalculateStrategy{
-
-    @Override
-    public Double calculate(Double price) {
-        return 0.0;
-    }
-}

+ 0 - 20
src/main/java/com/seecoder/BlueWhale/serviceImpl/strategy/SpecialCouponCalculateStrategy.java

@@ -1,20 +0,0 @@
-package com.seecoder.BlueWhale.serviceImpl.strategy;
-
-/**
- * @Author: DingXiaoyu
- * @Date: 22:35 2023/12/19
- * “蓝鲸券”使用规则:
- * 0-100元区间打九五折;
- * 100-200元区间打九折;
- * 200-300元区间打八五折;
- * 300-400元区间打八折;
- * 400-500元区间打七五折;
- * 500元以上区间打七折。
-*/
-public class SpecialCouponCalculateStrategy implements CalculateStrategy{
-
-    @Override
-    public Double calculate(Double price) {
-        return 0.0;
-    }
-}

+ 0 - 25
src/main/java/com/seecoder/BlueWhale/vo/CommentVO.java

@@ -1,25 +0,0 @@
-package com.seecoder.BlueWhale.vo;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.Date;
-
-@Getter
-@Setter
-@NoArgsConstructor
-public class CommentVO {
-
-    Integer userId;
-
-    String userName;
-
-    Integer orderId;
-
-    Integer rating;
-
-    String comment;
-
-    Date time;
-}

+ 0 - 61
src/main/java/com/seecoder/BlueWhale/vo/OrderVO.java

@@ -1,61 +0,0 @@
-package com.seecoder.BlueWhale.vo;
-
-import com.seecoder.BlueWhale.enums.OrderStatusEnum;
-import com.seecoder.BlueWhale.enums.OrderTypeEnum;
-import com.seecoder.BlueWhale.po.Order;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.Date;
-
-@Getter
-@Setter
-@NoArgsConstructor
-public class OrderVO {
-    
-    private Integer id;
-
-    private Integer userId;
-
-    private Integer productId;
-
-    private Integer amount;
-
-    private Double paid;
-
-    private OrderTypeEnum type;
-
-    private String content;
-
-    private Integer rating;
-
-    private OrderStatusEnum status;
-
-    private Date createTime;
-
-    private Date finishTime;
-
-    private String productName;
-
-    private Integer storeId;
-
-    private Double price;
-
-    public Order toPO(){
-        Order order=new Order();
-        order.setAmount(this.amount);
-        order.setContent(this.content);
-        order.setCreateTime(this.createTime);
-        order.setFinishTime(this.finishTime);
-        order.setId(this.id);
-        order.setPaid(this.paid);
-        order.setProductId(this.productId);
-        order.setRating(this.rating);
-        order.setStatus(this.status);
-        order.setType(this.type);
-        order.setUserId(this.userId);
-        return order;
-    }
-
-}