admin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/impl/ScoreServiceImpl.java

@@ -43,6 +43,9 @@ public class ScoreServiceImpl implements IScoreService {
     public List<StoneScoreListDto> list(StoneScoreListParam param) {
         param.setUid("-999");
         List<StoneScoreListDto> dto = stoneScoreUserMapper.list(param);
+        for (StoneScoreListDto item : dto) {
+            item.setScoreRest(item.getScoreAll().subtract(item.getScoreUse()));
+        }
         return dto;
     }
 
@@ -50,7 +53,7 @@ public class ScoreServiceImpl implements IScoreService {
     public List<StoneScoreListExportDto> listExport(String[] uidList) {
         List<StoneScoreListDto> list = stoneScoreUserMapper.listExport(uidList);
         List<StoneScoreListExportDto> voList = new ArrayList();
-        for (StoneScoreListDto item :list){
+        for (StoneScoreListDto item : list) {
             voList.add(StoneScoreListExportDto.getNew().copyExportVo(item));
         }
         return voList;
@@ -101,11 +104,11 @@ public class ScoreServiceImpl implements IScoreService {
         param.setMobile("");
         param.setUid(uid);
         StoneScoreListDto dto = stoneScoreUserMapper.detail(param);
-        List<StoneScoreLogs> dataList = stoneScoreLogsMapper.selectList(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid));
+        List<StoneScoreLogs> dataList = stoneScoreLogsMapper.selectList(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).orderByDesc(StoneScoreLogs::getCreatedAt));
         StoneUserScoreDetailVo vo = new StoneUserScoreDetailVo();
-        if(dataList==null || dataList.size()==0) {
+        if (dataList == null || dataList.size() == 0) {
 
-        }else{
+        } else {
             vo.setDto(dto);
             vo.setScoreLogs(dataList);
         }

liquidnet-bus-do/liquidnet-service-stone-do/src/main/resources/com/liquidnet/service/stone/mapper/StoneScoreUserMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap id="StoneScoreListDtoResult" type="com.liquidnet.service.stone.dto.StoneScoreListDto">
         <result column="nickname" property="nickName"/>
+        <result column="avatar" property="avatar"/>
         <result column="mobile" property="mobile"/>
         <result column="uid" property="uid"/>
         <result column="status" property="status"/>
@@ -16,9 +17,11 @@
         SELECT hu.*,
         SUM(CASE WHEN score <![CDATA[>]]> 0 THEN score ELSE 0 END) AS 'score_all',
         ABS(SUM(CASE WHEN score <![CDATA[<]]> 0 THEN score ELSE 0 END)) AS 'score_use',
-        ('score_all' - 'score_use') as 'score_rest'
+        ('score_all' - 'score_use') as 'score_rest',
+        avatar
         FROM (SELECT nickname,
         mobile,
+        avatar,
         au.uid,
         IFNULL(ssu.status,1) as 'status'
         from adam_user as au