Browse Source

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

wanghui 8 years ago
parent
commit
9609753d3f

+ 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

+ 6 - 0
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -1,5 +1,9 @@
 package com.goafanti.activityUser.service;
 
+import java.util.List;
+
+import org.springframework.ui.ModelMap;
+
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
@@ -25,4 +29,6 @@ public interface ActivityUserService {
 
 	int batchDeleteByPrimaryKey(Long aid, String uid);
 
+	List<ModelMap> selectUserActivities();
+
 }

+ 7 - 0
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -2,10 +2,12 @@ package com.goafanti.activityUser.service.impl;
 
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.activityUser.service.ActivityUserService;
@@ -121,4 +123,9 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 		return activityUserMapper.selectByAidAndUid(aid, uid);
 	}
 
+	@Override
+	public List<ModelMap> selectUserActivities() {
+		return activityUserMapper.selectUserActivities(TokenManager.getUserId());
+	}
+
 }

+ 13 - 8
src/main/java/com/goafanti/common/dao/ActivityUserMapper.java

@@ -1,26 +1,31 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
+import org.springframework.ui.ModelMap;
 
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
 
 public interface ActivityUserMapper {
-    int deleteByPrimaryKey(ActivityUserKey key);
+	int deleteByPrimaryKey(ActivityUserKey key);
 
-    int insert(ActivityUser record);
+	int insert(ActivityUser record);
 
-    int insertSelective(ActivityUser record);
+	int insertSelective(ActivityUser record);
 
-    ActivityUser selectByPrimaryKey(ActivityUserKey key);
+	ActivityUser selectByPrimaryKey(ActivityUserKey key);
 
-    int updateByPrimaryKeySelective(ActivityUser record);
+	int updateByPrimaryKeySelective(ActivityUser record);
 
-    int updateByPrimaryKey(ActivityUser record);
+	int updateByPrimaryKey(ActivityUser record);
 
 	ActivityUser selectByUid(String uid);
 
-	int batchDeleteByPrimaryKey(@Param("aid")Long aid, @Param("uid")String uid);
+	int batchDeleteByPrimaryKey(@Param("aid") Long aid, @Param("uid") String uid);
+
+	ActivityUser selectByAidAndUid(@Param("aid") Long aid, @Param("uid") String uid);
 
-	ActivityUser selectByAidAndUid(@Param("aid")Long aid, @Param("uid")String uid);
+	List<ModelMap> selectUserActivities(@Param("uid") String uid);
 }

+ 15 - 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,18 @@ 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);
+	
+	int countMemberOrder();
+	
+	int addBasicsMemberOrder();
+	
+	int countMemberOrderWhere(Map<String, Object> map);
+	
+	
 	
 }

+ 8 - 1
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -210,11 +210,18 @@
       and uid = #{uid,jdbcType=VARCHAR}
   </delete>
   
-    <select id="selectByAidAndUid" resultMap="BaseResultMap" >
+  <select id="selectByAidAndUid" resultMap="BaseResultMap" >
     select 
     <include refid="Base_Column_List" />
     from activity_user
     where aid = #{aid,jdbcType=BIGINT}
       and uid = #{uid,jdbcType=VARCHAR}
   </select>
+  <select id="selectUserActivities" resultType="org.springframework.ui.ModelMap">
+	select au.aid as aid, au.uid as uid, a.name as name,a.start_time as startTime, a.end_time as endTime, a.enroll_deadline as enrollDeadline
+    from activity_user au
+    left join activity a on au.aid=a.id
+    where uid = #{uid,jdbcType=VARCHAR}
+    order by au.create_time desc
+  </select>
 </mapper>

+ 129 - 30
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -1,40 +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>
+
+
+
+
+	<!-- 查询所有 -->
 	<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="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
+		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=#{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>
+
+
+	<!-- 后台查询总记录 -->
+	<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
+		(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId},
+		#{paymentTime},#{paymentValue},#{paymentType},#{paymentId},#{validTime})
+	</insert>
+
+	<select id="countMemberOrder" resultType="int">
+		SELECT COUNT(*) FROM
+		member_order
+	</select>
+
+
+
+
 
 </mapper>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/UserInterestMapper.xml

@@ -92,6 +92,7 @@
 	SELECT
 			uii.username,
 			oi.unit_name AS unitName,
+			u.number,
 			u.type,
 			u.id AS uid,
 			ui.id AS interestId,
@@ -106,7 +107,7 @@
 		user_interest ui
 	LEFT JOIN user_identity uii ON uii.uid = ui.to_uid
 	LEFT JOIN organization_identity oi ON oi.uid = ui.to_uid
-	LEFT JOIN <![CDATA[user]]> u ON u.id = ui.to_uid
+	LEFT JOIN `user` u ON u.id = ui.to_uid
 	LEFT JOIN user_info uinfo ON uinfo.uid = ui.to_uid
 	LEFT JOIN organization_info oinfo ON oinfo.uid = ui.to_uid
 	LEFT JOIN achievement_demand_count adc ON adc.uid = ui.to_uid

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

@@ -755,6 +755,7 @@
   
   <select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
   	SELECT
+  		u.number,
 		ui.username,
 		ui.province,
 		ui.city,
