Administrator лет назад: 8
Родитель
Сommit
1b08595892

+ 9 - 0
schema/20170829-member_grade.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `member_grade` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `gradeName` varchar(50) NOT NULL,
+  `business` longtext COMMENT '业务',
+  `cost` longtext COMMENT '费用',
+  `memberRank` int(11) DEFAULT NULL COMMENT '等级',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `gradeName_UNIQUE` (`gradeName`)
+) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8

+ 21 - 13
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -9,12 +9,18 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
 
+/**
+ * 会员等级管理 后台
+ * @author Administrator
+ *
+ */
 @RestController
 @RequestMapping(value = "/api/admin/member")
 public class MemberGradeController extends BaseApiController {
@@ -47,31 +53,33 @@ public class MemberGradeController extends BaseApiController {
 	public Result delGrade(int id) {
 		return res().data(memberGradeService.delGrade(id));
 	}
-	
+
 	/**
 	 * 新增会员等级名称
+	 * 
 	 * @param name
 	 * @return
 	 */
-	@RequestMapping(value = "/addGradeName",method = RequestMethod.GET)
-	public Result addGradeName(MemberGrade me){
-		if(memberGradeService.selectRank(me)>=1){
-			return res().data(0);
+	@RequestMapping(value = "/addGradeName", method = RequestMethod.GET)
+	public Result addGradeName(MemberGrade me) {
+		if (memberGradeService.selectRank(me) >= 1) {
+			Error e=new Error();
+			e.setMessage("该会员等级已存在");
+			return res().error(e);
 		}
-			memberGradeService.addGradeName(me);
-			return res().data(me.getId());
+		memberGradeService.addGradeName(me);
+		return res().data(me.getId());
 	}
-	
+
 	/**
-	 * 增加业务及费用  与更改
+	 * 增加业务及费用 与更改
+	 * 
 	 * @param me
 	 * @return
 	 */
-	@RequestMapping(value="/addBusinessAndCost",method=RequestMethod.GET)
-	public Result addBusinessAndCost(MemberGrade me){
+	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.GET)
+	public Result addBusinessAndCost(MemberGrade me) {
 		return res().data(memberGradeService.addBusinessAndCost(me));
 	}
-	
-	
 
 }

+ 45 - 0
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -0,0 +1,45 @@
+package com.goafanti.memberGrade.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.memberGrade.bo.MemberGrade;
+import com.goafanti.memberGrade.bo.MemberGradeBO;
+import com.goafanti.memberGrade.service.MemberGradeService;
+/**
+ * 会员  前台
+ * @author Administrator
+ *
+ */
+@RestController
+@RequestMapping(value = "api/user/member")
+public class MemberGradeFrontController extends BaseApiController{
+	@Autowired
+	private MemberGradeService memberGradeService;
+
+	/**
+	 * 查询等级
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/selectMemberGradeFr", method = RequestMethod.GET)
+	public Result selectMemberGradeFr() {
+		List<MemberGrade> list = memberGradeService.selectMemberGrade();
+		List<MemberGradeBO> result = new ArrayList<>();
+		for (MemberGrade mg : list) {
+			result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
+					JSON.parseObject(mg.getCost()), mg.getMemberRank()));
+		}
+		return res().data(result);
+	}
+	
+	
+}