Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/library/Our/Common.php

@@ -267,7 +267,7 @@ class Common
             return false;
         }
 
-        if( !preg_match('/^1[345789]\d{9}$/', $phone) ){
+        if( !preg_match('/^1[3456789]\d{9}$/', $phone) ){
             return false;
         }
 

application/library/Payment/WxPay.php

@@ -80,8 +80,6 @@ class WxPay extends \Payment\TencentPay
             $this->parameters['total_fee'] = $total_fee;
             $this->parameters['refund_fee'] = $refund_fee;
         }
-        $this->parameters['total_fee'] = $total_fee;
-        $this->parameters['refund_fee'] =$refund_fee;
         $this->parameters['out_refund_no'] = $param['refundOrderNo'];
         $this->parameters['out_trade_no'] = $param['outTradeNo'];
         $this->parameters['op_user_id'] = $this->mch_id;

application/models/DAO/Member.php

@@ -541,7 +541,12 @@ class MemberModel extends \DAO\AbstractModel
     $orders = array('member_mobile'=>'desc','member_id'=>'desc');
     $memberList = $this->getList($memberCon,$this->availMemberColumn,$orders);
     if($memberList){
-      $member = $memberList[0];
+      foreach($memberList as $tempMember){
+          if($tempMember['member_mobile']&&\Our\Common::checkMobilePhone($tempMember['member_mobile'])){
+            $member = $tempMember;
+            break;
+          }
+      }
       $memberAvatarUrl = $this->getMemberAvatarUrl($member['member_id'], $member['member_avatar']);
       $member['memberAvatarUrl'] = $memberAvatarUrl;
     }

application/models/DAO/Order/RefundReturn.php

@@ -396,7 +396,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
             }
             $param['subMchId'] = $mchIdArray['mchId'];
         }
-        if (intval($orderInfo['paymentType']) == ApiConst::wxAppPayType||intval($orderInfo['paymentType']) == 3) {
+        if (intval($orderInfo['paymentType']) == ApiConst::wxAppPayType) {
             $wxpay = \Payment\WxPay::getInstance();
             unset($param['subMchId']);
             $refund_return = $wxpay->refund($param);