Browse Source

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

wanghui 8 years ago
parent
commit
9a638cda37

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

@@ -20,13 +20,17 @@ public interface MemberGradeMapper {
 	
 	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
 	
-	int addMemberOrder(MemberOrder mo);
-	
 	int countMemberOrder();
 	
-	int addBasicsMemberOrder();
+	int addBasicsMemberOrder(MemberOrder mo);
 	
 	int countMemberOrderWhere(Map<String, Object> map);
+		
+	int updateMemberOrder(Map<String, Object> map);
+	
+	int updateUserLvl(Map<String, Object> map);
+	
+	
 	
 	
 	

+ 22 - 14
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -20,8 +20,6 @@
 	</resultMap>
 
 
-
-
 	<!-- 查询所有 -->
 	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
 		SELECT * FROM
@@ -80,7 +78,7 @@
 		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
+		LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
 		LEFT JOIN user u ON
 		u.id=mo.user_id
 		WHERE 1=1
@@ -89,7 +87,7 @@
 		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
 		<if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
 		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
-		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
+		<if test="endTimes!=null">AND order_time&lt;#{endTimes}</if>
 		LIMIT #{pNos},#{pSize}
 	</select>
 
@@ -110,7 +108,6 @@
 		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
 	</select>
 
-
 	<!-- 前台生成订单 -->
 	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
 		INSERT INTO
@@ -118,20 +115,31 @@
 		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
 	</insert>
 
-
-
-	<insert id="addMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
-		INSERT INTO
-		member_order VALUES
-		(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId},
-		#{paymentTime},#{paymentValue},#{paymentType},#{paymentId},#{validTime})
-	</insert>
-
 	<select id="countMemberOrder" resultType="int">
 		SELECT COUNT(*) FROM
 		member_order
 	</select>
 
+	<!-- 后台订单更改 -->
+	<update id="updateMemberOrder" parameterType="java.util.Map" >
+		UPDATE member_order SET 
+		menber_type=#{menberType},
+		valid_month=#{validMonth},
+		payment_value=#{paymentValue},
+		order_state=#{orderState},
+		payment_time=#{paymentTime},
+		payment_type=#{paymentType}
+		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);
 		}
 	}
 

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

@@ -1,6 +1,11 @@
 package com.goafanti.memberGrade.controller;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,7 +59,7 @@ public class MemberGradeController extends BaseApiController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/delGrade", method = RequestMethod.GET)
+	@RequestMapping(value = "/delGrade", method = RequestMethod.POST)
 	public Result delGrade(int id) {
 		return res().data(memberGradeService.delGrade(id));
 	}
