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

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

@@ -61,10 +61,11 @@
   	
   	<!-- 后台会员订单查询 -->
   	<select id="selectMemberOrderBa" parameterType="java.util.Map" resultMap="memberOrderMap">
-		SELECT mo.id,menber_type , mg.gradeName, price, valid_month,order_state ,order_time ,user_id ,
+		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.gradeName, price, valid_month,order_state ,order_time ,user_id ,
 		payment_time ,payment_value,payment_type ,payment_id ,valid_time FROM member_order mo
 		LEFT JOIN member_grade mg ON mg.id=mo.menber_Type
- 		LIMIT #{pNos},#{pSize}
+		LEFT JOIN user u ON u.id=mo.user_id
+		LIMIT #{pNos},#{pSize}
   	</select>
   
   
@@ -78,6 +79,8 @@
   		SELECT COUNT(*) FROM member_order
   	</select>
   	
+  	
+  	
   
 
 </mapper>

+ 24 - 2
src/main/java/com/goafanti/common/model/MemberOrder.java

@@ -66,11 +66,33 @@ public class MemberOrder {
     */
     private Date validTime;
     
-    
+    //会员类型名称
     private String gradeName;
     
+    //手机登录号
+    private String mobile;
+    //昵称
+    private String nickname;
+    
+    
     
-    public String getGradeName() {
+    public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getNickname() {
+		return nickname;
+	}
+
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+
+	public String getGradeName() {
 		return gradeName;
 	}
 

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

@@ -113,7 +113,7 @@ public class MemberGradeController extends BaseApiController {
 		Map<String,Object> maps=new HashMap<>();
 		maps.put("List", list);
 		maps.put("count", count);
-		maps.put("pageNo", pageNo);
+		maps.put("pNo", pNo);
 		return res().data(maps);
 	}
 	

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

@@ -59,7 +59,7 @@ public class MemberGradeFrontController extends BaseApiController {
 		Map<String, Object> maps = new HashMap<>();
 		maps.put("lsit", lsit);
 		maps.put("count",count);
-		maps.put("pageNo", pageNo);
+		maps.put("pNo", pNo);
 		return res().data(maps);
 	}