@@ -767,7 +768,7 @@
 		info.life_photo_url AS lifePhotoUrl,
 		interest.id as interestId
 	FROM
-		<![CDATA[ user ]]> u
+	`user` u
 	LEFT JOIN user_identity ui ON ui.uid = u.id
 	LEFT JOIN user_career uc ON uc.uid = u.id
 	LEFT JOIN user_ability ua ON ua.uid = u.id
@@ -780,6 +781,7 @@
   
   <select id="findOrgPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
   	SELECT
+  		u.number,
 		oi.unit_name AS unitName,
 		oi.licence_province AS province,
 		oi.licence_city AS city,
@@ -792,7 +794,7 @@
 		ot.search_area_category as field, 
 		interest.id as interestId
 	FROM
-	<![CDATA[ user ]]> u
+	`user` u
 	LEFT JOIN organization_identity oi ON oi.uid = u.id
 	LEFT JOIN organization_info info ON info.uid = u.id
 	LEFT JOIN organization_tech ot ON ot.uid = u.id

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

@@ -2,161 +2,236 @@ 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;
-
-    /**
-    * 付费会员类型
-    */
-    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;
-
-    @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;
-    }
+	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;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getNickname() {
+		return nickname;
+	}
+
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+
+	public String getGradeName() {
+		return gradeName;
+	}
+
+	public void setGradeName(String gradeName) {
+		this.gradeName = gradeName;
+	}
+
+	@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 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.paymentTime == 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) {
+
+	}
+
 }

+ 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();

+ 43 - 1
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,12 +14,15 @@ 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.model.MemberOrder;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
 
 /**
  * 会员等级管理 后台
+ * 
  * @author Administrator
  *
  */
@@ -63,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);
 		}
@@ -82,4 +87,41 @@ public class MemberGradeController extends BaseApiController {
 		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 id, String mobile, String nickname,
+			Integer orderState, String startTime, String endTime) {
+		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", 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 countWhere = memberGradeService.countMemberOrderWhere(map);
+		Map<String, Object> maps = new HashMap<>();
+		maps.put("List", list);
+		maps.put("countWhere", countWhere);
+		maps.put("pNo", pNo);
+		return res().data(maps);
+	}
+
 }

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

@@ -1,17 +1,92 @@
 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.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.controller.BaseApiController;
+import com.goafanti.common.model.MemberOrder;
+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());
+		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("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){
+		MemberOrder mo = new MemberOrder();
+		mo.setId(Long.parseUnsignedLong(jDBCIdGenerator.generateId().toString()));
+		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.setUserId(TokenManager.getUserId());
+		return res().data(memberGradeService.addMemberOrder(mo));
+	}
+	
+	
+
+
 }

+ 35 - 18
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -1,45 +1,62 @@
 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
 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) {
+		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);
+	}
+
+	public int countMemberOrder() {
+		return memberGradeMapper.countMemberOrder();
+	}
+
+	public int addBasicsMemberOrder() {
+		return memberGradeMapper.addBasicsMemberOrder();
+	}
+
+	public int countMemberOrderWhere(Map<String, Object> map) {
+		return memberGradeMapper.countMemberOrderWhere(map);
+	}
+
 }

+ 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
  *
  */

+ 8 - 0
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -18,6 +18,7 @@ import com.goafanti.achievement.bo.InputAchievementOrder;
 import com.goafanti.achievement.service.AchievementOrderLogService;
 import com.goafanti.achievement.service.AchievementOrderService;
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.activityUser.service.ActivityUserService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
@@ -58,6 +59,13 @@ public class PortalOrderApiController extends CertifyApiController {
 	private AchievementOrderLogService	achievementOrderLogService;
 	@Resource
 	private AchievementOrderService		achievementOrderService;
+	@Resource
+	private ActivityUserService			activityUserService;
+
+	@RequestMapping(value = "/activity", method = RequestMethod.GET)
+	public Result getUserActivityList() {
+		return res().data(activityUserService.selectUserActivities());
+	}
 
 	/**
 	 * 科技成果Log

+ 10 - 0
src/main/java/com/goafanti/user/bo/InterestUserListBo.java

@@ -13,6 +13,8 @@ public class InterestUserListBo {
 
 	private String	username;
 
+	private Long	number;
+
 	private String	unitName;
 
 	private String	userProvince;
@@ -139,4 +141,12 @@ public class InterestUserListBo {
 
 	}
 
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
 }

+ 10 - 0
src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java

@@ -9,6 +9,8 @@ public class OrgPartnerDetailBo {
 
 	private Integer	area;
 
+	private Long	number;
+
 	private Integer	level;
 
 	private String	abilityLabel;
@@ -111,4 +113,12 @@ public class OrgPartnerDetailBo {
 		this.companyIntroduction = companyIntroduction;
 	}
 
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
 }

+ 10 - 0
src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

@@ -5,6 +5,8 @@ public class UserPartnerDetailBo {
 
 	private Integer	province;
 
+	private Long	number;
+
 	private Integer	city;
 
 	private Integer	area;
@@ -111,4 +113,12 @@ public class UserPartnerDetailBo {
 		this.lifePhotoUrl = lifePhotoUrl;
 	}
 
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
 }