@@ -65,7 +70,7 @@ public class MemberGradeController extends BaseApiController {
 	 * @param name
 	 * @return
 	 */
-	@RequestMapping(value = "/addGradeName", method = RequestMethod.GET)
+	@RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
 	public Result addGradeName(MemberGrade me) {
 		if (memberGradeService.selectRank(me) >= 1) {
 			Error e = new Error();
@@ -82,7 +87,7 @@ public class MemberGradeController extends BaseApiController {
 	 * @param me
 	 * @return
 	 */
-	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.GET)
+	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
 	public Result addBusinessAndCost(MemberGrade me) {
 		return res().data(memberGradeService.addBusinessAndCost(me));
 	}
@@ -95,10 +100,11 @@ public class MemberGradeController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
-	public Result selectMemberOrderBa(String pageNo, String pageSize, Integer id, String mobile, String nickname,
+	public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
 			Integer orderState, String startTime, String endTime) {
 		Integer pNo = 1;
 		Integer pSize = 10;
+		String da = null;
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 		}
@@ -114,7 +120,20 @@ public class MemberGradeController extends BaseApiController {
 		map.put("nickname", nickname);
 		map.put("orderState", orderState);
 		map.put("startTimes", startTime);
-		map.put("endTimes", endTime);
+		if (endTime != null) {
+			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+			try {
+				Date date = df.parse(endTime);
+				Calendar calendar = Calendar.getInstance();
+				calendar.setTime(date);
+				calendar.add(Calendar.DAY_OF_MONTH, 1);
+				da = df.format(calendar.getTime());
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		map.put("endTimes", da);
 		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
 		int countWhere = memberGradeService.countMemberOrderWhere(map);
 		Map<String, Object> maps = new HashMap<>();
@@ -124,4 +143,36 @@ public class MemberGradeController extends BaseApiController {
 		return res().data(maps);
 	}
 
+	/**
+	 * 后台会员更改
+	 * 
+	 * @param id
+	 * @param memberRank
+	 * @param validMonth
+	 * @param paymentValue
+	 * @param orderState
+	 * @param paymentTime
+	 * @param paymentType
+	 * @return
+	 */
+	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.GET)
+	public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
+			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);
+		map.put("validMonth", validMonth);
+		map.put("paymentValue", paymentValue);
+		map.put("orderState", orderState);
+		map.put("paymentTime", paymentTime);
+		map.put("paymentType", paymentType);
+		if( memberGradeService.updateUserLvl(umap)>=1 && memberGradeService.updateMemberOrder(map)>=1){
+			return res().data(1);
+		}
+		return res().data(0);
+	}
+
 }

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

@@ -1,12 +1,12 @@
 package com.goafanti.memberGrade.controller;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -53,40 +53,35 @@ public class MemberGradeFrontController extends BaseApiController {
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
 		map.put("id", TokenManager.getUserId());
-		List<MemberOrder> lsit=memberGradeService.selectMemberOrder(map);
-		int count=memberGradeService.countMemberOrder();
+		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("count", count);
 		maps.put("pNo", pNo);
 		return res().data(maps);
 	}
 
-	
-	
 	/**
-	 * 前台生成订单 
+	 * 前台生成订单
+	 * 
 	 * @param menberType
 	 * @param price
 	 * @param validMonth
 	 * @return
 	 */
 	@RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.GET)
-	public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth){
+	public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth) {
 		MemberOrder mo = new MemberOrder();
-		mo.setId(Long.parseUnsignedLong(jDBCIdGenerator.generateId().toString()));
+		mo.setId(jDBCIdGenerator.generateId());
 		mo.setMenberType(menberType);
 		mo.setPrice(Double.valueOf(price));
 		mo.setValidMonth(validMonth);
-		Date now = new Date();
-		new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
 		mo.setOrderState(0);
-		mo.setOrderTime(now);
+		mo.setOrderTime(new Date());
+		Assert.notNull(TokenManager.getUserToken(), "必须用户登录");
 		mo.setUserId(TokenManager.getUserId());
-		return res().data(memberGradeService.addMemberOrder(mo));
+		return res().data(memberGradeService.addBasicsMemberOrder(mo));
 	}
-	
-	
-
 
 }

+ 15 - 6
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -43,20 +43,29 @@ public class MemberGradeService {
 		return memberGradeMapper.selectMemberOrderBa(map);
 	}
 
-	public int addMemberOrder(MemberOrder mo) {
-		return memberGradeMapper.addMemberOrder(mo);
-	}
-
 	public int countMemberOrder() {
 		return memberGradeMapper.countMemberOrder();
 	}
 
-	public int addBasicsMemberOrder() {
-		return memberGradeMapper.addBasicsMemberOrder();
+	public int addBasicsMemberOrder(MemberOrder mo) {
+		return memberGradeMapper.addBasicsMemberOrder(mo);
 	}
 
 	public int countMemberOrderWhere(Map<String, Object> map) {
 		return memberGradeMapper.countMemberOrderWhere(map);
 	}
+	
+	
+	public int updateMemberOrder(Map<String, Object> map){
+		return memberGradeMapper.updateMemberOrder(map);
+	}
+	
+	
+	public int updateUserLvl(Map<String, Object> map){
+		return memberGradeMapper.updateUserLvl(map);
+	}
+	
+	
+	
 
 }