finish 60% and tests

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

@@ -18,8 +18,13 @@ public interface Constants {
     String STORE_NON_EXIST_ERROR = "商铺不存在";
     String PICTURE_ERROR = "图片解码失败";
     String BOOK_ERROR = "商铺不存在或书籍不存在";
+    String STOCK_LEVEL_ERROR = "库存不足";
 
     String STORE_ID_ERROR = "商铺ID已存在";
 
+    String ORDER_IS_NULL_ERROR = "订单不能为空";
+
+    String BALANCE_ERROR = "余额不足";
+
     String URL_PREFIX = "http://127.0.0.1:8080";
 }

src/main/java/cn/edu/ecnu/stu/bookstore/config/SecurityConfig.java

@@ -42,7 +42,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                 .and()
                 .authorizeRequests()
-                .antMatchers("/auth/*").permitAll()
+                .antMatchers("/auth/*", "/buyer/add_funds", "/buyer/payment").permitAll()
                 .anyRequest().authenticated();
 
         http.addFilterBefore(authenticationFilter, UsernamePasswordAuthenticationFilter.class);

src/main/java/cn/edu/ecnu/stu/bookstore/controller/AuthController.java

@@ -30,10 +30,7 @@ public class AuthController {
 
     @PostMapping("/login")
     public Result login(@RequestBody User user) {
-        String token = userService.login(user);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("token", token);
-        return Result.success(map);
+        return Result.success(userService.login(user));
     }
 
     @PostMapping("/password")

src/main/java/cn/edu/ecnu/stu/bookstore/controller/BuyerController.java

@@ -0,0 +1,47 @@
+package cn.edu.ecnu.stu.bookstore.controller;
+
+import cn.edu.ecnu.stu.bookstore.component.Result;
+import cn.edu.ecnu.stu.bookstore.pojo.vo.NewOrderVO;
+import cn.edu.ecnu.stu.bookstore.service.impl.BuyerService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+
+@RestController
+@RequestMapping("/buyer")
+public class BuyerController {
+
+    @Autowired
+    private BuyerService buyerService;
+
+    @PostMapping("/new_order")
+    public Result newOrder(@RequestBody NewOrderVO newOrderVO) {
+        buyerService.newOrder(newOrderVO);
+        return Result.success();
+    }
+
+    @PostMapping("/payment")
+    public Result payment(@RequestBody JSONObject object) {
+        Integer userId = object.getInteger("userId");
+        String orderId = object.getString("orderId");
+        String password = object.getString("password");
+        buyerService.payment(userId, orderId, password);
+        return Result.success();
+    }
+
+    @PostMapping("/add_funds")
+    public Result addFunds(@RequestBody JSONObject object) {
+        String username = object.getString("username");
+        String password = object.getString("password");
+        BigDecimal addValue = object.getBigDecimal("addValue");
+        buyerService.addFunds(username, password, addValue);
+        return Result.success();
+    }
+
+    @GetMapping("/order")
+    public Result order() {
+        return Result.success(buyerService.getOrderList());
+    }
+}

src/main/java/cn/edu/ecnu/stu/bookstore/handler/OrderStatusTypeHandler.java

@@ -0,0 +1,32 @@
+package cn.edu.ecnu.stu.bookstore.handler;
+
+import cn.edu.ecnu.stu.bookstore.pojo.OrderStatus;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class OrderStatusTypeHandler implements TypeHandler<OrderStatus> {
+    @Override
+    public void setParameter(PreparedStatement preparedStatement, int i, OrderStatus status, JdbcType jdbcType) throws SQLException {
+        preparedStatement.setInt(i, status.getValue());
+    }
+
+    @Override
+    public OrderStatus getResult(ResultSet resultSet, String s) throws SQLException {
+        return OrderStatus.getByValue(resultSet.getInt(s));
+    }
+
+    @Override
+    public OrderStatus getResult(ResultSet resultSet, int i) throws SQLException {
+        return OrderStatus.getByValue(resultSet.getInt(i));
+    }
+
+    @Override
+    public OrderStatus getResult(CallableStatement callableStatement, int i) throws SQLException {
+        return OrderStatus.getByValue(callableStatement.getInt(i));
+    }
+}

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

@@ -1,9 +1,12 @@
 package cn.edu.ecnu.stu.bookstore.mapper;
 
 import cn.edu.ecnu.stu.bookstore.pojo.Book;
+import cn.edu.ecnu.stu.bookstore.pojo.vo.NewOrderVO;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Mapper
 public interface BookMapper {
@@ -33,4 +36,9 @@ public interface BookMapper {
 
     @Update("update t_book set stock_level = stock_level + #{addStockLevel} where store_id = #{storeId} and book_id = #{bookId}")
     void addStockLevel(@Param("storeId") String storeId, @Param("bookId") String bookId, @Param("addStockLevel") int addStockLevel);
+
+    List<Book> batchSelect(@Param("storeId") String storeId, @Param("books") Set<String> books);
+
+    @Update("update t_book set stock_level = stock_level - #{count} where book_id = #{bookId}")
+    int minusStockLevel(@Param("bookId") String bookId, @Param("count") int count);
 }

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

@@ -0,0 +1,29 @@
+package cn.edu.ecnu.stu.bookstore.mapper;
+
+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 org.apache.ibatis.annotations.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+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 " +
+            "(#{order.orderId}, #{order.buyerId}, #{order.fromAddress}, #{order.toAddress}, #{order.price}, #{order.status.value}, " +
+            "#{order.storeId}, #{order.createTime})")
+    int insert(@Param("order")Order order);
+
+    int insertOrderBook(@Param("orderId") String orderId, @Param("books") List<Map<String, Object>> books);
+
+    @Select("select price from t_order where order_id = #{orderId}")
+    BigDecimal selectPrice(@Param("orderId") String orderId);
+
+    @Update("update t_order set status = #{status.value} where order_id = #{orderId}")
+    void updateOrderStatus(@Param("orderId") String orderId, @Param("status") OrderStatus status);
+
+    List<Order> select(@Param("buyerId") Integer buyerId, @Param("status") OrderStatus status);
+}

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
+
 @Mapper
 public interface UserMapper {
 
@@ -17,15 +19,18 @@ public interface UserMapper {
 
     int deleteByName(@Param("username") String username);
 
-    @Select("select id, username, password, address, phone from t_user where id = #{id}")
+    @Select("select id, username, password, address, phone, balance from t_user where id = #{id}")
     User selectOneById(@Param("id") Integer id);
 
-    @Select("select id, username, password, address, phone from t_user where username = #{username}")
+    @Select("select id, username, password, address, phone, balance from t_user where username = #{username}")
     User selectOneByName(@Param("username") String username);
 
-    @Select("select count(*) from t_user where username = #{username} and password = #{password}")
-    int checkPassword(@Param("username") String username, @Param("password") String password);
-
     @Update("update t_user set password = #{password} where username = #{username}")
     int updatePassword(@Param("username") String username, @Param("password") String password);
+
+    @Update("update t_user set balance = balance - #{price} where id = #{userId}")
+    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);
 }

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

