Merge branch 'develop-kjf' into develop

* develop-kjf:
  修复了部分bug
  修复了部分bug
  修复了部分bug
  修复了部分bug
  修复了部分bug

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/subGetShareholderUserList/UserScoreListVO.java

@@ -40,7 +40,11 @@ public class UserScoreListVO implements Serializable {
      */
     @Schema(description = "用户编号")
     private String userCode;
-
+    /**
+     * 用户Id
+     */
+    @Schema(description = "用户Id")
+    private Long userId;
 
     /**
      * 股东积分

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsShdScoreServiceImpl.java

@@ -60,11 +60,12 @@ public class KxsShdScoreServiceImpl extends ServiceImpl<KxsShdScoreMapper, KxsSh
         month = month.split("-")[0] + month.split("-")[1];
         Page<UserScoreListVO> shareholderHighScoreUserList = kxsShdScoreMapper.getShareholderHighScoreUserList(page, month, type);
         for (UserScoreListVO record : shareholderHighScoreUserList.getRecords()) {
-            String userCode = record.getUserCode();
             //获取用户头像
-            KxsUser kxsUser = kxsUserMapper.selectOne(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getUserCode, userCode));
+            KxsUser kxsUser = kxsUserMapper.selectById(record.getUserId());
             if (kxsUser != null) {
                 record.setAvatar(kxsUser.getAvatar());
+                record.setUsername(kxsUser.getUsername());
+                record.setUserCode(kxsUser.getUserCode());
             }
         }
         return shareholderHighScoreUserList;
@@ -89,6 +90,8 @@ public class KxsShdScoreServiceImpl extends ServiceImpl<KxsShdScoreMapper, KxsSh
                         kxsShdScore.setCreateTime(now);
                         kxsShdScore.setDelFlag("0");
                         kxsShdScore.setUserId(Long.valueOf(kxsUser.getId()));
+                        kxsShdScore.setUsername(kxsUser.getUsername());
+                        kxsShdScore.setUserCode(kxsUser.getUserCode());
                         if (integralStatDTO.getTotalAmount().compareTo(ShdGradingEnum.LEVEL_FRIST.getTransactions()) >= 0){
                             kxsShdScore.setFirstScore(1);
                         }

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsShdScoreMapper.xml

@@ -55,7 +55,7 @@
                 high_score/3 AS score
             </when>
         </choose>,
-        id,username,user_code,id
+        id,username,user_code,id,user_id
         FROM kxs_shd_score
         WHERE del_flag != 1
         AND first_score >= 3
@@ -64,13 +64,13 @@
         AND month = #{month}
         <choose>
             <when test="type == 1">
-                ORDER BY first_score
+                ORDER BY first_score DESC
             </when>
             <when test="type == 2">
-                ORDER BY center_score
+                ORDER BY center_score DESC
             </when>
             <when test="type == 3">
-                ORDER BY high_score
+                ORDER BY high_score DESC
             </when>
         </choose>
     </select>