Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

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

@@ -61,8 +61,8 @@
 			<if test="userSex!=null">
 				user_sex=#{userSex},
 			</if>
-			<if test="userBirthDate!=null">
-				user_birth_date=#{userBirthDate}
+			<if test="userAgeStage!=null">
+				user_age_stage=#{userAgeStage}
 			</if>
 		</set>
 		WHERE user_openid = #{userOpenid}

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -270,6 +271,8 @@ public class UseIntegralHandler {
         }
         /*************会员等级***************/
         Member memberInfo=memberService.getMyMemberInfo(openid);
+        HttpSession session=req.getSession();
+        session.setAttribute("memberInfo",memberInfo);
         Integer userIntegralCount=memberInfo.getUserIntegral();
         if(userIntegralCount != null && userIntegralCount<0){
             rm.setStatus(false);

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

@@ -377,7 +377,8 @@ public class MemberHandler {
 	 */
 	@RequestMapping("/updateMyMember")
 	@ResponseBody
-	public ResultMsg updateMyMember(HttpServletRequest req,Member member){
+	public ResultMsg updateMyMember(HttpServletRequest req,
+									@RequestParam(value="member") Member member){
 		ResultMsg rm=new ResultMsg();
 		Member memberInfo=WechatUtils.getUserBySession(req);
 		if (memberInfo == null || memberInfo.getUserOpenid() == null) {