修改了扫描机器二维码回复内容

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

@@ -29,7 +29,7 @@ public class ResultInfo {
 	public  static String repeatNameError="";
 	public  static String lostMemberInfo="";
 
-	public  static String barCodePrefix="QR_CODE";
+	public  static String barCodePrefix="MACHINE_QR_CODE";
 	/**
 	 * 初始化代理商信息openid成功前缀
 	 */

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -263,7 +263,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Status status = new Status();
 		String senceid = requestMap.get("EventKey");//场景值
 		senceid = senceid.replaceAll(ResultInfo.barCodePrefix,"");//替换标识前的字符串
-        String str = bindingMachine(senceid, fromUserName);
+        String str = "【美国WaterO】经检测，您的机器为美国WaterO正品，请放心使用。";//bindingMachine(senceid, fromUserName);
         status.setCountext(str);
 		status.setFlag(false);
 		return status;
@@ -280,7 +280,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Member member = refreshUserInfo(fromUserName);
 		String senceid = requestMap.get("EventKey");//场景值
 		senceid = senceid.replaceAll(ResultInfo.barCodePrefix,"");//替换标识前的字符串
-		String str = bindingMachine(senceid, fromUserName);
+		String str = "【美国WaterO】经检测，您的机器为美国WaterO正品，请放心使用。";//bindingMachine(senceid.trim(), fromUserName);
 		status.setCountext(str);
 		status.setFlag(false);
 		return status;
@@ -300,6 +300,7 @@ public class WeChatServiceImpl implements WeChatService {
 		List<MachineNumber> numberList = machineNumberService.listMachineNumber(machineNumber);
 		if (numberList == null && numberList.size() == 0) {
 			str.append("该机器条形码有误，请重新扫描!");
+			return str.toString();
 		}
 		MachineNumber machine = numberList.get(0);
 		if (machine.getNumberOpenId() != null && !"".equals(machine.getNumberOpenId())) {