fix some bug

src/main/java/cn/edu/ecnu/stu/bookstore/component/Constants.java

@@ -27,4 +27,6 @@ public interface Constants {
     String BALANCE_ERROR = "余额不足";
 
     String URL_PREFIX = "http://127.0.0.1:8080";
+    String ORDER_NON_EXIST_ERROR = "订单不存在";
+    String ORDER_HAS_PAID_ERROR = "订单已支付";
 }

src/main/java/cn/edu/ecnu/stu/bookstore/mapper/OrderMapper.java

@@ -12,9 +12,9 @@ import java.util.Map;
 @Mapper
 public interface OrderMapper {
 
-    @Insert("insert into t_order(order_id, buyer_id, from_address, to_address, price, status, store_id, create_time) values " +
+    @Insert("insert into t_order(order_id, buyer_id, from_address, to_address, price, status, store_id) values " +
             "(#{order.orderId}, #{order.buyerId}, #{order.fromAddress}, #{order.toAddress}, #{order.price}, #{order.status.value}, " +
-            "#{order.storeId}, #{order.createTime})")
+            "#{order.storeId})")
     int insert(@Param("order")Order order);
 
     int insertOrderBook(@Param("orderId") String orderId, @Param("books") List<Map<String, Object>> books);
@@ -26,4 +26,6 @@ public interface OrderMapper {
     void updateOrderStatus(@Param("orderId") String orderId, @Param("status") OrderStatus status);
 
     List<Order> select(@Param("buyerId") Integer buyerId, @Param("status") OrderStatus status);
+
+    Order selectById(@Param("orderId") String orderId);
 }

src/main/java/cn/edu/ecnu/stu/bookstore/mapper/StoreMapper.java

@@ -17,4 +17,8 @@ public interface StoreMapper {
 
     @Insert("insert into t_store(store_id, seller_id) values(#{store.storeId}, #{store.sellerId})")
     int insert(@Param("store") Store store);
+
+    @Select("select store_id, seller_id, create_time from t_store where store_id = #{storeId}")
+    Store getStoreById(@Param("storeId") String storeId);
+
 }

src/main/java/cn/edu/ecnu/stu/bookstore/mapper/UserMapper.java

@@ -32,5 +32,5 @@ public interface UserMapper {
     int minusBalance(@Param("userId") int userId, @Param("price") BigDecimal price);
 
     @Update("update t_user set balance = balance + #{addValue} where id = #{userId}")
-    void addFunds(@Param("userId") Integer userId,@Param("addValue") BigDecimal addValue);
+    void addBalance(@Param("userId") Integer userId,@Param("addValue") BigDecimal addValue);
 }

src/main/java/cn/edu/ecnu/stu/bookstore/pojo/Order.java

@@ -1,6 +1,7 @@
 package cn.edu.ecnu.stu.bookstore.pojo;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +11,7 @@ import java.sql.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class Order {
 
     private String orderId;

src/main/java/cn/edu/ecnu/stu/bookstore/service/impl/BuyerService.java

@@ -4,11 +4,9 @@ import cn.edu.ecnu.stu.bookstore.component.AppException;
 import cn.edu.ecnu.stu.bookstore.component.Constants;
 import cn.edu.ecnu.stu.bookstore.mapper.BookMapper;
 import cn.edu.ecnu.stu.bookstore.mapper.OrderMapper;
+import cn.edu.ecnu.stu.bookstore.mapper.StoreMapper;
 import cn.edu.ecnu.stu.bookstore.mapper.UserMapper;
-import cn.edu.ecnu.stu.bookstore.pojo.Book;
-import cn.edu.ecnu.stu.bookstore.pojo.Order;
-import cn.edu.ecnu.stu.bookstore.pojo.OrderStatus;
-import cn.edu.ecnu.stu.bookstore.pojo.User;
+import cn.edu.ecnu.stu.bookstore.pojo.*;
 import cn.edu.ecnu.stu.bookstore.pojo.vo.NewOrderVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -34,6 +32,9 @@ public class BuyerService {
     private UserMapper userMapper;
 
     @Autowired
+    private StoreMapper storeMapper;
+
+    @Autowired
     private PasswordEncoder encoder;
 
     @Autowired
@@ -49,12 +50,16 @@ public class BuyerService {
             bookMap.put((String) map.get("id"), (Integer) map.get("count"));
         }
         String storeId = newOrderVO.getStoreId();
+        Store store = storeMapper.getStoreById(storeId);
+        if(store == null)
+            throw new AppException(Constants.CLIENT_ERROR, Constants.STORE_NON_EXIST_ERROR);
 
-        buyerService.insertOrder(storeId, bookMap, bookList);
+        buyerService.insertOrder(store, bookMap, bookList);
     }
 
     @Transactional
-    public void insertOrder(String storeId, HashMap<String, Integer> bookMap, List<Map<String, Object>> bookList) {
+    public void insertOrder(Store store, HashMap<String, Integer> bookMap, List<Map<String, Object>> bookList) {
+        String storeId = store.getStoreId();
         List<Book> books = bookMapper.batchSelect(storeId, bookMap.keySet());
         if(books.size() != bookList.size())
             throw new AppException(Constants.CLIENT_ERROR, Constants.BOOK_ERROR);
@@ -73,9 +78,11 @@ public class BuyerService {
         }
         User user = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         String orderId = UUID.randomUUID().toString();
-        Order order = new Order(orderId, user.getId(), null, null, sum, OrderStatus.WAIT_PAYMENT, storeId, null);
+        Order order = Order.builder().orderId(orderId).buyerId(user.getId()).storeId(storeId)
+                        .price(sum).status(OrderStatus.WAIT_PAYMENT)
+                        .build();
         orderMapper.insert(order);
-        orderMapper.insertOrderBook(order.getOrderId(), list);
+        orderMapper.insertOrderBook(orderId, list);
         for (Map<String, Object> map : list) {
             Book book = (Book)map.get("book");
             bookMapper.minusStockLevel(book.getBookId(), (int)map.get("count"));
@@ -86,23 +93,29 @@ public class BuyerService {
         User user = userMapper.selectOneById(userId);
         if(!encoder.matches(password, user.getPassword()))
             throw new AppException(Constants.CLIENT_ERROR, Constants.PASSWORD_ERROR);
-        BigDecimal price = orderMapper.selectPrice(orderId);
-        if(price.compareTo(user.getBalance()) > 0)
+        Order order = orderMapper.selectById(orderId);
+        if(order == null)
+            throw new AppException(Constants.CLIENT_ERROR, Constants.ORDER_NON_EXIST_ERROR);
+        if(!order.getStatus().equals(OrderStatus.WAIT_PAYMENT))
+            throw new AppException(Constants.CLIENT_ERROR, Constants.ORDER_HAS_PAID_ERROR);
+        if(order.getPrice().compareTo(user.getBalance()) > 0)
             throw new AppException(Constants.CLIENT_ERROR, Constants.BALANCE_ERROR);
-        buyerService.updateBalanceAndOrder(orderId, userId, price);
+        buyerService.updateBalanceAndOrder(storeMapper.getStoreById(order.getStoreId()).getSellerId(), order);
     }
 
     @Transactional
-    public void updateBalanceAndOrder(String orderId, Integer userId, BigDecimal price) {
-        orderMapper.updateOrderStatus(orderId, OrderStatus.WAIT_SEND);
-        userMapper.minusBalance(userId, price);
+    public void updateBalanceAndOrder(Integer sellerId, Order order) {
+        orderMapper.updateOrderStatus(order.getOrderId(), OrderStatus.WAIT_SEND);
+        BigDecimal price = order.getPrice();
+        userMapper.minusBalance(order.getBuyerId(), price);
+        userMapper.addBalance(sellerId, price);
     }
 
     public void addFunds(String username, String password, BigDecimal addValue) {
         User user = userMapper.selectOneByName(username);
         if(!encoder.matches(password, user.getPassword()))
             throw new AppException(Constants.CLIENT_ERROR, Constants.PASSWORD_ERROR);
-        userMapper.addFunds(user.getId(), addValue);
+        userMapper.addBalance(user.getId(), addValue);
 
     }
 

src/main/resources/application.yml

@@ -16,6 +16,6 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
-    host: 106.75.98.95
+    host: 106.75.116.246
     port: 6379
     password: qwe030318

src/main/resources/mapper/OrderMapper.xml

@@ -25,4 +25,8 @@
         select order_id, buyer_id, from_address, to_address, price, status, store_id, create_time from t_order
         where buyer_id = #{buyerId} and status = #{status.value}
     </select>
+    <select id="selectById" resultMap="orderMap">
+        select order_id, buyer_id, from_address, to_address, price, status, store_id, create_time from t_order
+        where order_id = #{orderId}
+    </select>
 </mapper>

src/main/resources/mapper/UserMapper.xml

@@ -4,8 +4,8 @@
 
 <mapper namespace="cn.edu.ecnu.stu.bookstore.mapper.UserMapper">
     <insert id="insert" useGeneratedKeys="true">
-        insert into t_user(username, password, balance, address, phone)
-        values (#{user.username}, #{user.password}, #{user.balance}, #{user.address}, #{user.phone})
+        insert into t_user(username, password, address, phone)
+        values (#{user.username}, #{user.password}, #{user.address}, #{user.phone})
     </insert>
 
     <delete id="delete">

src/test/java/cn/edu/ecnu/stu/bookstore/BuyerTest.java

@@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.*;