Administrator 8 年 前
コミット
93ebc7374e

+ 1 - 1
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -22,7 +22,7 @@ public interface MemberGradeMapper {
 	
 	int addMemberOrder(MemberOrder mo);
 	
-	
+	int countMemberOrder();
 	
 	
 }

+ 4 - 2
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -74,8 +74,10 @@
 		#{paymentTime},#{paymentValue},#{paymentType},#{paymentId},#{validTime})
 	</insert>
   
-  
-  
+  	<select id="countMemberOrder" resultType="int">
+  		SELECT COUNT(*) FROM member_order
+  	</select>
+  	
   
 
 </mapper>

+ 8 - 1
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -14,6 +14,7 @@ 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.common.model.MemberOrder;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
@@ -107,7 +108,13 @@ public class MemberGradeController extends BaseApiController {
 		Map<String,Object> map=new HashMap<>();
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
-		return res().data(memberGradeService.selectMemberOrderBa(map));
+		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
+		int count=memberGradeService.countMemberOrder();
+		Map<String,Object> maps=new HashMap<>();
+		maps.put("List", list);
+		maps.put("count", count);
+		maps.put("pageNo", pageNo);
+		return res().data(maps);
 	}
 	
 	

+ 10 - 1
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -2,6 +2,7 @@ package com.goafanti.memberGrade.controller;
 
 import java.text.ParseException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,9 +54,17 @@ public class MemberGradeFrontController extends BaseApiController {
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
 		map.put("id", TokenManager.getUserId());
-		return res().data(memberGradeService.selectMemberOrder(map));
+		List<MemberOrder> lsit=memberGradeService.selectMemberOrder(map);
+		int count=memberGradeService.countMemberOrder();
+		Map<String, Object> maps = new HashMap<>();
+		maps.put("lsit", lsit);
+		maps.put("count",count);
+		maps.put("pageNo", pageNo);
+		return res().data(maps);
 	}
 
+	
+
 	/**
 	 * 生成会员订单
 	 * 

+ 3 - 1
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -54,7 +54,9 @@ public class MemberGradeService {
 	}
 	
 	
-	
+	public int countMemberOrder(){
+		return memberGradeMapper.countMemberOrder();
+	}
 	
 	
 }