完善积分模块

sooka-jnb/src/main/java/com/sooka/jnb/score/service/IScoreService.java

@@ -4,19 +4,21 @@ import com.sooka.jnb.score.domain.ScoreOperate;
 
 import java.util.List;
 
-public interface IScoreService{
+public interface IScoreService {
 
     /**
      * 初始化积分
+     *
      * @param score 积分实体类
-     * - userId 用户ID
-     * - scoreNum 初始化积分
-     * - createTime 创建时间
+     *              - userId 用户ID
+     *              - scoreNum 初始化积分
+     *              - createTime 创建时间
      */
     int initScore(ScoreOperate score);
 
     /**
      * 获取积分
+     *
      * @param userId 用户id
      */
     ScoreOperate getScore(String userId);
@@ -33,27 +35,44 @@ public interface IScoreService{
 
     /**
      * 增加积分
+     *
      * @param scoreOperate 积分操作实体
-     * - userId 用户id
-     * - scoreNum 增加的分数
-     * - createTime 创建时间
+     *                     - userId 用户id
+     *                     - scoreNum 增加的分数
+     *                     - createTime 创建时间
+     *                     - relevance 操作来源（字典值：key=score_type）
+     *                     - relevanceDataId 关联id
+     * @return int (>0:扣除成功)
      */
     int addScore(ScoreOperate scoreOperate);
 
     /**
      * 减少积分
+     *
      * @param scoreOperate 积分操作实体
-     * - userId 用户id
-     * - scoreNum 减少的分数
-     * - createTime 创建时间
+     *                     - userId 用户id
+     *                     - scoreNum 减少的分数
+     *                     - createTime 创建时间
+     *                     - relevance 操作来源（字典值：key=score_type）
+     *                     - relevanceDataId 关联id
      */
     int reduceScore(ScoreOperate scoreOperate);
 
     /**
+     * 校验剩余积分
+     *
+     * @param score 积分操作实体
+     *              - userId 用户Id
+     *              - scoreNum  要扣除的分数
+     * @return boolean 积分充足返回true,积分不足返回false
+     */
+    boolean verifyScore(ScoreOperate score);
+
+    /**
      * 唯一校验
+     *
      * @param userId 用户id
      * @return boolean 用户存在返回true,不存在则返回false
      */
     boolean soleVerify(String userId);
-
 }

sooka-jnb/src/main/java/com/sooka/jnb/score/service/impl/ScoreServiceImpl.java

@@ -62,12 +62,11 @@ public class ScoreServiceImpl implements IScoreService {
     @Override
     @Transactional
     public int reduceScore(ScoreOperate scoreOperate) {
-        ScoreOperate score = scoreMapper.getScore(scoreOperate.getUserId());
-        if (score.getScoreNum() < scoreOperate.getScoreNum()) {
-            return -1;
-        } else {
+        if(this.verifyScore(scoreOperate)){
             scoreMapper.reduceScore(scoreOperate);
             return this.insertScoreOperate(scoreOperate, REDUCE);
+        }else{
+            return -1;
         }
     }
 
@@ -90,4 +89,9 @@ public class ScoreServiceImpl implements IScoreService {
         Map<String, Long> resultMap = scoreMapper.soleVerify(userId);
         return resultMap.get("personSum") > 0;
     }
+
+    @Override
+    public boolean verifyScore(ScoreOperate score) {
+        return scoreMapper.getScore(score.getUserId()).getScoreNum() >= score.getScoreNum();
+    }
 }