From a7fad98b4f19f93bbc53ae3130b4a6ff1c8326b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 14:29:11 +0800
Subject: [PATCH] Merge branch 'master' of ssh://193.112.35.168:29418/tejia

---
 app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java b/app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java
index 8015068..ddb2e81 100644
--- a/app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java
+++ b/app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java
@@ -15,8 +15,8 @@
 import com.ks.vip.service.VipCenterService;
 import com.ks.vip.service.VipCenterService;
 import com.ks.vip.service.VipGradeService;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -47,17 +47,27 @@
         try {
             List<VipCenterVO> listVO = new ArrayList<>();
 
+            List<VipGrade> listGrade = vipGradeService.getValidList();
+
             List<VipCenter> list = vipCenterService.listByPage(page, pageSize, t);
             if (list != null && list.size() > 0) {
                 for (VipCenter vipCenter: list) {
                     VipCenterVO vipCenterVO = new VipCenterVO();
                     BeanUtils.copyProperties(vipCenter, vipCenterVO);
-                    VipGrade vipGrade = vipGradeService.selectByPrimaryKey(vipCenter.getGradeId());
-                    if (vipGrade != null) {
-                        vipCenterVO.setGradeName(vipGrade.getName());
-                    }
 
-                    // 鐢ㄦ埛鏄庢煡璇� TODO
+                    String str = "";
+                    for (VipGrade vipGrade : listGrade) {
+                        if (vipGrade.getId().longValue() == vipCenter.getGradeId().longValue()) {
+                            vipCenterVO.setGradeName(vipGrade.getName());
+                            str += "<option value=\"" + vipGrade.getId() + "\"  selected=\"selected\" > " + vipGrade.getName() + "</option> ";
+                        } else {
+                            str += "<option value=\"" + vipGrade.getId() + "\"> " + vipGrade.getName() + "</option> ";
+                        }
+                    }
+                    // 涓嬫媺閫夋嫨妗�
+                    vipCenterVO.setVipGradeSelect(str);
+
+                    // 鐢ㄦ埛鍚�--鏌ヨ TODO
 
                     listVO.add(vipCenterVO);
                 }
@@ -78,19 +88,41 @@
     }
 
 
+    public String getVipGradeSelect(List<VipGrade> listGrade, Long gradeId) {
+        String str = "";
+        for (VipGrade t : listGrade) {
+            str += "<option value=\"" + t.getId() + "\" "
+                    + (t.getId().longValue() == gradeId.longValue() ? "selected=\"selected\"" : "") + " > " + t.getName()
+                    + "</option> ";
+        }
+        System.out.println(str);
+        return str;
+    }
+
+
     @ResponseBody
-    @RequestMapping(value = "save")
-    public Result save(VipCenter t, HttpServletRequest request) {
+    @RequestMapping(value = "add")
+    public Result add(VipCenter t, HttpServletRequest request) {
         try {
             vipCenterService.saveManageWeb(t);
             return ResultUtils.loadTrue();
-        } catch (VipCenterException e) {
-            return ResultUtils.loadFalse(e.getMsg());
         } catch (Exception e) {
             e.printStackTrace();
-           return ResultUtils.loadFalse("淇濆瓨澶辫触锛�");
+            return ResultUtils.loadFalse("淇濆瓨澶辫触锛�");
         }
     }
 
 
+    @ResponseBody
+    @RequestMapping(value = "modify")
+    public Result modify(VipCenter t, HttpServletRequest request) {
+        try {
+            vipCenterService.updateByPrimaryKeySelective(t);
+            return ResultUtils.loadTrue();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultUtils.loadFalse("淇濆瓨澶辫触锛�");
+        }
+    }
+
 }

--
Gitblit v1.8.0