修改积分接口

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/MemberIntegral.java

@@ -21,6 +21,16 @@ public class MemberIntegral implements Serializable {
     private Date memberCreateTime;          //创建时间
     private Date memberUpdateTime;          //更新时间
 
+    private String rankRuleName;            //会员等级名称
+
+    public String getRankRuleName() {
+        return rankRuleName;
+    }
+
+    public void setRankRuleName(String rankRuleName) {
+        this.rankRuleName = rankRuleName;
+    }
+
     public Integer getMemberId() {
         return memberId;
     }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -1,5 +1,9 @@
 package com.iamberry.wechat.core.entity.integral;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import javax.xml.crypto.Data;
 import java.io.Serializable;
 
@@ -14,25 +18,29 @@ public class UseIntegral implements Serializable {
     private Integer useType;                //积分类型
     private Integer useIntegralType;        //使用积分类型
     private Integer useIntegralNumber;      //使用积分数量
-    private Integer useConfigId;             //积分来源类型
+    private Integer useConfigId;            //积分来源类型
     private String useIntegralRemarks;      //备注
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Data useIntegralCreateTime;     //创建时间
 
-    public UseIntegral() {
+    private String integralConfigName;      //来源名称
+    private PageBean page;                  //分页
+
+    public PageBean getPage() {
+        return page;
     }
 
-    public UseIntegral(Integer useIntegralId, String userOpenId,
-                       Integer useType, Integer useIntegralType,
-                       Integer useIntegralNumber, Integer useConfigId,
-                       String useIntegralRemarks, Data useIntegralCreateTime) {
-        this.useIntegralId = useIntegralId;
-        this.userOpenId = userOpenId;
-        this.useType = useType;
-        this.useIntegralType = useIntegralType;
-        this.useIntegralNumber = useIntegralNumber;
-        this.useConfigId = useConfigId;
-        this.useIntegralRemarks = useIntegralRemarks;
-        this.useIntegralCreateTime = useIntegralCreateTime;
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
+
+    public String getIntegralConfigName() {
+        return integralConfigName;
+    }
+
+    public void setIntegralConfigName(String integralConfigName) {
+        this.integralConfigName = integralConfigName;
     }
 
     public Integer getUseIntegralId() {

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/CouponItemService.java

@@ -60,4 +60,11 @@ public interface CouponItemService {
 	 * @author liuzhiwei
 	 */
 	public Integer updateCouponItemList(List<CouponItem> couponItemList);
+
+	/**
+	 * 查询待用的优惠卷
+	 * @param openid
+	 * @return
+	 */
+	List<CouponItem> getStandByCoupon(String openid );
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -1,24 +1,34 @@
 package com.iamberry.wechat.face.integral;
 
+import com.iamberry.wechat.core.entity.PageBean;
+import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.integral.IntegralConfig;
+import com.iamberry.wechat.core.entity.integral.MemberIntegral;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 
 import java.util.List;
 
 public interface UseIntegralService {
     /**
-     * 积分使用日志
-     * @param openid
+     * 全部积分记录
+     * @param useIntegral
+     * @return
+     */
+    List<UseIntegral> listIntegralInfo(UseIntegral useIntegral);
+
+    /**
+     * 获得的总积分数
+     * @param userOpenId
      * @return
      */
-    List<UseIntegral> getUseIntegral(String openid);
+    int getGainIntegralCount(String userOpenId);
 
     /**
-     * 总积分（使用）
+     * 使用的总积分数
      * @param openid
      * @return
      */
-    int allUseIntegral(String openid);
+    int getUseIntegralCount(String openid);
 
     /**
      * 查询积分来源信息
@@ -26,4 +36,11 @@ public interface UseIntegralService {
      * @return
      */
     List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig);
+
+    /**
+     * 获取会员信息.会员等级名称
+     * @param openId
+     * @return
+     */
+    MemberIntegral getMemberInfoAndRankName(String openId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/coupon/CouponItemServiceImpl.java

@@ -57,4 +57,13 @@ public class CouponItemServiceImpl implements CouponItemService {
 		// TODO Auto-generated method stub
 		return couponItemMapper.updateCouponItemList(couponItemList);
 	}
+	/**
+	 * 查询待用的优惠卷
+	 * @param openid
+	 * @return
+	 */
+	@Override
+	public List<CouponItem> getStandByCoupon(String openid) {
+		return couponItemMapper.getStandByCoupon(openid);
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/CouponItemMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 优惠券详情 mapper
@@ -60,4 +61,18 @@ public interface CouponItemMapper {
 	 * @author liuzhiwei
 	 */
 	public Integer updateCouponItemList(List<CouponItem> couponItemList);
+
+	/**
+	 * 查询待用的优惠卷
+	 * @param openid
+	 * @return
+	 */
+	List<CouponItem> getStandByCoupon(String openid );
+
+	/**
+	 * 查询已使用的优惠卷
+	 * @param openid
+	 * @return
+	 */
+	List<CouponItem> getUseCoupon(String openid);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/MemberMapper.java

@@ -124,7 +124,7 @@ public interface MemberMapper {
 
 
 	/**
-	 * 获取我的会员信息
+	 * 获取个人信息
 	 * @return
 	 */
 	Member getMyMemberInfo(String userOpenid);

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/UseIntegralMapper.java

@@ -1,32 +1,34 @@
 package com.iamberry.wechat.service.mapper;
 
+import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.integral.IntegralConfig;
+import com.iamberry.wechat.core.entity.integral.MemberIntegral;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 public interface UseIntegralMapper {
     /**
-     * 获得积分的日志
-     * @param userOpenId
+     * 全部积分记录
+     * @param useIntegral
      * @return
-             */
-    List<UseIntegral> getGainIntegral(String userOpenId);
-
+     */
+    List<UseIntegral> listIntegralInfo(UseIntegral useIntegral);
     /**
      * 获得的总积分数
      * @param userOpenId
      * @return
      */
-    int allGainIntegral(String userOpenId);
+    int getGainIntegralCount(String userOpenId);
 
     /**
      * 使用的总积分数
-     * @param userOpenId
+     * @param openid
      * @return
      */
-    int allUseIntegral(String openid);
+    int getUseIntegralCount(String openid);
 
     /**
      * 查询积分来源信息
@@ -34,12 +36,12 @@ public interface UseIntegralMapper {
      * @return
      */
     List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig);
-    int allUseIntegral(String userOpenId);
 
     /**
-     * 全部的积分日志
-     * @param userOpenId
+     * 获取会员信息.会员等级名称
+     * @param openId
      * @return
      */
-    List<UseIntegral> getAllIntegral(String userOpenId);
+    MemberIntegral getMemberInfoAndRankName(String openId);
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

@@ -14,7 +14,9 @@
 		CI.COUPON_USE_STATUS couponUseStatus,
 		CI.COUPON_USE_DATE couponUseDate,
 		CI.COUPON_ITEM_REMARK couponItemRemark,
-		
+
+		CI.ITEM_CURRENT_USER_OPENID itemCurrentUserOpenid,
+		CT.COU coupon_is_give
 		CT.COUPON_NAME couponName,
  		CT.COUPON_REDUCE couponReduce,
  		CT.COUPON_CONSUME_ENOUGH couponConsumeEnough
@@ -78,8 +80,27 @@
 			</if>
 		</where>
  	</select>
- 	
- 	
+
+	<!--查询待用的优惠卷-->
+ 	<select id="getStandByCoupon" resultType="CouponItem">
+		SELECT CT.COUPON_NAME,CI.COUPON_USE_END_DATE ,CI.COUPON_RECEIVE_DATE
+		FROM TB_IAMBERRY_COUPON_ITEM CI JOIN TB_IAMBERRY_COUPON_TYPE CT
+ 		ON CI.COUPON_ID=CT.COUPON_ID
+ 		WHERE CI.ITEM_CURRENT_USER_OPENID=#{openid} AND CI.COUPON_USE_STATUS=1
+ 		ORDER BY CI.COUPON_ITEM_ID
+	</select>
+
+	<!--查询已使用的优惠卷-->
+	<select id="getUseCoupon" resultType="CouponItem">
+		SELECT CT.COUPON_NAME,CI.COUPON_USE_END_DATE ,CI.COUPON_RECEIVE_DATE
+		FROM TB_IAMBERRY_COUPON_ITEM CI JOIN TB_IAMBERRY_COUPON_TYPE CT
+ 		ON CI.COUPON_ID=CT.COUPON_ID
+ 		WHERE CI.ITEM_CURRENT_USER_OPENID=#{openid} AND CI.COUPON_USE_STATUS=2
+ 		ORDER BY CI.COUPON_ITEM_ID
+	</select>
+
+	<!--查询全部的优惠券-->
+
  	<!-- 添加一张优惠券 -->
  	<insert id="insertCouponItem" parameterType="CouponItem"
  		useGeneratedKeys="true" keyProperty="couponItemId">

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/memberMapper.xml

@@ -37,8 +37,7 @@
 		user_email userEmail,
 		user_qrcode_type userQrcodeType
 	</sql>
-
-	<!-- 获取个人会员信息-->
+	<!-- 获取个人信息-->
 	<select id="getMyMemberInfo"  parameterType="String" resultType="Member" >
 		SELECT user_name,
 		user_sex,

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.iamberry.wechat.service.mapper.UseIntegralMapper">
-    <sql id="AllField">
+    <sql id="AllUseField">
         use_integral_id useIntegralId,
         user_openid userOpenId,
         use_integral_type useIntegralType,
@@ -12,38 +12,52 @@
         use_integral_remarks useIntegralRemarks,
         use_integral_create_time useIntegralCreateTime
     </sql>
-    <!--获得积分的日志-->
-    <select id="getGainIntegral" parameterType="String" resultType="UseIntegral">
-        SELECT use_config_id,use_integral_remarks,use_integral_create_time
-        FROM tb_iamberry_use_integral
-        WHERE user_openid=#{userOpenid} AND use_type=1
-        ORDER BY use_integral_id DESC
+    <!--全部积分记录-->
+    <select id="listIntegralInfo" resultType="UseIntegral" parameterType="UseIntegral">
+        SELECT
+          i.*,
+          c.integral_config_name integralConfigName
+        FROM
+          tb_iamberry_use_integral i
+        LEFT JOIN tb_iamberry_integral_config c ON i.use_config_id = c.integral_config_id
+        <where>
+            <if test="openid!=null">
+                user_openid=#{openid}
+            </if>
+            <if test="useType != null">
+               AND use_type = #{useType}
+            </if>
+        </where>
+        ORDER BY ORDER BY UI.use_integral_id DESC
+        <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
+            limit ${page.recordBegin},${page.pageSize}
+        </if>
+        <if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
+            limit ${page.pageSize}
+        </if>
     </select>
+
     <!--获得的总积分数-->
-    <select id="allGainIntegral" parameterType="String" resultType="int">
+    <select id="getGainIntegralCount" parameterType="String" resultType="int">
         SELECT avg(use_integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND use_type=1
     </select>
     <!--使用的总积分数-->
-    <select id="allUseIntegral" parameterType="String" resultType="int">
+    <select id="getUseIntegralCount" parameterType="String" resultType="int">
         SELECT avg(use_integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND use_type=2
     </select>
-    <!--全部的积分日志-->
-    <select id="getAllIntegral" parameterType="String" resultType="UseIntegral">
-        SELECT use_integral_type,
-                use_integral_number,
-                use_type,
-                use_config_id,
-                use_integral_remarks,
-                use_integral_create_time
-        FROM tb_iamberry_use_integral
-        WHERE user_openid=#{userOpenid}
-        ORDER BY use_integral_id DESC
-    </select>
 
+    <!--查询会员信息和会员等级名称-->
+    <select id="getMemberInfoAndRankName" parameterType="String" resultType="MemberIntegral">
+        SELECT m.*,r.rank_rule_name rankRuleName
+        FROM tb_iamberry_member_integral m
+        LEFT JOIN tb_iamberry_rank_rule r
+        ON m.rank_rule_id=r.rank_rule_id
+        WHERE m.user_openid=#{openId}
+    </select>
     <!-- 查询积分来源信息 -->
     <select id="listIntegralConfig" parameterType="IntegralConfig" resultType="IntegralConfig">
         SELECT

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java

@@ -5,7 +5,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.iamberry.wechat.core.entity.integral.MemberIntegral;
 import com.iamberry.wechat.core.entity.machineNumber.MachineNumber;
+import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.face.machineNumber.MachineNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -49,7 +51,7 @@ public class AgentHandler {
 	private MQServiceProxy mQservice;
 	@Autowired
 	private MachineNumberService machineNumberService;
-	
+
 	/**
 	 * 获取当前用户<微代理> 的订单记录
 	 * 2016年4月19日
@@ -165,24 +167,5 @@ public class AgentHandler {
 		return rm;
 	}
 
-	/**
-	 * 获取我的会员信息
-	 * @param req
-	 * @param openId
-	 * @return
-	 */
-	@RequestMapping("/getMyMemberInfo")
-	@ResponseBody
-	public ResultMsg getMyMemberInfo(HttpServletRequest req,
-						 @RequestParam(value="openId",defaultValue= "", required=false)String openId){
-		ResultMsg rm = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(req);
-		member = memberService.getMyMemberInfo(member.getUserOpenid());
 
-		rm.setStatus(true);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setData(member);
-		return rm;
-	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/AdminCouponTypeHandler.java

@@ -5,6 +5,10 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.tools.ResultInfo;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -181,4 +185,21 @@ public class AdminCouponTypeHandler {
 		}
 		return mv;
 	}
+	/**
+	 * 查询待用的优惠卷
+	 * @param openid
+	 * @return
+	 */
+	public ResultMsg getStandByCoupon(HttpServletRequest req,
+									  @RequestParam(value = "openid",required = false)String openid){
+		ResultMsg rm=new ResultMsg();
+		Member m= WechatUtils.getUserBySession(req);
+		List<CouponItem> list=couponItemService.getStandByCoupon(m.getUserOpenid());
+
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(list);
+		return rm;
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -1,7 +1,8 @@
 package com.iamberry.wechat.handles.integral;
 
 
-import com.auth0.jwt.internal.com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+
+import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
@@ -15,9 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.jws.soap.SOAPBinding;
+
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会员积分使用 Controller
@@ -30,44 +33,86 @@ public class UseIntegralHandler {
     private UseIntegralService useIntegralService;
 
     /**
-     * 积分使用日志
+     * 收入记录 use_type=1
      * @param req
-     * @param openid
+     * @param useType
+     * @param pageSize
+     * @param pageNO
      * @return
      */
-    @RequestMapping("/getUseIntegral")
+    @RequestMapping("/listGainIntegralInfo")
     @ResponseBody
-    public ResultMsg getUseIntegral(HttpServletRequest req,
-                                    @RequestParam(value = "openid",required=false)String openid){
+    public ResultMsg listGainIntegralInfo(HttpServletRequest req,
+                                    @RequestParam(value="useType",defaultValue= "1", required=false)Integer useType,
+                                     @RequestParam(value="pageSize",defaultValue= "6", required=false)String pageSize,
+                                     @RequestParam(value="pageNO",defaultValue= "1", required=false)String pageNO){
         ResultMsg rm=new ResultMsg();
         Member m= WechatUtils.getUserBySession(req);
-        List<UseIntegral> list=useIntegralService.getUseIntegral(m.getUserOpenid());
-        System.out.println(list);
+        int gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
+        if(gainIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.setUserOpenId(m.getUserOpenid());
+        useIntegral.setUseType(useType);
+        useIntegral.getPage().setPageSize(Integer.parseInt(pageSize));
+        useIntegral.getPage().setPageNumber(Integer.parseInt(pageNO));
+        List<UseIntegral> listGainIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
+
+        Map<String,Object> map=new HashMap<String, Object>();
+        map.put("listGainIntegralInfo",listGainIntegralInfo);
+        map.put("gainIntegralCount",gainIntegralCount);
+
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);
         rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-        rm.setData(list);
+        rm.setData(map);
         return rm;
     }
 
     /**
-     * 总使用的积分
+     * 全部记录 use_type=null
      * @param req
-     * @param openid
+     * @param useType
+     * @param pageSize
+     * @param pageNO
      * @return
      */
-    @RequestMapping("/getAllUseIntegral")
+    @RequestMapping("/listAllIntegralInfo")
     @ResponseBody
-    public ResultMsg getAllUseIntegral(HttpServletRequest req,
-                                       @RequestParam(value = "openid",required = false)String openid){
+    public ResultMsg listAllIntegralInfo(HttpServletRequest req,
+                                   @RequestParam(value="useType",defaultValue= "null", required=false)Integer useType,
+                                   @RequestParam(value="pageSize",defaultValue= "6", required=false)String pageSize,
+                                   @RequestParam(value="pageNO",defaultValue= "1", required=false)String pageNO){
         ResultMsg rm=new ResultMsg();
         Member m=WechatUtils.getUserBySession(req);
-        int allUseIntegral=useIntegralService.allUseIntegral(m.getUserOpenid());
+        int useIntegralCount=useIntegralService.getUseIntegralCount(m.getUserOpenid());
+        int gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
+        if(useIntegralCount<0||gainIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.setUserOpenId(m.getUserOpenid());
+        useIntegral.setUseType(useType);
+        useIntegral.getPage().setPageSize(Integer.parseInt(pageSize));
+        useIntegral.getPage().setPageNumber(Integer.parseInt(pageNO));
+        List<UseIntegral> listAllIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
+
+        Map<String,Object> map=new HashMap<String, Object>();
+        map.put("listAllIntegralInfo",listAllIntegralInfo);
+        map.put("useIntegralCount",useIntegralCount);
+        map.put("gainIntegralCount",gainIntegralCount);
 
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);
         rm.setMessage(NameUtils.getConfig("SUCCSSINFO"));
-        rm.setData(allUseIntegral);
+        rm.setData(map);
         return rm;
     }
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/member/MemberHandler.java

@@ -8,6 +8,8 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.iamberry.wechat.core.entity.integral.MemberIntegral;
+import com.iamberry.wechat.face.integral.UseIntegralService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -50,6 +52,8 @@ public class MemberHandler {
 	private HomeService homeService;
 	@Autowired
 	private TemporaryQrcodeService temporaryQrcodeService;
+	@Autowired
+	private UseIntegralService useIntegralService;  //会员积分service
 	/**
 	 * 微代理查看下线
 	 * @return
@@ -362,5 +366,54 @@ public class MemberHandler {
 			}
 		}
 	}
+	/**
+	 * 获取个人信息
+	 * @param req
+	 * @return
+	 */
+	@RequestMapping("/getMyMemberInfo")
+	@ResponseBody
+	public ResultMsg getMyMemberInfo(HttpServletRequest req){
+		ResultMsg rm = new ResultMsg();
+		Member member = WechatUtils.getUserBySession(req);
+		member = memberService.getMyMemberInfo(member.getUserOpenid());
+		if(member==null){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("待完善"));
+			return rm;
+		}
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(member);
+		return rm;
+	}
+
+	/**
+	 * 获取会员信息.会员等级名称
+	 * @param req
+	 * @return
+	 */
+	@RequestMapping("/getMemberInfoAndRankName")
+	@ResponseBody
+	public ResultMsg getMemberInfoAndRankName(HttpServletRequest req){
+		ResultMsg rm=new ResultMsg();
+		Member m=WechatUtils.getUserBySession(req);
+		String openid=m.getUserOpenid();
+		MemberIntegral mi=useIntegralService.getMemberInfoAndRankName(openid);
+		if(mi==null) {
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+			return rm;
+		}
+
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(mi);
+		return rm;
+	}
 
 }