用户类 邀请码 商城

Change-Id: If3a9ef5c464386647ae3b876104cbf4c71265c4b
diff --git a/src/main/java/com/pt5/pthouduan/mapper/UserMapper.java b/src/main/java/com/pt5/pthouduan/mapper/UserMapper.java
index c3bc827..8d0301a 100644
--- a/src/main/java/com/pt5/pthouduan/mapper/UserMapper.java
+++ b/src/main/java/com/pt5/pthouduan/mapper/UserMapper.java
@@ -1,9 +1,10 @@
 package com.pt5.pthouduan.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pt5.pthouduan.entity.PeerInfo;
 import com.pt5.pthouduan.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -22,37 +23,22 @@
     @Insert("INSERT INTO user(username, password, email, passkey) VALUES(#{username}, #{password}, #{email}, #{passkey})")
     int insert(User user);
 
-    @Delete("DELETE FROM user_behavior WHERE user_id = (SELECT user_id FROM User WHERE username = #{username})")
+    @Delete("DELETE FROM user WHERE username = #{username})")
     int deleteByUsername(@Param("username") String username);
 
-    @Select("SELECT * FROM User WHERE username = #{username}")
-    User selectByUsername(String username);
+    @Select("SELECT * FROM user WHERE username = #{username}")
+    Map<String, Object> selectByUsername(String username);
 
-    @Select("SELECT * FROM User WHERE email = #{email}")
-    User selectByEmail(String email);
+    @Select("SELECT username FROM user WHERE email = #{email}")
+    String selectByEmail(String email);
 
-    @Select("SELECT credit FROM User WHERE username = #{username}")
+    @Select("SELECT credit FROM user WHERE username = #{username}")
     int getcreditByUsername(String username);
 
-    @Select("SELECT passkey FROM user WHERE userid = #{userid}")
-    String selectPasskeyByUserid(Long userid);
-
-    @Select("SELECT permission FROM user WHERE userid = #{userid}")
-    int getpermissionByUserid(Long userid);
-
-    @Select("SELECT username FROM user WHERE userid = #{userid}")
-    String selectUsernameByUserid(Long userid);
-
-    @Select("SELECT userid FROM user WHERE username = #{username}")
-    String selectUseridByusername(String username);
-
     @Update("UPDATE user SET credit = credit - #{price} WHERE username = #{username}")
     int deductCreditByUsername(@Param("username") String username, @Param("price") int price);
 
-    @Update("UPDATE user SET credit = credit + #{price} WHERE username = #{username}")
-    int addCreditByUsername(@Param("username") String username, @Param("price") int price);
-
-    @Update("UPDATE user SET upload = upload + #{upload} WHERE username = #{username}")
+    @Update("UPDATE user SET user_upload = user_upload + #{upload} WHERE username = #{username}")
     int increaseUploadByUsername(@Param("username") String username, @Param("upload") Integer upload);
 
     @Update("UPDATE user SET password = #{password} WHERE username = #{username}")
@@ -70,20 +56,7 @@
     @Update("UPDATE user SET decoration = CONCAT(IFNULL(decoration, ''), ' ', #{newDecoration}) WHERE username = #{username}")
     int appendUserDecoration(@Param("username") String username, @Param("newDecoration") String newDecoration);
 
-    @Delete("DELETE FROM user WHERE username = #{username})")
-    int deleteByUsername(@Param("username") String username);
-
-    @Select("SELECT username, passkey, grade_id FROM user")
-    List<Map<String, Object>> selectAllUsersBasicInfo();
-
-    @Select("SELECT * FROM user")
-    List<Map<String, Object>> selectAllUsers();
-
-    @Select("SELECT * FROM user WHERE username REGEXP #{regexPattern}")
-    List<Map<String, Object>> selectUserByFuzzyKeyword(@Param("regexPattern") String regexPattern);
-
     boolean existsByPasskey(String passkey);
-
     void incrementUserTraffic( @Param("info_hash") String infoHash,@Param("passkey") String passkey, @Param("user_upload") long uploaded, @Param("user_download") long downloaded);
 
     String getUsernameByPasskey(String passkey);
@@ -92,4 +65,29 @@
 
     @Select("SELECT passkey FROM user WHERE userid = #{userid}")
     String selectPasskeyByUserid(Long userid);
+
+    @Select("SELECT username, passkey, grade_id FROM user")
+    List<Map<String, Object>> selectAllUsersBasicInfo();
+
+    @Select("SELECT username FROM user WHERE userid = #{userid}")
+    String selectUsernameByUserid(Long userid);
+
+    @Select("SELECT image,decoration,username,grade_id FROM user WHERE userid = #{userid}")
+    Map<String, Object> selectdecorationByUserid(Long userid);
+
+    @Select("SELECT userid FROM user WHERE username = #{username}")
+    String selectUseridByusername(String username);
+
+    @Select("SELECT * FROM user")
+    List<Map<String, Object>> selectAllUsers();
+
+    @Select("SELECT * FROM user WHERE username REGEXP #{regexPattern}")
+    List<Map<String, Object>> selectUserByFuzzyKeyword(@Param("regexPattern") String regexPattern);
+
+    @Update("UPDATE user SET credit = credit + #{price} WHERE username = #{username}")
+    int addCreditByUsername(@Param("username") String username, @Param("price") int price);
+
+    @Select("SELECT permission FROM user WHERE userid = #{userid}")
+    int getpermissionByUserid(Long userid);
+
 }