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

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -271,6 +271,7 @@ public class ResultInfo {
 	/**
 	 * 获取RST系统产品信息接口地址
 	 */
-	public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";
+	/*public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";*/
+	public static String GET_MACHINE_INFO = "http://my.com:9797/mcahine/getMachineInfo?barCode=";
 
 }

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-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -476,12 +476,12 @@ public class WeChatServiceImpl implements WeChatService {
 		String province = jsonObject.getString("province");
 		String nickname = jsonObject.getString("nickname");
 		String headimgurl = jsonObject.getString("headimgurl");
-		try {
+		/*try {
 			nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			nickname = "";
 			inLongLogger.error(this, e.getMessage());
-		}
+		}*/
 		Member member = homeService.selectMemberInfoByOpenId(openId);
 		//赋值&更新会员数据
 		if (member != null && member.getUserId() != null) {

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -58,6 +58,7 @@ public class ApparatusHandler {
         PageBean page = new PageBean();
         page.setPageNumber(pageNO);
         page.setPageSize(pageSize);
+        page.initRecordBegin();
         apparatus.setPage(page);
         //分页查询用户绑定机器信息
         List<Apparatus> apparatusList = apparatusService.listApparatusPage(apparatus);

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;
@@ -156,7 +157,10 @@ public class UseIntegralHandler {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-
+        Map<String,Object> map=new HashMap<String, Object>();
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.setUserOpenId(openid);
+        /**********判断useType=1 为收入记录**************/
         if(useType != null && useType==1){
             Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
             if(gainIntegralCount != null && gainIntegralCount<0){
@@ -165,18 +169,15 @@ public class UseIntegralHandler {
                 rm.setMessage(NameUtils.getConfig("ERRORINFO"));
                 return rm;
             }
-            UseIntegral useIntegral=new UseIntegral();
-            useIntegral.setUserOpenId(openid);
-            useIntegral.setIntegralType(useType);
+
             useIntegral.getPage().setPageSize(pageSize);
             useIntegral.getPage().setPageNumber(pageNO);
             useIntegral.getPage().initRecordBegin();
             useIntegral.setIntegralType(useType);
             List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
-            Map<String,Object> map=new HashMap<String, Object>();
             map.put("listIntegralInfo",listIntegralInfo);
-            map.put("stayIntegralCount",gainIntegralCount);
+            map.put("gainIntegralCount",gainIntegralCount);
 
             rm.setStatus(true);
             rm.setResultCode(ResultInfo.SUCCESSCODE);
@@ -184,7 +185,8 @@ public class UseIntegralHandler {
             rm.setData(map);
             return rm;
         }
-        if(useType != null && useType==2){
+        /**********判断useType=3 为待入账记录**************/
+        if(useType != null && useType==3){
             Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
             if(stayIntegralCount != null && stayIntegralCount<0){
                 rm.setStatus(false);
@@ -192,15 +194,13 @@ public class UseIntegralHandler {
                 rm.setMessage(NameUtils.getConfig("ERRORINFO"));
                 return rm;
             }
-            UseIntegral useIntegral=new UseIntegral();
-            useIntegral.setUserOpenId(openid);
-            useIntegral.setIntegralType(useType);
+
             useIntegral.getPage().setPageSize(pageSize);
             useIntegral.getPage().setPageNumber(pageNO);
             useIntegral.getPage().initRecordBegin();
             useIntegral.setIntegralType(useType);
             List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
-            Map<String,Object> map=new HashMap<String, Object>();
+
             map.put("listIntegralInfo",listIntegralInfo);
             map.put("stayIntegralCount",stayIntegralCount);
 
@@ -210,21 +210,37 @@ public class UseIntegralHandler {
             rm.setData(map);
             return rm;
         }
+
+        /**********否则 为全部记录**************/
         Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
         Integer useIntegralCount=useIntegralService.getUseIntegralCount(openid);
         Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
 
+        if(gainIntegralCount != null && gainIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        if(stayIntegralCount != null && stayIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        if(useIntegralCount != null && useIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
 
-        UseIntegral useIntegral=new UseIntegral();
-        useIntegral.setUserOpenId(openid);
-        useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();
         useIntegral.setIntegralType(null);
         List<UseIntegral> listIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
-        Map<String,Object> map=new HashMap<String, Object>();
         map.put("listIntegralInfo",listIntegralInfo);
         map.put("useIntegralCount",useIntegralCount);
         map.put("gainIntegralCount",gainIntegralCount);
@@ -255,11 +271,19 @@ public class UseIntegralHandler {
         }
         /*************会员等级***************/
         Member memberInfo=memberService.getMyMemberInfo(openid);
-        int userIntegralCount=memberInfo.getUserIntegral();
+//        HttpSession session=req.getSession();
+//        session.setAttribute("memberInfo",memberInfo);
+        Integer userIntegralCount=memberInfo.getUserIntegral();
+        if(userIntegralCount != null && userIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
         List<RankRule> list=useIntegralService.getRankRule();
         List<RankRule> lists=new ArrayList<RankRule>();
         for(RankRule r:list){
-            if(r.getRankRuleIntegral()>=userIntegralCount){
+            if(r.getRankRuleIntegral()>userIntegralCount){
                 lists.add(r);
             }
         }

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) {

tooth-wechat-web/src/main/resources/iamberry-wechat-service-datasource.xml

@@ -38,6 +38,7 @@
         <property name="testWhileIdle" value="true" />
         <property name="testOnBorrow" value="false" />
         <property name="testOnReturn" value="false" />
+        <property name="connectionInitSqls" value="set names utf8mb4;" />
         <property name="filters" value="stat"/>
         <!-- 配置监控统计拦截的filters -->
         <property name="proxyFilters">