优惠券修改

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

@@ -282,7 +282,7 @@ public class ResultInfo {
 	public static String COUPON_OUTOFDATE="优惠券过期";
 	public static String COUPON_INVALID="优惠券无效";
 	public static String COUPON_CONSUME_NO_ENOUGH="消费额度不足,优惠券无法使用";
-	public static String COUPON_NO_MEET_DEMAND="消费没有达到需求";
+	public static String COUPON_NO_MEET_DEMAND="此优惠券只能兑换T1/T2滤芯，请选择一个T1滤芯或者T2滤芯";
 
 	public static String COUPONITEMSTATUS_NORMAL = "normal";
 	public static String COUPONITEMSTATUS_PASSED = "passed";

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -307,6 +307,15 @@ public class OrderHandler {
 			msg.setMessage(ResultInfo.loginOutError);
 			return msg;
 		}
+
+		if("收件人".equals(temp.getOrderAddressName())){
+			msg.setMessage("收货人信息有误，请重新选择地址信息！");
+			return msg;
+		}
+		if("收货人电话".equals(temp.getOrderAddressName())){
+			msg.setMessage("收货人电话信息有误，请重新选择地址信息！");
+			return msg;
+		}
 		
 		member=memberService.getMemberByUserId(member.getUserId());
 		if (!validatorUtil.validatorObject(temp)) { // 校验订单信息是否输入有误
@@ -314,11 +323,11 @@ public class OrderHandler {
 			return msg;
 		}
 		if (temp.getOrderUserRemark() != null && !temp.getOrderUserRemark().isEmpty()) {
-			Pattern pattern = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9]+$");
-			if (!pattern.matcher(temp.getOrderUserRemark()).find()) {
-				msg.setMessage(ResultInfo.paramFormatError);
-				return msg;
-			}
+//			Pattern pattern = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9]+$");
+//			if (!pattern.matcher(temp.getOrderUserRemark()).find()) {
+//				msg.setMessage(ResultInfo.paramFormatError);
+//				return msg;
+//			}
 			if (!(temp.getOrderUserRemark().length() >= 1 && temp.getOrderUserRemark().length() <= 100)) {
 				msg.setMessage(ResultInfo.paramFormatError);
 				return msg;

watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js

@@ -422,10 +422,10 @@ function operation(num) {
                 mui.alert("备注必填！请输入1-99个字!");
                 return false
             } else {
-                if (!checkAddress(returnReason)) {
-                    mui.alert("您输入的格式有误,请重新输入!");
-                    return false
-                }
+                // if (!checkAddress(returnReason)) {
+                //     mui.alert("您输入的格式有误,请重新输入!");
+                //     return false
+                // }
             }
             data = {
                 orderId : orderId,