Browse Source

会员订单更新

Administrator 8 years ago
parent
commit
619005b729

+ 10 - 0
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -1,7 +1,9 @@
 package com.goafanti.common.dao;
 
 import java.util.List;
+import java.util.Map;
 
+import com.goafanti.common.model.MemberOrder;
 import com.goafanti.memberGrade.bo.MemberGrade;
 
 public interface MemberGradeMapper {
@@ -14,5 +16,13 @@ public interface MemberGradeMapper {
 	
 	int addBusinessAndCost(MemberGrade me);
 	
+	List<MemberOrder> selectMemberOrder(Map<String, Object> map);
+	
+	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
+	
+	int addMemberOrder(MemberOrder mo);
+	
+	
+	
 	
 }

+ 41 - 0
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -1,6 +1,26 @@
 <?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>
+ 
+ 
+
  
   	<!-- 查询所有 -->
 	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
@@ -31,7 +51,28 @@
     </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 , 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}
+  	</select>
+  
   
+	<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>
   
   
   

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

@@ -2,8 +2,11 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
 
 public class MemberOrder {
     private Long id;
@@ -41,7 +44,7 @@ public class MemberOrder {
     /**
     * 支付时间
     */
-    private Date paymentTime;
+    private Date paymentTime;   
 
     /**
     * 实际支付金额
@@ -62,8 +65,20 @@ public class MemberOrder {
     * 有效时间
     */
     private Date validTime;
-
-    @JsonFormat(shape = Shape.STRING)
+    
+    
+    private String gradeName;
+    
+    
+    public String getGradeName() {
+		return gradeName;
+	}
+
+	public void setGradeName(String gradeName) {
+		this.gradeName = gradeName;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
     public Long getId() {
         return id;
     }
@@ -159,4 +174,57 @@ public class MemberOrder {
     public void setValidTime(Date validTime) {
         this.validTime = validTime;
     }
+    
+	
+	
+	//下单时间转换
+	public String getFormattedOrderTime() {
+		if (this.orderTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.orderTime, AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setFormattedOrderTime(String formattedOrderTime) {
+
+	}
+	
+	
+	//
+	public String getFormattedPaymentTime() {
+		if (this.orderTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.paymentTime, AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setFormattedPaymentTime(String formattedPaymentTime) {
+
+	}
+	
+	
+	 //
+		public String getFormattedValidTime() {
+			if (this.validTime == null) {
+				return null;
+			} else {
+				return DateFormatUtils.format(this.validTime, AFTConstants.YYYYMMDD);
+			}
+		}
+
+		public void setFormattedValidTime(String formattedValidTime) {
+
+		}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 }

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

@@ -1,7 +1,9 @@
 package com.goafanti.memberGrade.controller;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
@@ -81,5 +84,32 @@ 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){
+		Integer pNo = 1;
+		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<>();
+		map.put("pNos", pNos);
+		map.put("pSize", pSize);
+		return res().data(memberGradeService.selectMemberOrderBa(map));
+	}
+	
+	
 
 }

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

@@ -1,17 +1,98 @@
 package com.goafanti.memberGrade.controller;
 
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+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;
+import com.goafanti.memberGrade.service.MemberGradeService;
+
 /**
- * 会员  前台
+ * 会员 前台
+ * 
  * @author Administrator
  *
  */
 @RestController
 @RequestMapping(value = "/api/user/member")
-public class MemberGradeFrontController extends BaseApiController{
+public class MemberGradeFrontController extends BaseApiController {
+	@Autowired
+	private MemberGradeService	memberGradeService;
+	@Autowired
+	private JDBCIdGenerator		jDBCIdGenerator;
+
+	/**
+	 * 前台会员订单
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
+	public Result selectMemberOrder(String pageNo, String pageSize) {
+		Integer pNo = 1;
+		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<>();
+		map.put("pNos", pNos);
+		map.put("pSize", pSize);
+		map.put("id", TokenManager.getUserId());
+		return res().data(memberGradeService.selectMemberOrder(map));
+	}
+
+	/**
+	 * 生成会员订单
+	 * 
+	 * @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));
+	}
 
-	
 }

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

@@ -1,11 +1,13 @@
 package com.goafanti.memberGrade.service;
 
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.MemberGradeMapper;
+import com.goafanti.common.model.MemberOrder;
 import com.goafanti.memberGrade.bo.MemberGrade;
 
 @Service
@@ -38,6 +40,19 @@ public class MemberGradeService {
 		return memberGradeMapper.addBusinessAndCost(me);
 	}
 	
+	public List<MemberOrder> selectMemberOrder(Map<String,Object> map){
+		return memberGradeMapper.selectMemberOrder(map);
+	}
+			
+	public 	List<MemberOrder> selectMemberOrderBa(Map<String,Object> map) {
+		return memberGradeMapper.selectMemberOrderBa(map);
+	}	
+	
+	
+	public int  addMemberOrder(MemberOrder mo){
+		return memberGradeMapper.addMemberOrder(mo);
+	}
+	
 	
 	
 	

+ 1 - 1
src/main/java/com/goafanti/portal/controller/PortalMemberController.java

@@ -15,7 +15,7 @@ import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
 /**
- * 
+ * 不用登录查询
  * @author Administrator
  *
  */