@@ -0,0 +1,30 @@
+package cn.edu.ecnu.stu.bookstore.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.sql.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Order {
+
+    private String orderId;
+
+    private Integer buyerId;
+
+    private String fromAddress;
+
+    private String toAddress;
+
+    private BigDecimal price;
+
+    private OrderStatus status;
+
+    private String storeId;
+
+    private Date createTime;
+}

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

@@ -0,0 +1,54 @@
+package cn.edu.ecnu.stu.bookstore.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
+public enum OrderStatus implements AbstractOrderStatus{
+    WAIT_PAYMENT(0),
+    WAIT_SEND(1),
+    WAIT_RECEIVE(2),
+    COMPLETED(3),
+    CANCEL(4);
+
+    private int value;
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    @Override
+    public void nextOrder() {
+        if(value == CANCEL.value)
+            return;
+        value += 1;
+    }
+
+    @Override
+    public void cancelOrder() {
+        value = CANCEL.value;
+    }
+
+    public static OrderStatus getByValue(int val) {
+        for(OrderStatus status : values()) {
+            if(status.value == val)
+                return status;
+        }
+        return null;
+    }
+}
+
+interface AbstractOrderStatus {
+
+
+    void nextOrder();
+
+    void cancelOrder();
+
+
+}

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

@@ -1,21 +1,30 @@
 package cn.edu.ecnu.stu.bookstore.pojo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@Builder
 public class User {
 
     private int id;
 
     private String username;
 
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String password;
 
-    private int balance;
+    @Builder.Default
+    private BigDecimal balance = BigDecimal.ZERO;
 
     private String phone;
 

src/main/java/cn/edu/ecnu/stu/bookstore/pojo/vo/NewOrderVO.java

@@ -0,0 +1,18 @@
+package cn.edu.ecnu.stu.bookstore.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NewOrderVO {
+
+    private String storeId;
+
+    private List<Map<String, Object>> books;
+}

src/main/java/cn/edu/ecnu/stu/bookstore/service/UserService.java

@@ -2,12 +2,14 @@ package cn.edu.ecnu.stu.bookstore.service;
 
 import cn.edu.ecnu.stu.bookstore.pojo.User;
 
+import java.util.Map;
+
 public interface UserService {
 
     void register(User user);
     void unregister(User user);
     User selectUserByName(String username);
-    String login(User user);
+    Map<String, Object> login(User user);
 
     void logout(String username);
 

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

@@ -0,0 +1,114 @@
+package cn.edu.ecnu.stu.bookstore.service.impl;
+
+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.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.vo.NewOrderVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class BuyerService {
+
+    @Autowired
+    private BookMapper bookMapper;
+
+    @Autowired
+    private OrderMapper orderMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private PasswordEncoder encoder;
+
+    @Autowired
+    @Lazy
+    private BuyerService buyerService;
+
+    public void newOrder(NewOrderVO newOrderVO) {
+        List<Map<String, Object>> bookList = newOrderVO.getBooks();
+        if(bookList.size() < 1)
+            throw new AppException(Constants.CLIENT_ERROR, Constants.ORDER_IS_NULL_ERROR);
+        HashMap<String, Integer> bookMap = new HashMap<>();
+        for(Map<String, Object> map : bookList) {
+            bookMap.put((String) map.get("id"), (Integer) map.get("count"));
+        }
+        String storeId = newOrderVO.getStoreId();
+
+        buyerService.insertOrder(storeId, bookMap, bookList);
+    }
+
+    @Transactional
+    public void insertOrder(String storeId, HashMap<String, Integer> bookMap, List<Map<String, Object>> bookList) {
+        List<Book> books = bookMapper.batchSelect(storeId, bookMap.keySet());
+        if(books.size() != bookList.size())
+            throw new AppException(Constants.CLIENT_ERROR, Constants.BOOK_ERROR);
+        List<Map<String, Object>> list = books.stream().map(book -> {
+            int count = bookMap.get(book.getBookId());
+            if(count > book.getStockLevel())
+                throw new AppException(Constants.CLIENT_ERROR, Constants.STOCK_LEVEL_ERROR);
+            Map<String, Object> map = new HashMap<>();
+            map.put("count", count);
+            map.put("book", book);
+            return map;
+        }).collect(Collectors.toList());
+        BigDecimal sum = new BigDecimal(0);
+        for(Book book : books) {
+            sum = sum.add(book.getPrice().multiply(BigDecimal.valueOf(bookMap.get(book.getBookId()))));
+        }
+        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);
+        orderMapper.insert(order);
+        orderMapper.insertOrderBook(order.getOrderId(), list);
+        for (Map<String, Object> map : list) {
+            Book book = (Book)map.get("book");
+            bookMapper.minusStockLevel(book.getBookId(), (int)map.get("count"));
+        }
+    }
+
+    public void payment(Integer userId, String orderId, String password) {
+        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)
+            throw new AppException(Constants.CLIENT_ERROR, Constants.BALANCE_ERROR);
+        buyerService.updateBalanceAndOrder(orderId, userId, price);
+    }
+
+    @Transactional
+    public void updateBalanceAndOrder(String orderId, Integer userId, BigDecimal price) {
+        orderMapper.updateOrderStatus(orderId, OrderStatus.WAIT_SEND);
+        userMapper.minusBalance(userId, 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);
+
+    }
+
+    public List<Order> getOrderList() {
+        User user = (User)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        return orderMapper.select(user.getId(), OrderStatus.WAIT_PAYMENT);
+
+    }
+}

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

