积分日志修改

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

@@ -99,15 +99,14 @@ public class ScoreServiceImpl implements IScoreService {
     public StoneUserScoreDetailVo userScoreDetail(String uid) {
         StoneScoreListParam param = new StoneScoreListParam();
         param.setMobile("");
-        param.setStatus(-999);
         param.setUid(uid);
-        List<StoneScoreListDto> dto = stoneScoreUserMapper.list(param);
+        StoneScoreListDto dto = stoneScoreUserMapper.detail(param);
         List<StoneScoreLogs> dataList = stoneScoreLogsMapper.selectList(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid));
         StoneUserScoreDetailVo vo = new StoneUserScoreDetailVo();
         if(dataList==null || dataList.size()==0) {
 
         }else{
-            vo.setDto(dto.get(0));
+            vo.setDto(dto);
             vo.setScoreLogs(dataList);
         }
         return vo;

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

@@ -20,6 +20,9 @@ public interface StoneScoreUserMapper extends BaseMapper<StoneScoreUser> {
 
     List<StoneScoreListDto> list(StoneScoreListParam param);
 
+    StoneScoreListDto detail(StoneScoreListParam param);
+
+
     List<StoneScoreListDto> listExport(@Param("uids")String[] uids);
 
 }

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

@@ -41,6 +41,27 @@
         group by hu.uid;
     </select>
 
+    <select id="detail" parameterType="java.util.Map" resultMap="StoneScoreListDtoResult">
+        select hu.*,
+        (case when score <![CDATA[>]]> 0 then sum(score) else 0 END) as 'score_all',
+        (case when score <![CDATA[<]]> 0 then sum(score) else 0 END) as 'score_use',
+        ('score_all' - 'score_use') as 'score_rest'
+        from (select nickname,
+        mobile,
+        au.uid,
+        IFNULL(ssu.status,1) as 'status'
+        from adam_user as au
+        inner join adam_user_info aui on au.uid = aui.uid
+        left join stone_score_user ssu on ssu.uid = aui.uid
+        <where>
+            au.uid = #{uid}
+        </where>
+        limit 1
+        ) as hu
+        left join stone_score_logs sslog on sslog.uid = hu.uid
+        group by hu.uid;
+    </select>
+
 
     <select id="listExport" parameterType="java.util.Map" resultMap="StoneScoreListDtoResult">
         select hu.*,