优化controller

ruoyi-admin/src/main/java/com/ruoyi/web/controller/score/ScoreController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.score;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.sooka.jnb.score.domain.ScoreOperate;
@@ -17,25 +18,29 @@ public class ScoreController extends BaseController {
     /**
      * 初始化积分
      *
-     * @param scoreOperate
-     * @return
+     * @param scoreOperate 积分操作实体
+     * @return AjaxResult
      */
     @PostMapping("/initScore")
-    public R initScore(@RequestBody ScoreOperate scoreOperate) {
-        if(service.soleVerify(scoreOperate.getUserId())){
-            return R.fail("用户已存在, 不能初始化积分!");
+    public AjaxResult initScore(@RequestBody ScoreOperate scoreOperate) {
+        if (service.soleVerify(scoreOperate.getUserId())) {
+            return AjaxResult.error("用户已存在, 不能初始化积分!");
+        }
+        if (service.initScore(scoreOperate) > 0) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error("初始化积分失败!");
         }
-        return R.ok(service.initScore(scoreOperate));
     }
 
     /**
      * 获取积分
      *
-     * @param userId
-     * @return
+     * @param userId 用户ID
+     * @return AjaxResult
      */
     @GetMapping("/getScore")
-    public R getScore(@RequestParam String userId) {
+    public R<ScoreOperate> getScore(@RequestParam String userId) {
         return R.ok(service.getScore(userId));
     }
 
@@ -43,7 +48,7 @@ public class ScoreController extends BaseController {
      * 获取用户积分列表
      */
     @GetMapping("/getList")
-    public TableDataInfo getList(ScoreOperate scoreOperate){
+    public TableDataInfo getList(ScoreOperate scoreOperate) {
         startPage();
         return getDataTable(service.getList(scoreOperate));
     }
@@ -61,8 +66,12 @@ public class ScoreController extends BaseController {
      * 增加积分
      */
     @PostMapping("/addScore")
-    public R addScore(@RequestBody ScoreOperate scoreOperate) {
-        return R.ok(service.addScore(scoreOperate));
+    public AjaxResult addScore(@RequestBody ScoreOperate scoreOperate) {
+        if (service.addScore(scoreOperate) > 0) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error("增加积分失败!");
+        }
     }
 
 
@@ -70,9 +79,15 @@ public class ScoreController extends BaseController {
      * 减少积分
      */
     @PostMapping("/reduceScore")
-    public R reduceScore(@RequestBody ScoreOperate scoreOperate) {
-        return R.ok(service.reduceScore(scoreOperate));
+    public AjaxResult reduceScore(@RequestBody ScoreOperate scoreOperate) {
+        if (service.verifyScore(scoreOperate)) {
+            if (service.reduceScore(scoreOperate) > 0) {
+                return AjaxResult.success();
+            } else {
+                return AjaxResult.error("减少积分失败!");
+            }
+        } else {
+            return AjaxResult.error("用户积分不足, 减少积分失败!");
+        }
     }
-
-
 }

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

@@ -62,12 +62,8 @@ public class ScoreServiceImpl implements IScoreService {
     @Override
     @Transactional
     public int reduceScore(ScoreOperate scoreOperate) {
-        if(this.verifyScore(scoreOperate)){
-            scoreMapper.reduceScore(scoreOperate);
-            return this.insertScoreOperate(scoreOperate, REDUCE);
-        }else{
-            return -1;
-        }
+        scoreMapper.reduceScore(scoreOperate);
+        return this.insertScoreOperate(scoreOperate, REDUCE);
     }
 
     /**