@@ -17,6 +17,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -60,12 +62,16 @@ public class UserServiceImpl implements UserService {
         return userMapper.selectOneByName(username);
     }
 
-    public String login(User user) {
+    public Map<String, Object> login(User user) {
         UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(user.getUsername(), user.getPassword());
         Authentication authenticate = authenticationManager.authenticate(token);
         LoginUser loginUser = (LoginUser)authenticate.getPrincipal();
-        redisTemplate.opsForValue().set("userId:" + loginUser.getUser().getId(), "1", 1, TimeUnit.DAYS);
-        return JwtUtil.getToken(loginUser.getUser());
+        User user1 = loginUser.getUser();
+        redisTemplate.opsForValue().set("userId:" + user1.getId(), "1", 1, TimeUnit.DAYS);
+        Map<String, Object> map = new HashMap<>();
+        map.put("token", JwtUtil.getToken(user1));
+        map.put("user", user1);
+        return map;
     }
 
     public void logout(String username) {

src/main/java/cn/edu/ecnu/stu/bookstore/utils/ImageUtil.java

@@ -85,9 +85,5 @@ public class ImageUtil {
             }
         }
     }
-
-    public static void main(String[] args) {
-        System.out.println(convertImageToBase64Str("d8c8d6d0ffb2a0257a1aa80835cbb81c.jpeg"));
-    }
 }
 

