Просмотр исходного кода

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

albertshaw лет назад: 8
Родитель
Сommit
8a5dd97095

+ 15 - 0
schema/20170901 -member_order.sql

@@ -0,0 +1,15 @@
+CREATE TABLE `member_order` (
+  `id` bigint(19) NOT NULL,
+  `menber_type` int(11) NOT NULL COMMENT '付费会员类型',
+  `price` double(10,2) NOT NULL COMMENT '价格',
+  `valid_month` int(11) NOT NULL COMMENT '会员月类型',
+  `order_state` int(11) NOT NULL COMMENT '付款状态  0:未付款 1:已付款',
+  `order_time` datetime NOT NULL COMMENT '下单时间',
+  `user_id` varchar(36) NOT NULL COMMENT '用户ID 外键',
+  `payment_time` datetime DEFAULT NULL COMMENT '支付时间',
+  `payment_value` double(10,2) DEFAULT NULL COMMENT '实际支付金额',
+  `payment_type` varchar(16) DEFAULT NULL COMMENT '支付方式',
+  `payment_id` varchar(45) DEFAULT NULL COMMENT '支付流水号',
+  `valid_time` datetime DEFAULT NULL COMMENT '有效时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8

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

@@ -24,9 +24,10 @@ public interface MemberGradeMapper {
 	
 	int countMemberOrder();
 	
-	
 	int addBasicsMemberOrder();
 	
+	int countMemberOrderWhere(Map<String, Object> map);
+	
 	
 	
 }

+ 122 - 82
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -1,99 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.MemberGradeMapper">
- 	
- 	
- <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="price" property="price" />
-    <result column="valid_month" property="validMonth" />
-    <result column="order_state" property="orderState" />
-    <result column="order_time" property="orderTime" />
-    <result column="user_id" property="userId" />
-    <result column="payment_time" property="paymentTime" />
-    <result column="payment_value" property="paymentValue" />
-    <result column="payment_type" property="paymentType" />
-    <result column="payment_id" property="paymentId" />
-    <result column="valid_time" property="validTime" />
- </resultMap>
- 
- 
-
- 
-  	<!-- 查询所有 -->
+
+
+	<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="price" property="price" />
+		<result column="valid_month" property="validMonth" />
+		<result column="order_state" property="orderState" />
+		<result column="order_time" property="orderTime" />
+		<result column="user_id" property="userId" />
+		<result column="payment_time" property="paymentTime" />
+		<result column="payment_value" property="paymentValue" />
+		<result column="payment_type" property="paymentType" />
+		<result column="payment_id" property="paymentId" />
+		<result column="valid_time" property="validTime" />
+	</resultMap>
+
+
+
+
+	<!-- 查询所有 -->
 	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
-		SELECT * FROM member_grade;
+		SELECT * FROM
+		member_grade;
 	</select>
-	 
+
 	<!-- 删除会员等级 -->
 	<delete id="delGrade" parameterType="int">
-		DELETE FROM member_grade WHERE id=#{id}
+		DELETE FROM member_grade
+		WHERE id=#{id}
 	</delete>
-  
-  	
-  	<!-- 新增会员等级是否存在 -->
-  	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade" resultType="int">
-  		SELECT COUNT(*) FROM member_grade WHERE memberRank=#{memberRank}
-  	</select>
-  	
-  
-  	<!-- 新增会员等级 -->
-	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade" useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
-	</insert> 
-  
-  
-  	<!-- 为等级添加业务和费用 -->
-    <update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
-    	UPDATE member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
-    </update>
-  
-  
-  	<!-- 前台会员订单查询 -->
-  	<select id="selectMemberOrder" parameterType="java.util.Map" 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
+
+
+	<!-- 新增会员等级是否存在 -->
+	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+		resultType="int">
+		SELECT COUNT(*) FROM member_grade WHERE
+		memberRank=#{memberRank}
+	</select>
+
+
+	<!-- 新增会员等级 -->
+	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO
+		member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
+	</insert>
+
+
+	<!-- 为等级添加业务和费用 -->
+	<update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
+		UPDATE
+		member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
+	</update>
+
+
+	<!-- 前台会员订单查询 -->
+	<select id="selectMemberOrder" parameterType="java.util.Map"
+		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
-		WHERE user_id=#{id} LIMIT #{pNos},#{pSize}
-  	</select>
-  	
-  	<!-- 后台会员订单查询 -->
-  	<select id="selectMemberOrderBa" parameterType="java.util.Map" resultMap="memberOrderMap">
-		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
+		WHERE user_id=#{id}
+		LIMIT #{pNos},#{pSize}
+	</select>
+
+
+	<!-- 后台会员订单查询 -->
+	<select id="selectMemberOrderBa" parameterType="java.util.Map"
+		resultMap="memberOrderMap">
+		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
-		LEFT JOIN user u ON u.id=mo.user_id
+		LEFT JOIN user u ON
+		u.id=mo.user_id
+		WHERE 1=1
+		<if test="id!=null">AND mo.id=#{id}</if>
+		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+		<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>
 		LIMIT #{pNos},#{pSize}
-  	</select>
-  
-  
-  
-  	
-  	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
-  		INSERT INTO member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
+	</select>
+
+
+	<!-- 后台查询总记录 -->
+	<select id="countMemberOrderWhere" parameterType="java.util.Map"
+		resultType="int">
+		SELECT COUNT(*) FROM member_order mo
+		LEFT JOIN member_grade mg ON
+		mg.id=mo.menber_Type
+		LEFT JOIN user u ON u.id=mo.user_id
+		WHERE 1=1
+		<if test="id!=null">AND mo.id LIKE CONCAT('%',#{id},'%')</if>
+		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+		<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>
+	</select>
+
+
+	<!-- 前台生成订单 -->
+	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
+		INSERT INTO
+		member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
 		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
-  	</insert>
-  	
-  	
-  	
-  	
-  
-  
-  
-	<insert id="addMemberOrder" parameterType="com.goafanti.common.model.MemberOrder" >
-		INSERT INTO member_order VALUES
+	</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>
-  	
-  	
-  	
-  
+
+	<select id="countMemberOrder" resultType="int">
+		SELECT COUNT(*) FROM
+		member_order
+	</select>
+
+
+
+
 
 </mapper>

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

@@ -9,74 +9,72 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class MemberOrder {
-    private Long id;
-
-    /**
-    * 付费会员类型
-    */
-    private Integer menberType;
-
-    /**
-    * 价格
-    */
-    private Double price;
-
-    /**
-    * 会员月类型
-    */
-    private Integer validMonth;
-
-    /**
-    * 付款状态  0:未付款 1:已付款
-    */
-    private Integer orderState;
-
-    /**
-    * 下单时间
-    */
-    private Date orderTime;
-
-    /**
-    * 用户ID 外键
-    */
-    private String userId;
-
-    /**
-    * 支付时间
-    */
-    private Date paymentTime;   
-
-    /**
-    * 实际支付金额
-    */
-    private Double paymentValue;
-
-    /**
-    * 支付方式
-    */
-    private String paymentType;
-
-    /**
-    * 支付流水号
-    */
-    private String paymentId;
-
-    /**
-    * 有效时间
-    */
-    private Date validTime;
-    
-    //会员类型名称
-    private String gradeName;
-    
-    //手机登录号
-    private String mobile;
-    //昵称
-    private String nickname;
-    
-    
-    
-    public String getMobile() {
+	private Long	id;
+
+	/**
+	 * 付费会员类型
+	 */
+	private Integer	menberType;
+
+	/**
+	 * 价格
+	 */
+	private Double	price;
+
+	/**
+	 * 会员月类型
+	 */
+	private Integer	validMonth;
+
+	/**
+	 * 付款状态 0:未付款 1:已付款
+	 */
+	private Integer	orderState;
+
+	/**
+	 * 下单时间
+	 */
+	private Date	orderTime;
+
+	/**
+	 * 用户ID 外键
+	 */
+	private String	userId;
+
+	/**
+	 * 支付时间
+	 */
+	private Date	paymentTime;
+
+	/**
+	 * 实际支付金额
+	 */
+	private Double	paymentValue;
+
+	/**
+	 * 支付方式
+	 */
+	private String	paymentType;
+
+	/**
+	 * 支付流水号
+	 */
+	private String	paymentId;
+
+	/**
+	 * 有效时间
+	 */
+	private Date	validTime;
+
+	// 会员类型名称
+	private String	gradeName;
+
+	// 手机登录号
+	private String	mobile;
+	// 昵称
+	private String	nickname;
+
+	public String getMobile() {
 		return mobile;
 	}
 
@@ -101,105 +99,103 @@ public class MemberOrder {
 	}
 
 	@JsonFormat(shape = Shape.STRING)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getMenberType() {
-        return menberType;
-    }
-
-    public void setMenberType(Integer menberType) {
-        this.menberType = menberType;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public Integer getValidMonth() {
-        return validMonth;
-    }
-
-    public void setValidMonth(Integer validMonth) {
-        this.validMonth = validMonth;
-    }
-
-    public Integer getOrderState() {
-        return orderState;
-    }
-
-    public void setOrderState(Integer orderState) {
-        this.orderState = orderState;
-    }
-
-    public Date getOrderTime() {
-        return orderTime;
-    }
-
-    public void setOrderTime(Date orderTime) {
-        this.orderTime = orderTime;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public Date getPaymentTime() {
-        return paymentTime;
-    }
-
-    public void setPaymentTime(Date paymentTime) {
-        this.paymentTime = paymentTime;
-    }
-
-    public Double getPaymentValue() {
-        return paymentValue;
-    }
-
-    public void setPaymentValue(Double paymentValue) {
-        this.paymentValue = paymentValue;
-    }
-
-    public String getPaymentType() {
-        return paymentType;
-    }
-
-    public void setPaymentType(String paymentType) {
-        this.paymentType = paymentType;
-    }
-
-    public String getPaymentId() {
-        return paymentId;
-    }
-
-    public void setPaymentId(String paymentId) {
-        this.paymentId = paymentId;
-    }
-
-    public Date getValidTime() {
-        return validTime;
-    }
-
-    public void setValidTime(Date validTime) {
-        this.validTime = validTime;
-    }
-    
-	
-	
-	//下单时间转换
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getMenberType() {
+		return menberType;
+	}
+
+	public void setMenberType(Integer menberType) {
+		this.menberType = menberType;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Integer getValidMonth() {
+		return validMonth;
+	}
+
+	public void setValidMonth(Integer validMonth) {
+		this.validMonth = validMonth;
+	}
+
+	public Integer getOrderState() {
+		return orderState;
+	}
+
+	public void setOrderState(Integer orderState) {
+		this.orderState = orderState;
+	}
+
+	public Date getOrderTime() {
+		return orderTime;
+	}
+
+	public void setOrderTime(Date orderTime) {
+		this.orderTime = orderTime;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public Date getPaymentTime() {
+		return paymentTime;
+	}
+
+	public void setPaymentTime(Date paymentTime) {
+		this.paymentTime = paymentTime;
+	}
+
+	public Double getPaymentValue() {
+		return paymentValue;
+	}
+
+	public void setPaymentValue(Double paymentValue) {
+		this.paymentValue = paymentValue;
+	}
+
+	public String getPaymentType() {
+		return paymentType;
+	}
+
+	public void setPaymentType(String paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	public String getPaymentId() {
+		return paymentId;
+	}
+
+	public void setPaymentId(String paymentId) {
+		this.paymentId = paymentId;
+	}
+
+	public Date getValidTime() {
+		return validTime;
+	}
+
+	public void setValidTime(Date validTime) {
+		this.validTime = validTime;
+	}
+
+	// 下单时间转换
 	public String getFormattedOrderTime() {
 		if (this.orderTime == null) {
 			return null;
@@ -211,11 +207,10 @@ public class MemberOrder {
 	public void setFormattedOrderTime(String formattedOrderTime) {
 
 	}
-	
-	
+
 	//
 	public String getFormattedPaymentTime() {
-		if (this.orderTime == null) {
+		if (this.paymentTime == null) {
 			return null;
 		} else {
 			return DateFormatUtils.format(this.paymentTime, AFTConstants.YYYYMMDD);
@@ -225,28 +220,18 @@ public class MemberOrder {
 	public void setFormattedPaymentTime(String formattedPaymentTime) {
 
 	}
-	
-	
-	 //
-		public String getFormattedValidTime() {
-			if (this.validTime == null) {
-				return null;
-			} else {
-				return DateFormatUtils.format(this.validTime, AFTConstants.YYYYMMDD);
-			}
+
+	//
+	public String getFormattedValidTime() {
+		if (this.validTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.validTime, AFTConstants.YYYYMMDD);
 		}
+	}
 
-		public void setFormattedValidTime(String formattedValidTime) {
+	public void setFormattedValidTime(String formattedValidTime) {
+
+	}
 
-		}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 }

+ 1 - 1
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -18,7 +18,7 @@ public class TokenManager {
 	/**
 	 * 获取当前登录的用户User对象
 	 * 
-	 * @return
+	 * @return
 	 */
 	public static AftUser getToken() {
 		return (AftUser) SecurityUtils.getSubject().getPrincipal();

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

@@ -22,6 +22,7 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 
 /**
  * 会员等级管理 后台
+ * 
  * @author Administrator
  *
  */
@@ -67,7 +68,7 @@ public class MemberGradeController extends BaseApiController {
 	@RequestMapping(value = "/addGradeName", method = RequestMethod.GET)
 	public Result addGradeName(MemberGrade me) {
 		if (memberGradeService.selectRank(me) >= 1) {
-			Error e=new Error();
+			Error e = new Error();
 			e.setMessage("该会员等级已存在");
 			return res().error(e);
 		}
@@ -85,40 +86,42 @@ public class MemberGradeController extends BaseApiController {
 	public Result addBusinessAndCost(MemberGrade me) {
 		return res().data(memberGradeService.addBusinessAndCost(me));
 	}
-	
-	
-	
 
-	
 	/**
-	 * 后台会员订单列表单
+	 * 后台会员订单列表单
+	 * 
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
 	 */
-	@RequestMapping(value="/selectMemberOrderBa", method=RequestMethod.GET)
-	public Result selectMemberOrderBa(String pageNo,String pageSize){
+	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
+	public Result selectMemberOrderBa(String pageNo, String pageSize, Integer id, String mobile, String nickname,
+			Integer orderState, String startTime, String endTime) {
 		Integer pNo = 1;
-		Integer pSize =10;
+		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 		}
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		Integer pNos=(pNo-1)*pSize;
-		Map<String,Object> map=new HashMap<>();
+		Integer pNos = (pNo - 1) * pSize;
+		Map<String, Object> map = new HashMap<>();
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
+		map.put("id", id);
+		map.put("mobile", mobile);
+		map.put("nickname", nickname);
+		map.put("orderState", orderState);
+		map.put("startTimes", startTime);
+		map.put("endTimes", endTime);
 		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
-		int count=memberGradeService.countMemberOrder();
-		Map<String,Object> maps=new HashMap<>();
+		int countWhere = memberGradeService.countMemberOrderWhere(map);
+		Map<String, Object> maps = new HashMap<>();
 		maps.put("List", list);
-		maps.put("count", count);
+		maps.put("countWhere", countWhere);
 		maps.put("pNo", pNo);
 		return res().data(maps);
 	}
-	
-	
 
 }

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

@@ -1,6 +1,5 @@
 package com.goafanti.memberGrade.controller;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,10 +12,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.MemberOrder;
-import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -68,7 +65,10 @@ public class MemberGradeFrontController extends BaseApiController {
 	
 	
 	/**
-	 * 
+	 * 前台生成订单 
+	 * @param menberType
+	 * @param price
+	 * @param validMonth
 	 * @return
 	 */
 	@RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.GET)
@@ -79,7 +79,7 @@ public class MemberGradeFrontController extends BaseApiController {
 		mo.setPrice(Double.valueOf(price));
 		mo.setValidMonth(validMonth);
 		Date now = new Date();
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
 		mo.setOrderState(0);
 		mo.setOrderTime(now);
 		mo.setUserId(TokenManager.getUserId());
@@ -87,47 +87,6 @@ public class MemberGradeFrontController extends BaseApiController {
 	}
 	
 	
-	
 
-	
-
-	/**
-	 * 生成会员订单
-	 * 
-	 * @param mo
-	 * @return
-	 */
-	@RequestMapping(value = "/addMemberOrder", method = RequestMethod.GET)
-	public Result addMemberOrder(Integer menberType, Double price, Integer validMonth, Integer orderState,
-			String orderTime, String paymentTime, Double paymentValue, String paymentType, String paymentId,
-			String validTime) {
-		MemberOrder mo = new MemberOrder();
-		mo.setId(Long.parseUnsignedLong(jDBCIdGenerator.generateId().toString()));
-		mo.setMenberType(menberType);
-		mo.setPrice(price);
-		mo.setValidMonth(validMonth);
-		mo.setOrderState(orderState);
-		try {
-			mo.setOrderTime(DateUtils.parseDate(orderTime, AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-		}
-		mo.setUserId(TokenManager.getUserId());
-		try {
-			mo.setPaymentTime(DateUtils.parseDate(paymentTime, AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		mo.setPaymentValue(paymentValue);
-		mo.setPaymentType(paymentType);
-		mo.setPaymentId(paymentId);
-		try {
-			mo.setValidTime(DateUtils.parseDate(validTime, AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return res().data(memberGradeService.addMemberOrder(mo));
-	}
 
 }

+ 24 - 28
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -14,53 +14,49 @@ import com.goafanti.memberGrade.bo.MemberGrade;
 public class MemberGradeService {
 	@Autowired
 	private MemberGradeMapper memberGradeMapper;
-	
-	
+
 	public List<MemberGrade> selectMemberGrade() {
 		return memberGradeMapper.selectMemberGrade();
 	}
-	
+
 	public int delGrade(int id) {
 		return memberGradeMapper.delGrade(id);
-	} 
-	
-	
-	
-	public int selectRank(MemberGrade me){
+	}
+
+	public int selectRank(MemberGrade me) {
 		return memberGradeMapper.selectRank(me);
 	}
-	
-	
+
 	public int addGradeName(MemberGrade me) {
 		return memberGradeMapper.addGradeName(me);
 	}
-	
-	
-	public int addBusinessAndCost(MemberGrade me){
+
+	public int addBusinessAndCost(MemberGrade me) {
 		return memberGradeMapper.addBusinessAndCost(me);
 	}
-	
-	public List<MemberOrder> selectMemberOrder(Map<String,Object> map){
+
+	public List<MemberOrder> selectMemberOrder(Map<String, Object> map) {
 		return memberGradeMapper.selectMemberOrder(map);
 	}
-			
-	public 	List<MemberOrder> selectMemberOrderBa(Map<String,Object> map) {
+
+	public List<MemberOrder> selectMemberOrderBa(Map<String, Object> map) {
 		return memberGradeMapper.selectMemberOrderBa(map);
-	}	
-	
-	
-	public int  addMemberOrder(MemberOrder mo){
+	}
+
+	public int addMemberOrder(MemberOrder mo) {
 		return memberGradeMapper.addMemberOrder(mo);
 	}
-	
-	public int countMemberOrder(){
+
+	public int countMemberOrder() {
 		return memberGradeMapper.countMemberOrder();
 	}
-	
-	public int addBasicsMemberOrder(){
+
+	public int addBasicsMemberOrder() {
 		return memberGradeMapper.addBasicsMemberOrder();
 	}
-	
-	
-	
+
+	public int countMemberOrderWhere(Map<String, Object> map) {
+		return memberGradeMapper.countMemberOrderWhere(map);
+	}
+
 }