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

+ 8 - 20
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -1,18 +1,13 @@
 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.core.shiro.token.TokenManager;
 import com.goafanti.memberGrade.service.MemberGradeService;
 /**
  * 会员  前台
@@ -20,26 +15,19 @@ import com.goafanti.memberGrade.service.MemberGradeService;
  *
  */
 @RestController
-@RequestMapping(value = "api/user/member")
+@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);
+	@RequestMapping(value="selectMemberOrder",method=RequestMethod.GET)
+	public Result selectMemberOrder(){
+		String id=TokenManager.getUserId();
+		return res().data(memberGradeService.selectMemberOrder());
 	}
 	
-	
 }

+ 43 - 0
src/main/java/com/goafanti/portal/controller/PortalMemberController.java

@@ -0,0 +1,43 @@
+package com.goafanti.portal.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/portal/member")
+public class PortalMemberController 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);
+	}
+}