历史积分

renren-admin/src/main/java/io/renren/modules/qmjz/controller/ScoreStuController.java

@@ -1,13 +1,16 @@
 package io.renren.modules.qmjz.controller;
 
 import io.renren.common.utils.PageUtils;
+import io.renren.common.utils.R;
 import io.renren.modules.qmjz.entity.bo.ScoreStuBo;
 import io.renren.modules.qmjz.model.PageQuery;
 import io.renren.modules.qmjz.service.ScoreStuService;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -25,4 +28,12 @@ public class ScoreStuController {
     public PageUtils page(ScoreStuBo bo, PageQuery pageQuery) {
         return ScoreStuService.queryPageList(bo,pageQuery);
     }
+
+
+
+    @GetMapping("/getIntegralValue")
+    @ApiOperation("获取积分值")
+    public R getIntegralValue(@RequestParam("memberId") Long memberId) {
+        return R.ok().put("data", ScoreStuService.getIntegralValue(memberId));
+    }
 }

renren-admin/src/main/java/io/renren/modules/qmjz/mapper/ScoreStuMapper.java

@@ -14,4 +14,6 @@ public interface ScoreStuMapper extends BaseMapper<ScoreStu> {
     IPage<ScoreStuVo> selectPageList(@Param("page") Page<ScoreStu> page, @Param("bo") ScoreStuBo bo);
 
     Integer getTotalPointsByMemberId(@Param("memberId") Long member_id);
+
+    Integer getHistoryIntegral(@Param("memberId") Long memberId);
 }

renren-admin/src/main/java/io/renren/modules/qmjz/service/ScoreStuService.java

@@ -60,6 +60,13 @@ public interface ScoreStuService extends IService<ScoreStu>{
      */
     R share(Long stuId);
 
+    /**
+     * 历史积分/剩余积分
+     * @param memberId
+     * @return
+     */
+    Map<String, Integer> getIntegralValue(Long memberId);
+
     /**
      * 查询单次任务的加分情况
      * @param stuId

renren-admin/src/main/java/io/renren/modules/qmjz/service/impl/ScoreStuServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -194,6 +195,16 @@ public class ScoreStuServiceImpl extends ServiceImpl<ScoreStuMapper, ScoreStu> i
         return R.ok();
     }
 
+    @Override
+    public Map<String, Integer> getIntegralValue(Long memberId) {
+        Map<String, Integer> result = new HashMap<>();
+        Integer totalPoints = baseMapper.getTotalPointsByMemberId(memberId);
+        result.put("residualIntegral", ObjectUtil.isNotNull(totalPoints) ? totalPoints : 0);
+        Integer historyIntegral = baseMapper.getHistoryIntegral(memberId);
+        result.put("historyIntegral", ObjectUtil.isNotNull(historyIntegral) ? historyIntegral : 0);
+        return result;
+    }
+
     /**
      * 查询单词任务的加分情况
      *

renren-admin/src/main/resources/mapper/qmjz/ScoreStuMapper.xml

@@ -32,4 +32,13 @@
         WHERE
             `stu_id` = #{memberId}
     </select>
+
+    <select id="getHistoryIntegral" resultType="java.lang.Integer">
+        SELECT
+            SUM(IF(score_value>=0, score_value,0))
+        FROM
+            `tb_score_stu`
+        WHERE
+            `member_id` = #{memberId}
+    </select>
 </mapper>