新增正则、下单细节优化

app/common.php

@@ -2409,6 +2409,20 @@ function CheckLoginPwd($string)
     return (preg_match('/'.MyConst('common_regex_pwd').'/', $string) == 1) ? true : false;
 }
 
+/**
+ * [CheckAlphaNumber 包含字母和数字]
+ * @author   Devil
+ * @blog     http://gong.gg/
+ * @version  0.0.1
+ * @datetime 2016-12-03T21:58:54+0800
+ * @param    [string] $string [登录密码]
+ * @return   [boolean]        [正确true, 错误false]
+ */
+function CheckAlphaNumber($string)
+{
+    return (preg_match('/'.MyConst('common_regex_alpha_number').'/', $string) == 1) ? true : false;
+}
+
 /**
  * [IsExistRemoteImage 检测一张网络图片是否存在]
  * @author   Devil

app/service/BuyService.php

@@ -1126,7 +1126,7 @@ class BuyService
 
             // 线下支付订单是否直接成功
             // 是否开启线下订单正常进入流程
-            if($is_under_line == 1 && MyC('common_is_under_line_order_normal') == 1)
+            if($common_order_is_booking != 1 && $is_under_line == 1 && MyC('common_is_under_line_order_normal') == 1)
             {
                 $order_status = 2;
             }

app/service/ConstService.php

@@ -399,6 +399,9 @@ class ConstService
             // 用户名
             'common_regex_pwd'                  =>  '^.{6,18}$',
 
+            // 包含字母和数字、6~16个字符
+            'common_regex_alpha_number'         => '^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$',
+
             // 手机号码
             'common_regex_mobile'               =>  '^1((3|4|5|6|7|8|9){1}\d{1})\d{8}$',
 

extend/base/Email.php

@@ -146,7 +146,15 @@ class Email
 		$this->EmailInit();
 
 		// 收件人地址，可以替换成任何想要接收邮件的email信箱,格式("收件人email","收件人姓名")
-		$this->obj->AddAddress($params['email'], isset($params['username']) ? $params['username'] : $params['email']);
+		if(!is_array($params['email']))
+		{
+			$params['email'] = explode(',', $params['email']);
+		}
+		foreach($params['email'] as $email)
+		{
+			$username = isset($params['username']) ? $params['username'] : $email;
+			$this->obj->AddAddress($email, $username);
+		}
 
 		// 邮件标题
 		$this->obj->Subject = $params['title'];