Administrator 8 years ago
parent
commit
36139510d2

+ 18 - 8
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -6,7 +6,7 @@
 	<resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
 		<id column="id" property="id" />
 		<result column="menber_type" property="menberType" />
-		<result column="gradeName" property="gradeName" />
+		<result column="grade_name" property="gradeName" />
 		<result column="price" property="price" />
 		<result column="valid_month" property="validMonth" />
 		<result column="order_state" property="orderState" />
@@ -20,8 +20,18 @@
 	</resultMap>
 
 
+	<resultMap id="memberGradeMap" type="com.goafanti.memberGrade.bo.MemberGrade">
+		<id column="id" property="id" />
+		<result column="grade_name" property="gradeName" />
+		<result column="business" property="business" />
+		<result column="cost" property="cost" />
+		<result column="member_rank" property="memberRank" />
+	</resultMap>
+
+
+
 	<!-- 查询所有 -->
-	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
+	<select id="selectMemberGrade" resultMap="memberGradeMap">
 		SELECT * FROM
 		member_grade;
 	</select>
@@ -37,7 +47,7 @@
 	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
 		resultType="int">
 		SELECT COUNT(*) FROM member_grade WHERE
-		memberRank=#{memberRank}
+		member_rank=#{memberRank}
 	</select>
 
 
@@ -45,7 +55,7 @@
 	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
 		useGeneratedKeys="true" keyProperty="id">
 		INSERT INTO
-		member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
+		member_grade(grade_name,member_rank) VALUES (#{gradeName},#{memberRank})
 	</insert>
 
 
@@ -59,11 +69,11 @@
 	<!-- 前台会员订单查询 -->
 	<select id="selectMemberOrder" parameterType="java.util.Map"
 		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type , mg.gradeName, price,
+		SELECT mo.id,menber_type , mg.grade_name, 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.memberRank=mo.menber_Type
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_Type
 		WHERE user_id=#{id}
 		LIMIT #{pNos},#{pSize}
 	</select>
@@ -72,12 +82,12 @@
 	<!-- 后台会员订单查询 -->
 	<select id="selectMemberOrderBa" parameterType="java.util.Map"
 		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.gradeName, price,
+		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.grade_name, 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.memberRank=mo.menber_Type
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_Type
 		LEFT JOIN user u ON
 		u.id=mo.user_id
 		WHERE 1=1

+ 3 - 3
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -24,7 +24,7 @@
     <result column="type" jdbcType="INTEGER" property="type"/>
     <result column="person_portrait_url" jdbcType="VARCHAR" property="personPortraitUrl"/>
     <result column="logo_url" jdbcType="VARCHAR" property="logoUrl"/>
-    <result column="gradeName" jdbcType="VARCHAR" property="gradeName"/>
+    <result column="grade_name" jdbcType="VARCHAR" property="gradeName"/>
   </resultMap>
   
   <resultMap type="com.goafanti.user.bo.UserDownLoadBo" id="UserDownLoadBo">
@@ -195,7 +195,7 @@
   
   <select id="selectUserPageHomeBoByUserId" resultMap="UserPageHomeBo" parameterType="java.lang.String">
    select 
-   		u.lvl, mg.gradeName , u.nickname, u.email,
+   		u.lvl, mg.grade_name , u.nickname, u.email,
    		u.number, u.type, i.person_portrait_url, 
    		o.logo_url , u.id as uid, adc.achievement_count as achievementNum,
    		adc.demand_count as demandNum
@@ -203,7 +203,7 @@
    LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid 
    LEFT JOIN achievement_demand_count adc on adc.uid = u.id
-   LEFT JOIN   member_grade mg ON mg.memberRank=u.lvl
+   LEFT JOIN   member_grade mg ON mg.member_rank=u.lvl
    where u.id = #{uid,jdbcType = VARCHAR}
   </select>