anderx il y a 5 ans
Parent
commit
1fa15ec8b2

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

@@ -1,35 +0,0 @@
-package com.goafanti.common.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import com.goafanti.common.model.MemberOrder;
-import com.goafanti.member.bo.MemberGrade;
-
-public interface MemberGradeMapper {
-	List<MemberGrade> selectMemberGrade();
-
-	int delGrade(int id);
-
-	int selectRank(MemberGrade me);
-
-	int addGradeName(MemberGrade me);
-
-	int addBusinessAndCost(MemberGrade me);
-
-	List<MemberOrder> selectMemberOrder(Map<String, Object> map);
-
-	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
-
-	int countMemberOrder(String userId);
-
-	int addBasicsMemberOrder(MemberOrder mo);
-
-	int countMemberOrderWhere(Map<String, Object> map);
-
-	int updateMemberOrder(Map<String, Object> map);
-
-	int delMemberOrder(Map<String, Object> map);
-	
-	String selectMemberBusiness(int memberRank);
-}

+ 0 - 106
src/main/java/com/goafanti/common/dao/MemberOrderMapper.java

@@ -1,106 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.MemberOrder;
-import com.goafanti.common.model.MemberOrderExample;
-
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-public interface MemberOrderMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    long countByExample(MemberOrderExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int deleteByExample(MemberOrderExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int insert(MemberOrder record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int insertSelective(MemberOrder record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    List<MemberOrder> selectByExample(MemberOrderExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    MemberOrder selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int updateByExampleSelective(@Param("record") MemberOrder record, @Param("example") MemberOrderExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int updateByExample(@Param("record") MemberOrder record, @Param("example") MemberOrderExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int updateByPrimaryKeySelective(MemberOrder record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table member_order
-     *
-     * @mbg.generated Fri Nov 10 19:10:10 CST 2017
-     */
-    int updateByPrimaryKey(MemberOrder record);
-    
-    int updateUserLvl(Map<String, Object> params);
-    
-    int updateBatchUserLvl(Map<String, Object> params);
-
-	List<String> selectExpired();
-}

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

@@ -1,158 +0,0 @@
-<?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="grade_name" 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="memberGradeMap" type="com.goafanti.member.bo.MemberGrade">
-		<id column="id" property="id" />
-		<result column="grade_name" property="gradeName" />
-		<result column="business" property="business" />
-		<result column="cost" property="cost" />
-		<result column="member_rank" property="memberRank" />
-	</resultMap>
-
-
-
-	<!-- 查询所有 -->
-	<select id="selectMemberGrade" resultMap="memberGradeMap">
-		SELECT * FROM
-		member_grade;
-	</select>
-
-	<!-- 删除会员等级 -->
-	<delete id="delGrade" parameterType="int">
-		DELETE FROM member_grade
-		WHERE id=#{id}
-	</delete>
-
-	<!-- 新增会员等级是否存在 -->
-	<select id="selectRank" parameterType="com.goafanti.member.bo.MemberGrade"
-		resultType="int">
-		SELECT COUNT(*) FROM member_grade WHERE
-		member_rank=#{memberRank}
-	</select>
-
-
-	<!-- 新增会员等级 -->
-	<insert id="addGradeName" parameterType="com.goafanti.member.bo.MemberGrade"
-		useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO
-		member_grade(grade_name,member_rank) VALUES (#{gradeName},#{memberRank})
-	</insert>
-
-
-	<!-- 为等级添加业务和费用 -->
-	<update id="addBusinessAndCost" parameterType="com.goafanti.member.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.grade_name, 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.member_rank=mo.menber_type
-		WHERE user_id=#{id} and mo.order_state &lt; 9
-		LIMIT #{pNos},#{pSize}
-	</select>
-
-
-	<!-- 后台会员订单查询 -->
-	<select id="selectMemberOrderBa" parameterType="java.util.Map"
-		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.grade_name, 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.member_rank=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 = #{orderState}</if>
-		<if test="orderState==null">AND order_state &lt; 9</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 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 = #{orderState}</if>
-		<if test="orderState==null">AND order_state &lt; 9</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>
-
-	<select id="countMemberOrder" parameterType="String"  resultType="int">
-		SELECT COUNT(*) FROM
-		member_order
-		WHERE  user_id=#{userId} and order_state &lt; 9
-	</select>
-	
-	<select id="selectMemberBusiness" parameterType="int"  resultType="java.lang.String">
-		SELECT business FROM
-		member_grade
-		WHERE  member_rank=#{memberRank}
-	</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},
-		payment_id=#{paymentId} 
-		WHERE id=#{id}
-	</update>
-	
-	<!-- 后台订单软删除 -->
-	<update id="delMemberOrder">
-		UPDATE member_order SET order_state=9 
-		WHERE id=#{id} and order_state = 0
-		<if test="uid!=null">AND user_id = #{uid}</if>
-	</update>
-
-</mapper>

+ 0 - 428
src/main/java/com/goafanti/common/mapper/MemberOrderMapper.xml

@@ -1,428 +0,0 @@
-<?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.MemberOrderMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MemberOrder">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="menber_type" jdbcType="INTEGER" property="menberType" />
-    <result column="price" jdbcType="DOUBLE" property="price" />
-    <result column="valid_month" jdbcType="INTEGER" property="validMonth" />
-    <result column="order_state" jdbcType="INTEGER" property="orderState" />
-    <result column="order_time" jdbcType="TIMESTAMP" property="orderTime" />
-    <result column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
-    <result column="payment_value" jdbcType="DOUBLE" property="paymentValue" />
-    <result column="payment_type" jdbcType="VARCHAR" property="paymentType" />
-    <result column="payment_id" jdbcType="VARCHAR" property="paymentId" />
-    <result column="valid_time" jdbcType="TIMESTAMP" property="validTime" />
-    <result column="source_channel" jdbcType="INTEGER" property="sourceChannel" />
-    <result column="pay_state" jdbcType="INTEGER" property="payState" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    id, menber_type, price, valid_month, order_state, order_time, user_id, payment_time, 
-    payment_value, payment_type, payment_id, valid_time, source_channel, pay_state
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.MemberOrderExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from member_order
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from member_order
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    delete from member_order
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.MemberOrderExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    delete from member_order
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.MemberOrder">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    insert into member_order (id, menber_type, price, 
-      valid_month, order_state, order_time, 
-      user_id, payment_time, payment_value, 
-      payment_type, payment_id, valid_time, 
-      source_channel, pay_state)
-    values (#{id,jdbcType=BIGINT}, #{menberType,jdbcType=INTEGER}, #{price,jdbcType=DOUBLE}, 
-      #{validMonth,jdbcType=INTEGER}, #{orderState,jdbcType=INTEGER}, #{orderTime,jdbcType=TIMESTAMP}, 
-      #{userId,jdbcType=VARCHAR}, #{paymentTime,jdbcType=TIMESTAMP}, #{paymentValue,jdbcType=DOUBLE}, 
-      #{paymentType,jdbcType=VARCHAR}, #{paymentId,jdbcType=VARCHAR}, #{validTime,jdbcType=TIMESTAMP}, 
-      #{sourceChannel,jdbcType=INTEGER}, #{payState,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.MemberOrder">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    insert into member_order
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="menberType != null">
-        menber_type,
-      </if>
-      <if test="price != null">
-        price,
-      </if>
-      <if test="validMonth != null">
-        valid_month,
-      </if>
-      <if test="orderState != null">
-        order_state,
-      </if>
-      <if test="orderTime != null">
-        order_time,
-      </if>
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="paymentTime != null">
-        payment_time,
-      </if>
-      <if test="paymentValue != null">
-        payment_value,
-      </if>
-      <if test="paymentType != null">
-        payment_type,
-      </if>
-      <if test="paymentId != null">
-        payment_id,
-      </if>
-      <if test="validTime != null">
-        valid_time,
-      </if>
-      <if test="sourceChannel != null">
-        source_channel,
-      </if>
-      <if test="payState != null">
-        pay_state,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="menberType != null">
-        #{menberType,jdbcType=INTEGER},
-      </if>
-      <if test="price != null">
-        #{price,jdbcType=DOUBLE},
-      </if>
-      <if test="validMonth != null">
-        #{validMonth,jdbcType=INTEGER},
-      </if>
-      <if test="orderState != null">
-        #{orderState,jdbcType=INTEGER},
-      </if>
-      <if test="orderTime != null">
-        #{orderTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="userId != null">
-        #{userId,jdbcType=VARCHAR},
-      </if>
-      <if test="paymentTime != null">
-        #{paymentTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="paymentValue != null">
-        #{paymentValue,jdbcType=DOUBLE},
-      </if>
-      <if test="paymentType != null">
-        #{paymentType,jdbcType=VARCHAR},
-      </if>
-      <if test="paymentId != null">
-        #{paymentId,jdbcType=VARCHAR},
-      </if>
-      <if test="validTime != null">
-        #{validTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="sourceChannel != null">
-        #{sourceChannel,jdbcType=INTEGER},
-      </if>
-      <if test="payState != null">
-        #{payState,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.MemberOrderExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    select count(*) from member_order
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    update member_order
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.menberType != null">
-        menber_type = #{record.menberType,jdbcType=INTEGER},
-      </if>
-      <if test="record.price != null">
-        price = #{record.price,jdbcType=DOUBLE},
-      </if>
-      <if test="record.validMonth != null">
-        valid_month = #{record.validMonth,jdbcType=INTEGER},
-      </if>
-      <if test="record.orderState != null">
-        order_state = #{record.orderState,jdbcType=INTEGER},
-      </if>
-      <if test="record.orderTime != null">
-        order_time = #{record.orderTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.userId != null">
-        user_id = #{record.userId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.paymentTime != null">
-        payment_time = #{record.paymentTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.paymentValue != null">
-        payment_value = #{record.paymentValue,jdbcType=DOUBLE},
-      </if>
-      <if test="record.paymentType != null">
-        payment_type = #{record.paymentType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.paymentId != null">
-        payment_id = #{record.paymentId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.validTime != null">
-        valid_time = #{record.validTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.sourceChannel != null">
-        source_channel = #{record.sourceChannel,jdbcType=INTEGER},
-      </if>
-      <if test="record.payState != null">
-        pay_state = #{record.payState,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    update member_order
-    set id = #{record.id,jdbcType=BIGINT},
-      menber_type = #{record.menberType,jdbcType=INTEGER},
-      price = #{record.price,jdbcType=DOUBLE},
-      valid_month = #{record.validMonth,jdbcType=INTEGER},
-      order_state = #{record.orderState,jdbcType=INTEGER},
-      order_time = #{record.orderTime,jdbcType=TIMESTAMP},
-      user_id = #{record.userId,jdbcType=VARCHAR},
-      payment_time = #{record.paymentTime,jdbcType=TIMESTAMP},
-      payment_value = #{record.paymentValue,jdbcType=DOUBLE},
-      payment_type = #{record.paymentType,jdbcType=VARCHAR},
-      payment_id = #{record.paymentId,jdbcType=VARCHAR},
-      valid_time = #{record.validTime,jdbcType=TIMESTAMP},
-      source_channel = #{record.sourceChannel,jdbcType=INTEGER},
-      pay_state = #{record.payState,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MemberOrder">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    update member_order
-    <set>
-      <if test="menberType != null">
-        menber_type = #{menberType,jdbcType=INTEGER},
-      </if>
-      <if test="price != null">
-        price = #{price,jdbcType=DOUBLE},
-      </if>
-      <if test="validMonth != null">
-        valid_month = #{validMonth,jdbcType=INTEGER},
-      </if>
-      <if test="orderState != null">
-        order_state = #{orderState,jdbcType=INTEGER},
-      </if>
-      <if test="orderTime != null">
-        order_time = #{orderTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=VARCHAR},
-      </if>
-      <if test="paymentTime != null">
-        payment_time = #{paymentTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="paymentValue != null">
-        payment_value = #{paymentValue,jdbcType=DOUBLE},
-      </if>
-      <if test="paymentType != null">
-        payment_type = #{paymentType,jdbcType=VARCHAR},
-      </if>
-      <if test="paymentId != null">
-        payment_id = #{paymentId,jdbcType=VARCHAR},
-      </if>
-      <if test="validTime != null">
-        valid_time = #{validTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="sourceChannel != null">
-        source_channel = #{sourceChannel,jdbcType=INTEGER},
-      </if>
-      <if test="payState != null">
-        pay_state = #{payState,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MemberOrder">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 10 19:10:10 CST 2017.
-    -->
-    update member_order
-    set menber_type = #{menberType,jdbcType=INTEGER},
-      price = #{price,jdbcType=DOUBLE},
-      valid_month = #{validMonth,jdbcType=INTEGER},
-      order_state = #{orderState,jdbcType=INTEGER},
-      order_time = #{orderTime,jdbcType=TIMESTAMP},
-      user_id = #{userId,jdbcType=VARCHAR},
-      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
-      payment_value = #{paymentValue,jdbcType=DOUBLE},
-      payment_type = #{paymentType,jdbcType=VARCHAR},
-      payment_id = #{paymentId,jdbcType=VARCHAR},
-      valid_time = #{validTime,jdbcType=TIMESTAMP},
-      source_channel = #{sourceChannel,jdbcType=INTEGER},
-      pay_state = #{payState,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

+ 0 - 23
src/main/java/com/goafanti/common/mapper/MemberOrderMapperExt.xml

@@ -1,23 +0,0 @@
-<?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.MemberOrderMapper">
-	<!-- 更改用户会员等级 -->
-	<update id="updateUserLvl" parameterType="java.util.Map">
-		UPDATE user SET
-		lvl=#{lvl} WHERE id=#{userId}
-	</update>
-	
-	<update id="updateBatchUserLvl" parameterType="java.util.Map">
-	 	update user set lvl = #{lvl}
-	 	where id in 
-		<foreach item="item" collection="list" open="(" separator="," close=")">
-			#{item}
-		</foreach>
-	 </update>
-	
-	<select id="selectExpired" resultType="java.lang.String">
-		SELECT user_id FROM member_order 
-		where (order_state=1 or order_state=3) 
-		and valid_time &gt; CURDATE() and valid_time &lt; date_sub(CURDATE(),interval -1 day)  
-    </select>
-</mapper>

+ 0 - 26
src/main/java/com/goafanti/common/task/ExpiredUserMemberTask.java

@@ -1,26 +0,0 @@
-package com.goafanti.common.task;
-
-import javax.annotation.Resource;
-
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.member.service.MemberOrderService;
-
-@Component
-public class ExpiredUserMemberTask {
-
-	@Resource
-	MemberOrderService memberOrderService;
-
-	/**
-	 * "0 0 1 * * ?" 每天1点触发一次
-	 */
-	@Scheduled(cron = "0 0 1 * * ?")
-	public void exprireRun() {
-		LoggerUtils.debug(getClass(), "开始检查会员到期");
-		memberOrderService.updateExpiredUser();
-	}
-
-}

+ 0 - 43
src/main/java/com/goafanti/member/bo/BusinessType.java

@@ -1,43 +0,0 @@
-package com.goafanti.member.bo;
-
-/**
- * 增值服务枚举
- * 
- * @author Administrator
- *
- */
-public enum BusinessType {
-	TUI_SONG("1001", "科技成果,专家信息定点推送"), 
-	CHA_KAN_LIAN_XI("1002", "查看专家的联系方式"),
-	YE_WU_SHEN_QIN("1003",	"任何业务申请,付费业享受会员专属折扣"), 
-	JIN_JI_FU_WU("1004", "一对一的技术经纪人服务,进行技术成果媒合服务"),
-	KE_JI_ZHI_XUN("1005","一对一的科技咨询师服务"), 
-	ZHUAN_YU_GU_WEN("1006", "一对一的专业技术顾问,搜集技术情报,提供研发高参"),
-	XIAN_CHANG_PEI_XUN("1007","免费参加现场业务培训会"), 
-	KE_JI_WU_CHI("1008", "免前期费用做科技类扶持资金项目申报");
-
-	private String	key;
-	private String	desc;
-
-	private BusinessType(String key, String desc) {
-		this.key = key;
-		this.desc = desc;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-
-}

+ 0 - 59
src/main/java/com/goafanti/member/bo/MemberGrade.java

@@ -1,59 +0,0 @@
-package com.goafanti.member.bo;
-
-/**
- * 会员等级
- * @author Administrator
- *
- */
-public class MemberGrade {
-	private int id;
-	private String gradeName;
-	private String business;
-	private String cost;
-	private int memberRank;
-	
-	public MemberGrade() {
-	}
-	
-	public MemberGrade(int id, String gradeName, String business, String cost, int memberRank) {
-		this.id = id;
-		this.gradeName = gradeName;
-		this.business = business;
-		this.cost = cost;
-		this.memberRank = memberRank;
-	}
-	
-	public int getId() {
-		return id;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getGradeName() {
-		return gradeName;
-	}
-	public void setGradeName(String gradeName) {
-		this.gradeName = gradeName;
-	}
-	public String getBusiness() {
-		return business;
-	}
-	public void setBusiness(String business) {
-		this.business = business;
-	}
-	public String getCost() {
-		return cost;
-	}
-	public void setCost(String cost) {
-		this.cost = cost;
-	}
-	public int getMemberRank() {
-		return memberRank;
-	}
-	public void setMemberRank(int memberRank) {
-		this.memberRank = memberRank;
-	}
-	
-	
-	
-}

+ 0 - 68
src/main/java/com/goafanti/member/bo/MemberGradeBO.java

@@ -1,68 +0,0 @@
-package com.goafanti.member.bo;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class MemberGradeBO {
-
-	/**
-	 * 会员等级json格式 
-	 * 
-	 * @author Administrator
-	 *
-	 */
-	private int id;
-	private String gradeName;
-	private JSONObject business;
-	private JSONObject cost;
-	private int memberRank;
-	
-	
-	public MemberGradeBO() {
-	}
-	
-	public MemberGradeBO(int id, String gradeName, JSONObject business, JSONObject cost, int memberRank) {
-		super();
-		this.id = id;
-		this.gradeName = gradeName;
-		this.business = business;
-		this.cost = cost;
-		this.memberRank = memberRank;
-	}
-	
-	public int getId() {
-		return id;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getGradeName() {
-		return gradeName;
-	}
-	public void setGradeName(String gradeName) {
-		this.gradeName = gradeName;
-	}
-	public JSONObject getBusiness() {
-		return business;
-	}
-	public void setBusiness(JSONObject business) {
-		this.business = business;
-	}
-	public JSONObject getCost() {
-		return cost;
-	}
-	public void setCost(JSONObject cost) {
-		this.cost = cost;
-	}
-	public int getMemberRank() {
-		return memberRank;
-	}
-	public void setMemberRank(int memberRank) {
-		this.memberRank = memberRank;
-	}
-	
-	
-	
-	
-	
-
-}

+ 0 - 186
src/main/java/com/goafanti/member/controller/AdminMemberController.java

@@ -1,186 +0,0 @@
-package com.goafanti.member.controller;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-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;
-
-import com.alibaba.fastjson.JSON;
-import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.enums.OrderState;
-import com.goafanti.common.model.MemberOrder;
-import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.member.bo.MemberGrade;
-import com.goafanti.member.bo.MemberGradeBO;
-import com.goafanti.member.service.MemberGradeService;
-import com.goafanti.member.service.MemberOrderService;
-
-/**
- * 会员等级管理 后台
- * 
- * @author Administrator
- *
- */
-@RestController
-@RequestMapping(value = "/api/admin/member")
-public class AdminMemberController extends BaseApiController {
-	@Autowired
-	private MemberGradeService	memberGradeService;
-	@Autowired
-	private MemberOrderService	memberOrderService;
-
-	/**
-	 * 查询全部信息
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/selectMemberGrade", method = RequestMethod.GET)
-	public Result selectMemberGrade() {
-		List<MemberGrade> list = memberGradeService.selectMemberGrade();
-		List<MemberGradeBO> result = new ArrayList<>();
-		for (MemberGrade mg : list) {
-			result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
-					JSON.parseObject(mg.getCost()), mg.getMemberRank()));
-		}
-		return res().data(result);
-	}
-
-	/**
-	 * 删除会员等级
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/delGrade", method = RequestMethod.POST)
-	public Result delGrade(int id) {
-		return res().data(memberGradeService.delGrade(id));
-	}
-
-	/**
-	 * 新增会员等级名称
-	 * 
-	 * @param name
-	 * @return
-	 */
-	@RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
-	public Result addGradeName(MemberGrade me) {
-		if (memberGradeService.selectRank(me) >= 1) {
-			Error e = new Error();
-			e.setMessage("该会员等级已存在");
-			return res().error(e);
-		}
-		memberGradeService.addGradeName(me);
-		return res().data(me.getId());
-	}
-
-	/**
-	 * 增加业务及费用 与更改
-	 * 
-	 * @param me
-	 * @return
-	 */
-	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
-	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, Long id, String mobile, String nickname,
-			Integer orderState, String startTime, String endTime) {
-		Integer pNo = getPageNo(pageNo);
-		Integer pSize = getPageSize(pageSize);
-		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);
-		if (endTime != null) {
-			try {
-				map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
-			} catch (ParseException e) {
-				LoggerUtils.error(this.getClass(), "ffff", e);
-			}
-		}
-		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);
-	}
-
-	/**
-	 * 后台会员更改
-	 * 
-	 * @param id
-	 * @param memberRank
-	 * @param validMonth
-	 * @param paymentValue
-	 * @param orderState
-	 * @param paymentTime
-	 * @param paymentType
-	 * @return
-	 */
-	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
-	public Result updateMemberOrder(Long id, String memberRank, String validMonth, String paymentValue,
-			String orderState, String paymentTime, String paymentType, String userId, String paymentId) {
-		MemberOrder mo = memberOrderService.getById(id);
-		Assert.notNull(mo, "找不到订单");
-		mo.setOrderState(OrderState.getStatus(orderState).getCode());
-		try {
-			Integer month = Integer.parseInt(validMonth);
-			mo.setValidMonth(month);
-			mo.setMenberType(Integer.parseInt(memberRank));
-			if (OrderState.isPayed(OrderState.getStatus(mo.getOrderState()))) {
-				Assert.hasText(paymentId, "已支付订单信息不完整");
-				Assert.hasText(paymentType, "已支付订单信息不完整");
-				Assert.hasText(paymentTime, "已支付订单信息不完整");
-				mo.setPaymentId(paymentId);
-				mo.setPaymentType(paymentType);
-				mo.setPaymentValue(Double.parseDouble(paymentValue));
-				Date payTime = DateUtils.parseDate(paymentTime, AFTConstants.YYYYMMDDHHMMSS);
-				Date validTime = DateUtils.addMonths(payTime, month);
-				mo.setValidTime(validTime);
-				mo.setPaymentTime(payTime);
-			}
-		} catch (ParseException e) {
-			return res().error(buildError("", "参数错误"));
-		}
-		return res().data(memberOrderService.update(mo));
-	}
-
-	/**
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/delMemberOrder", method = RequestMethod.POST)
-	public Result delMemberOrder(Long id) {
-		return res().data(memberGradeService.delMemberOrder(id));
-	}
-
-}

+ 0 - 124
src/main/java/com/goafanti/member/controller/UserMemberController.java

@@ -1,124 +0,0 @@
-package com.goafanti.member.controller;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-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;
-
-import com.alibaba.fastjson.JSONObject;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.enums.OrderState;
-import com.goafanti.common.enums.UserLevel;
-import com.goafanti.common.model.MemberOrder;
-import com.goafanti.common.model.User;
-import com.goafanti.common.model.UserIdentity;
-import com.goafanti.core.mybatis.JDBCIdGenerator;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.member.bo.BusinessType;
-import com.goafanti.member.service.MemberGradeService;
-import com.goafanti.user.service.UserIdentityService;
-import com.goafanti.user.service.UserService;
-
-/**
- * 会员 前台
- * 
- * @author Administrator
- *
- */
-@RestController
-@RequestMapping(value = "/api/user/member")
-public class UserMemberController extends BaseApiController {
-	@Autowired
-	private MemberGradeService	memberGradeService;
-	@Autowired
-	private UserService			userService;
-	@Autowired
-	private UserIdentityService	userIdentityService;
-	@Autowired
-	private JDBCIdGenerator		jDBCIdGenerator;
-
-	/**
-	 * 前台会员订单
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
-	public Result selectMemberOrder(String pageNo, String pageSize) {
-		Integer pNo = getPageNo(pageNo);
-		Integer pSize = getPageSize(pageSize);
-		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> list = memberGradeService.selectMemberOrder(map);
-		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
-		Map<String, Object> maps = new HashMap<>();
-		maps.put("list", list);
-		maps.put("count", count);
-		maps.put("pNo", pNo);
-		return res().data(maps);
-	}
-
-	/**
-	 * 前台生成订单
-	 * 
-	 * @param menberType
-	 * @param price
-	 * @param validMonth
-	 * @return
-	 */
-	@RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.POST)
-	public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth) {
-		Assert.notNull(TokenManager.getUserToken(), "必须用户登录");
-		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
-		Assert.isTrue(u.getLvl() == 1, "必须为实名认证用户,已经是会员的无需重复申请");
-		MemberOrder mo = new MemberOrder();
-		mo.setId(jDBCIdGenerator.generateId());
-		mo.setMenberType(menberType);
-		mo.setPrice(Double.valueOf(price));
-		mo.setValidMonth(validMonth);
-		mo.setOrderState(OrderState.UNPAYED.getCode());
-		mo.setOrderTime(new Date());
-		mo.setUserId(u.getId());
-		return res().data(memberGradeService.addBasicsMemberOrder(mo));
-	}
-
-	/**
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/delMemberOrder", method = RequestMethod.POST)
-	public Result delMemberOrder(Long id) {
-		return res().data(memberGradeService.delMemberOrder(id));
-	}
-
-	/**
-	 * 获取专家联系手机
-	 */
-	@RequestMapping(value = "/contact", method = RequestMethod.GET)
-	public Result contact(String uid) {
-		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
-		Assert.isTrue(u != null && u.getLvl() > UserLevel.CERTIFIED.getCode(), "必须是登录实名用户");
-		Assert.hasText(uid, "找不到专家");
-		JSONObject business = memberGradeService.selectMemberBusiness(u.getLvl());
-		Assert.isTrue(String.valueOf(AFTConstants.YES).equals(business.get(BusinessType.CHA_KAN_LIAN_XI.getKey())), "该会员不能查看专家联系方式");
-		UserIdentity ui = userIdentityService.selectUserIdentityByUserId(uid);
-		if (ui != null && StringUtils.isNotBlank(ui.getContactMobile())) {
-			return res().data(ui.getContactMobile());
-		}
-		User expert = userService.selectByPrimaryKey(uid);
-		Assert.notNull(expert, "找不到专家");
-		return res().data(expert.getMobile());
-	}
-}

+ 0 - 76
src/main/java/com/goafanti/member/service/MemberGradeService.java

@@ -1,76 +0,0 @@
-package com.goafanti.member.service;
-
-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 com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.goafanti.common.dao.MemberGradeMapper;
-import com.goafanti.common.model.MemberOrder;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.member.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) {
-		return memberGradeMapper.selectRank(me);
-	}
-
-	public int addGradeName(MemberGrade me) {
-		return memberGradeMapper.addGradeName(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 countMemberOrder(String userId) {
-		return memberGradeMapper.countMemberOrder(userId);
-	}
-
-	public int addBasicsMemberOrder(MemberOrder mo) {
-		return memberGradeMapper.addBasicsMemberOrder(mo);
-	}
-
-	public int countMemberOrderWhere(Map<String, Object> map) {
-		return memberGradeMapper.countMemberOrderWhere(map);
-	}
-
-	public int delMemberOrder(Long id) {
-		Map<String, Object> map = new HashMap<>();
-		map.put("id", id);
-		if (TokenManager.getAdminToken() == null) {
-			map.put("uid", TokenManager.getUserId());
-		}
-		return memberGradeMapper.delMemberOrder(map);
-	}
-
-	public JSONObject selectMemberBusiness(int memberRank) {
-		String b = memberGradeMapper.selectMemberBusiness(memberRank);
-		return b == null ? null : JSON.parseObject(b);
-	}
-
-}

+ 0 - 42
src/main/java/com/goafanti/member/service/MemberOrderService.java

@@ -1,42 +0,0 @@
-package com.goafanti.member.service;
-
-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 com.goafanti.common.dao.MemberOrderMapper;
-import com.goafanti.common.enums.OrderState;
-import com.goafanti.common.model.MemberOrder;
-
-@Service
-public class MemberOrderService {
-	@Autowired
-	private MemberOrderMapper memberOrderMapper;
-
-	public MemberOrder getById(Long id) {
-		return memberOrderMapper.selectByPrimaryKey(id);
-	}
-
-	public int update(MemberOrder mo) {
-		if (OrderState.isPayed(OrderState.getStatus(mo.getOrderState()))) {
-			Map<String, Object> umap = new HashMap<>();
-			umap.put("lvl", mo.getMenberType());
-			umap.put("userId", mo.getUserId());
-			memberOrderMapper.updateUserLvl(umap);
-		}
-		return memberOrderMapper.updateByPrimaryKeySelective(mo);
-	}
-
-	public void updateExpiredUser() {
-		List<String> uids = memberOrderMapper.selectExpired();
-		if (!uids.isEmpty()) {
-			Map<String, Object> umap = new HashMap<>();
-			umap.put("lvl", 1);
-			umap.put("list", uids);
-			memberOrderMapper.updateBatchUserLvl(umap);
-		}
-	}
-}