Explorar o código

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw %!s(int64=8) %!d(string=hai) anos
pai
achega
679410e38a

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

@@ -20,7 +20,7 @@ public interface MemberGradeMapper {
 	
 	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
 	
-	int countMemberOrder();
+	int countMemberOrder(String userId);
 	
 	int addBasicsMemberOrder(MemberOrder mo);
 	
@@ -28,4 +28,10 @@ public interface MemberGradeMapper {
 		
 	int updateMemberOrder(Map<String, Object> map);
 	
+	int updateUserLvl(Map<String, Object> map);
+	
+	
+	
+	
+	
 }

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

@@ -61,10 +61,9 @@
 		resultMap="memberOrderMap">
 		SELECT mo.id,menber_type , 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
+		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
 		WHERE user_id=#{id}
 		LIMIT #{pNos},#{pSize}
 	</select>
@@ -108,7 +107,6 @@
 		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
 	</select>
 
-
 	<!-- 前台生成订单 -->
 	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
 		INSERT INTO
@@ -116,12 +114,12 @@
 		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
 	</insert>
 
-	<select id="countMemberOrder" resultType="int">
+	<select id="countMemberOrder" parameterType="String"  resultType="int">
 		SELECT COUNT(*) FROM
 		member_order
+		WHERE  user_id=#{userId}
 	</select>
 
-
 	<!-- 后台订单更改 -->
 	<update id="updateMemberOrder" parameterType="java.util.Map" >
 		UPDATE member_order SET 
@@ -134,8 +132,14 @@
 		WHERE id=#{id}
 	</update>
 
+	<!-- 更改用户会员等级 -->
+	<update id="updateUserLvl" parameterType="java.util.Map">
+		UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
+	</update>
+	
+	
+	
 	
-
 
 
 

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

@@ -213,7 +213,7 @@ public class MemberOrder {
 		if (this.paymentTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.paymentTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.paymentTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

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

@@ -147,7 +147,10 @@ public class MemberGradeController extends BaseApiController {
 	 */
 	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.GET)
 	public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
-			Integer orderState, String paymentTime, String paymentType) {
+			Integer orderState, String paymentTime, String paymentType,String userId) {
+		Map<String, Object> umap = new HashMap<>();
+		umap.put("userId",userId);
+		umap.put("lvl",memberRank);
 		Map<String, Object> map = new HashMap<>();
 		map.put("id", id);
 		map.put("menberType", memberRank);
@@ -156,7 +159,7 @@ public class MemberGradeController extends BaseApiController {
 		map.put("orderState", orderState);
 		map.put("paymentTime", paymentTime);
 		map.put("paymentType", paymentType);
-		return res().data(memberGradeService.updateMemberOrder(map));
+		return res().data(memberGradeService.updateMemberOrder(map, umap));
 	}
 
 }

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

@@ -54,7 +54,7 @@ public class MemberGradeFrontController extends BaseApiController {
 		map.put("pSize", pSize);
 		map.put("id", TokenManager.getUserId());
 		List<MemberOrder> lsit = memberGradeService.selectMemberOrder(map);
-		int count = memberGradeService.countMemberOrder();
+		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
 		Map<String, Object> maps = new HashMap<>();
 		maps.put("lsit", lsit);
 		maps.put("count", count);

+ 10 - 4
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -43,8 +43,8 @@ public class MemberGradeService {
 		return memberGradeMapper.selectMemberOrderBa(map);
 	}
 
-	public int countMemberOrder() {
-		return memberGradeMapper.countMemberOrder();
+	public int countMemberOrder(String userId) {
+		return memberGradeMapper.countMemberOrder(userId);
 	}
 
 	public int addBasicsMemberOrder(MemberOrder mo) {
@@ -56,9 +56,15 @@ public class MemberGradeService {
 	}
 	
 	
-	public int updateMemberOrder(Map<String, Object> map){
-		return memberGradeMapper.updateMemberOrder(map);
+	public int updateMemberOrder(Map<String, Object> map,Map<String, Object> umap){
+		int i=memberGradeMapper.updateMemberOrder(map);
+		int j=memberGradeMapper.updateUserLvl(umap);
+		return i+j;
 	}
 	
+	
+	
+	
+	
 
 }