src/main/resources/application.yml

@@ -4,6 +4,9 @@ server:
 mybatis:
   mapper-locations: classpath:mapper/*.xml
   type-aliases-package: cn.edu.ecnu.stu.bookstore.pojo
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 spring:
   datasource:
@@ -13,6 +16,6 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
-    host: 106.75.64.112
+    host: 106.75.98.95
     port: 6379
-    password: qwe030318
+    password: qwe030318

src/main/resources/mapper/BookMapper.xml

@@ -16,4 +16,13 @@
             (#{book_id}, #{picture})
         </foreach>
     </insert>
+
+    <select id="batchSelect" resultType="cn.edu.ecnu.stu.bookstore.pojo.Book">
+        select book_id, store_id, title, author, publisher, original_title, translator, pub_year, pages, price, binding, isbn, stock_level from t_book
+            where store_id = #{storeId} and book_id in (
+            <foreach collection="books" item="id" separator=",">
+                #{id}
+            </foreach>
+            )
+    </select>
 </mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -0,0 +1,28 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.edu.ecnu.stu.bookstore.mapper.OrderMapper">
+    <insert id="insertOrderBook">
+        insert into t_order_book(order_id, book_id, count, single_price) values
+        <foreach collection="books" item="map" separator=",">
+            (#{orderId}, #{map.book.bookId}, #{map.count}, #{map.book.price})
+        </foreach>
+    </insert>
+    
+    <resultMap id="orderMap" type="order">
+        <id property="orderId" column="order_id"/>
+        <result property="buyerId" column="buyer_id"/>
+        <result property="fromAddress" column="from_address"/>
+        <result property="toAddress" column="to_address"/>
+        <result property="price" column="price"/>
+        <result property="storeId" column="store_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="status" column="status" typeHandler="cn.edu.ecnu.stu.bookstore.handler.OrderStatusTypeHandler"/>
+    </resultMap>
+
+    <select id="select" resultMap="orderMap">
+        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>
+</mapper>

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

@@ -0,0 +1,159 @@
+package cn.edu.ecnu.stu.bookstore;
+
+import cn.edu.ecnu.stu.bookstore.component.Constants;
+import cn.edu.ecnu.stu.bookstore.component.Result;
+import cn.edu.ecnu.stu.bookstore.pojo.User;
+import cn.edu.ecnu.stu.bookstore.utils.ImageUtil;
+import cn.edu.ecnu.stu.bookstore.utils.RequestUtil;
+import com.alibaba.fastjson.JSONArray;
+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.*;
+
+@SpringBootTest
+public class BuyerTest {
+
+    private String token;
+
+    private final String storeId = "store" + UUID.randomUUID();
+
+    private List<String> bookIds;
+
+    private Integer userId;
+
+    private String username;
+
+    private String password;
+
+    public void init() {
+        if(username != null)
+            return;
+        String url = Constants.URL_PREFIX + "/auth/register";
+        Map<String, Object> map = new HashMap<>();
+        username = UUID.randomUUID().toString();
+        password = username + "x";
+        map.put("username", username);
+        map.put("password", password);
+        Result result = RequestUtil.post(url, map, null);
+        assert result != null && result.getCode() != null && result.getCode().equals(Constants.SUCCESS);
+
+        url = Constants.URL_PREFIX + "/auth/login";
+        result = RequestUtil.post(url, map, null);
+        assert result != null && result.getCode() != null && result.getCode().equals(Constants.SUCCESS);
+
+        JSONObject data = (JSONObject) result.getData();
+        token = data.getString("token");
+        userId = data.getObject("user", User.class).getId();
+
+        url = Constants.URL_PREFIX + "/seller/create_store";
+        map = new HashMap<>();
+        map.put("storeId", storeId);
+        result = RequestUtil.post(url, map, token);
+        assert result != null && Constants.SUCCESS.equals(result.getCode());
+
+        result = RequestUtil.post(url, map, token);
+        assert result != null && Constants.CLIENT_ERROR.equals(result.getCode());
+
+        url = Constants.URL_PREFIX + "/seller/add_book";
+        String bookId = UUID.randomUUID().toString();
+        String title = "title" + UUID.randomUUID();
+        String author = "author" + UUID.randomUUID();
+        String publisher = "publisher" + UUID.randomUUID();
+        BigDecimal price = new BigDecimal("29.88");
+        String authorIntro = "authorIntro" + UUID.randomUUID();
+        String bookIntro = "bookIntro" + UUID.randomUUID();
+        String content = "content" + UUID.randomUUID();
+        List<String> tags = Arrays.asList("tag" + UUID.randomUUID(), "tag" + UUID.randomUUID());
+        List<String> pictures = Arrays.asList(ImageUtil.convertImageToBase64Str("ff3c65cd-497e-4b17-aa55-5882a38ed2fd.png"));
+        map = new HashMap<>();
+        map.put("storeId", storeId);
+        map.put("bookId", bookId);
+        map.put("title", title);
+        map.put("author", author);
+        map.put("publisher", publisher);
+        map.put("price", price);
+        map.put("authorIntro", authorIntro);
+        map.put("bookIntro", bookIntro);
+        map.put("content", content);
+        map.put("tags", tags);
+        map.put("pictures", pictures);
+        result = RequestUtil.post(url, map, token);
+        assert result != null && Constants.SUCCESS.equals(result.getCode());
+
+        map.put("bookId", bookId + "x");
+        bookIds = Arrays.asList(bookId, bookId + "x");
+        result = RequestUtil.post(url, map, token);
+        assert result != null && Constants.SUCCESS.equals(result.getCode());
+
+        url = Constants.URL_PREFIX + "/seller/add_stock_level";
+        map = new HashMap<>();
+        map.put("storeId", storeId);
+        map.put("addStockLevel", 100);
+        for (String id : bookIds) {
+            map.put("bookId", id);
+            result = RequestUtil.post(url, map, token);
+            assert result != null && Constants.SUCCESS.equals(result.getCode());
+        }
+    }
+
+    @Test
+    public void testNewOrder() {
+        init();
+        String url = Constants.URL_PREFIX + "/buyer/new_order";
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("storeId", storeId);
+        List<Map<String, Object>> list = new LinkedList<>();
+        int c = 1;
+        for (String bookId : bookIds) {
+            HashMap<String, Object> map0 = new HashMap<>();
+            map0.put("id", bookId);
+            map0.put("count", c++);
+            list.add(map0);
+        }
+        map.put("books", list);
+        Result result = RequestUtil.post(url, map, token);
+        assert result != null && Constants.SUCCESS.equals(result.getCode());
+
+        list.get(0).put("id", "我爱数据库");
+        result = RequestUtil.post(url, map, token);
+        assert result != null && Constants.CLIENT_ERROR.equals(result.getCode());
+    }
+
+    @Test
+    public void testAddFunds() {
+        init();
+        String url = Constants.URL_PREFIX + "/buyer/add_funds";
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("username", username);
+        map.put("password", password);
+        map.put("addValue", 1000);
+        Result result = RequestUtil.post(url, map, null);
+        assert result != null && Constants.SUCCESS.equals(result.getCode());
+    }
+
+    @Test
+    public void testPayment() {
+        init();
+        testNewOrder();
+        testAddFunds();
+
+        String url = Constants.URL_PREFIX + "/buyer/order";
+        Result result = RequestUtil.get(url, null, token);
+        JSONArray data = (JSONArray) result.getData();
+        Object[] objects = data.stream().toArray();
+        url = Constants.URL_PREFIX + "/buyer/payment";
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("userId", userId);
+        map.put("password", password);
+        for (Object obj : objects) {
+            JSONObject obj1 = (JSONObject) obj;
+            map.put("orderId", obj1.getString("orderId"));
+            result = RequestUtil.post(url, map, null);
+            assert result != null && Constants.SUCCESS.equals(result.getCode());
+        }
+    }
+}

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

@@ -16,17 +16,17 @@ import java.math.BigDecimal;
 import java.util.*;
 
 @SpringBootTest
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SellerTest {
 
     private String token;
 
-    private final String storeId = "store" + UUID.randomUUID();
+    private String storeId;
 
-    private final String bookId = "book" + UUID.randomUUID();
+    private String bookId;
 
-    @PostConstruct
     public void init() {
+        if(token != null)
+            return;
         String url = Constants.URL_PREFIX + "/auth/register";
         Map<String, Object> map = new HashMap<>();
         String username = UUID.randomUUID().toString();
@@ -44,11 +44,12 @@ public class SellerTest {
         token = data.getString("token");
     }
 
-    @Order(1)
     @Test
     public void testCreateStore() {
+        init();
         String url = Constants.URL_PREFIX + "/seller/create_store";
         HashMap<String, Object> map = new HashMap<>();
+        storeId = "store" + UUID.randomUUID();
         map.put("storeId", storeId);
         Result result = RequestUtil.post(url, map, token);
         assert result != null && Constants.SUCCESS.equals(result.getCode());
@@ -58,10 +59,11 @@ public class SellerTest {
 
     }
 
-    @Order(2)
     @Test
     public void testAddBook() {
+        init();
         testCreateStore();
+        bookId = "book" + UUID.randomUUID();
         String url = Constants.URL_PREFIX + "/seller/add_book";
         String title = "title" + UUID.randomUUID();
         String author = "author" + UUID.randomUUID();
@@ -71,7 +73,7 @@ public class SellerTest {
         String bookIntro = "bookIntro" + UUID.randomUUID();
         String content = "content" + UUID.randomUUID();
         List<String> tags = Arrays.asList("tag" + UUID.randomUUID(), "tag" + UUID.randomUUID());
-        List<String> pictures = Arrays.asList(ImageUtil.convertImageToBase64Str("13b2e8c0-c0fd-4d29-b3d6-820019216b2e.png"));
+        List<String> pictures = Arrays.asList(ImageUtil.convertImageToBase64Str("ff3c65cd-497e-4b17-aa55-5882a38ed2fd.png"));
         HashMap<String, Object> map = new HashMap<>();
         map.put("storeId", storeId);
         map.put("bookId", bookId);
@@ -91,6 +93,7 @@ public class SellerTest {
 
     @Test
     public void testAddStockLevel() {
+        init();
         testAddBook();
         String url = Constants.URL_PREFIX + "/seller/add_stock_level";
         HashMap<String, Object> map = new HashMap<>();