From 13cbf3a947c6a26f11cd74806d3faee2590c469e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 五月 2021 19:05:53 +0800
Subject: [PATCH] Merge branch 'master' of ssh://193.112.35.168:29418/tejia

---
 app/src/main/java/com/ks/app/controller/admin/vip/VipGradePotenceAdminController.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/ks/app/controller/admin/vip/VipGradePotenceAdminController.java b/app/src/main/java/com/ks/app/controller/admin/vip/VipGradePotenceAdminController.java
index 659154d..d31493e 100644
--- a/app/src/main/java/com/ks/app/controller/admin/vip/VipGradePotenceAdminController.java
+++ b/app/src/main/java/com/ks/app/controller/admin/vip/VipGradePotenceAdminController.java
@@ -6,6 +6,7 @@
 import com.ks.app.pojo.VO.PageEntity;
 import com.ks.app.pojo.VO.Result;
 import com.ks.app.util.ResultUtils;
+import com.ks.vip.exception.VipGradePotenceException;
 import com.ks.vip.pojo.DO.VipGrade;
 import com.ks.vip.pojo.DO.VipGradePotence;
 import com.ks.vip.service.VipGradePotenceService;
@@ -50,24 +51,13 @@
 
 
     @ResponseBody
-    @RequestMapping(value = "add")
-    public Result add(VipGradePotence t, HttpServletRequest request) {
+    @RequestMapping(value = "save")
+    public Result save(VipGradePotence t, HttpServletRequest request) {
         try {
-            vipGradePotenceService.insertSelective(t);
-			return ResultUtils.loadTrue();
-        } catch (Exception e) {
-            e.printStackTrace();
-			return ResultUtils.loadFalse("淇濆瓨澶辫触锛�");
-        }
-    }
-
-
-    @ResponseBody
-    @RequestMapping(value = "modify")
-    public Result modify(VipGradePotence t, HttpServletRequest request) {
-        try {
-            vipGradePotenceService.updateByPrimaryKeySelective(t);
+            vipGradePotenceService.save(t);
             return ResultUtils.loadTrue();
+        } catch (VipGradePotenceException e) {
+            return ResultUtils.loadFalse(e.getMsg());
         } catch (Exception e) {
             e.printStackTrace();
            return ResultUtils.loadFalse("淇濆瓨澶辫触锛�");
@@ -76,6 +66,18 @@
 
 
     @ResponseBody
+    @RequestMapping(value = "getByGradeId")
+    public Result getByGradeId(Long gradeId, HttpServletRequest request) {
+        try {
+            VipGradePotence t = vipGradePotenceService.getPotenceByGradeId(gradeId);
+            return ResultUtils.loadTrue(t);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultUtils.loadFalse("鏌ヨ澶辫触锛�");
+        }
+    }
+
+    @ResponseBody
     @RequestMapping(value = "delete")
     public Result delete(String ids, HttpServletRequest request) {
         try {

--
Gitblit v1.8.0