pc

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;
@@ -104,15 +102,13 @@ class WxPay extends \Payment\TencentPay
     {
         $total_fee = intval($param['totalFee']);
         $refund_fee = intval($param['refundFee']);
-        if(APP_ENV == 'develop'||APP_ENV == 'test'||APP_ENV == 'pre' || APP_ENV=='ccwdevelop'){
+        if(APP_ENV == 'develop'||APP_ENV == 'test'||APP_ENV == 'pre' || APP_ENV=='ccwdevelop'|| APP_ENV=='lyztest'){
             $this->parameters['total_fee'] = 1;
             $this->parameters['refund_fee'] = 1;
         } else {
             $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/Business/Order/OrderService.php

@@ -732,6 +732,23 @@ class OrderServiceModel extends \Business\AbstractModel
                     if ($order['paymentTime'] > ApiConst::zero && in_array($order['paymentType'], ArrayConst::orderPayTypeOnlines)) {
                         $this->changeOrderStateCancelUnconditional($order);
                     }
+                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
+                    $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
+                    $push=\Our\Push::getInstance();
+                    $pushData=array('storeId'=>$order['storeId'],
+                        'type'=>ApiConst::messageWaitReceive,
+                        'waitReceiveCount'=>ApiConst::reduceOne,
+                        'waitDeliveryCount'=>0,
+                        'waitGetCount'=>0,
+                        'orderCount'=>ApiConst::reduceOne,
+                        'waitRefundProccessCount'=>ApiConst::zero,
+                        'waitRefundReceiveCount'=>ApiConst::zero,
+                        'refundCount'=>ApiConst::zero,
+                        'alertCount'=>ApiConst::zero,
+                        'params'=>array('c'=>'shopkeeper',
+                            'm'=>'orderDetail',
+                            'orderId'=>$order['orderId']));
+                    $push->addOneToClient($pushData);
                 }
                 $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
                 $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);

application/models/Business/Store/StoreService.php

@@ -168,17 +168,17 @@ class StoreServiceModel extends \Business\AbstractModel{
 
         list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId);
         //展示图片
-        $detailImg = [];
-        if($storeInfo['store_detail_image']){
-            $storeDetailImg = unserialize($storeInfo['store_detail_image']);
-            if($storeDetailImg && is_array($storeDetailImg)){
-                foreach ($storeDetailImg as $v){
-                    if($v) {
-                        $detailImg[] = \DAO\StoreModel::getInstance()->getStoreLabelSrc($v, \Our\ImageConst::storeQualificationImg);
-                    }
-                }
-            }
-        }
+//        $detailImg = [];
+//        if($storeInfo['store_detail_image']){
+//            $storeDetailImg = unserialize($storeInfo['store_detail_image']);
+//            if($storeDetailImg && is_array($storeDetailImg)){
+//                foreach ($storeDetailImg as $v){
+//                    if($v) {
+//                        $detailImg[] = \DAO\StoreModel::getInstance()->getStoreLabelSrc($v, \Our\ImageConst::storeQualificationImg);
+//                    }
+//                }
+//            }
+//        }
         //地址
         $address = '';
         if($storeInfo['area_info']){
@@ -187,6 +187,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         if($storeInfo['store_address']){
             $address .= $storeInfo['store_address'];
         }
+        $address = preg_replace("/\s/",'',$address);
         //营业时间
         $openingHours = '';
         if($storeInfo['store_start_time'] && $storeInfo['store_close_time']){
@@ -203,7 +204,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $returnClass[] = $v['gc_name'];
             }
         }
-        $qualificationPics = $this->getStoreQualification($storeId,$storeInfo['member_id']);
+        list($qualificationPics,$detailImg) = $this->getStoreQualification($storeId,$storeInfo['member_id']);
         return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$openingHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$qualificationPics,'showImage'=>$detailImg);
     }
     public function getRecommendGoodsCache($param,$memberId){
@@ -433,9 +434,17 @@ class StoreServiceModel extends \Business\AbstractModel{
     }
     public function getStoreQualification($storeId,$memberId) {
         $pics = \DAO\Store\QmStoreApplyClassModel::getInstance()->getApplyPicCache($storeId,'file_name');
-        $join = \DAO\Store\StoreJoininModel::getInstance()->getOneByMemberIdCache($memberId,'business_licence_photo');
+        $join = \DAO\Store\StoreJoininModel::getInstance()->getOneByMemberIdCache($memberId,'business_licence_photo,shop_front_photo,shop_photo');
         $join['business_licence_photo'] && $pics[] =\Our\Common::getStaticFile($join['business_licence_photo'], \Our\ImageConst::Register, 'ossHost');
-        return \DAO\Store\QmStoreApplyClassModel::getInstance()->addWaterMark($pics);
+        $qualificationPics = \DAO\Store\QmStoreApplyClassModel::getInstance()->addWaterMark($pics);
+        $showImg = [];
+        $join['shop_front_photo'] && $showImg[] = \Our\Common::getStaticFile($join['shop_front_photo'], \Our\ImageConst::Register, 'ossHost');
+        if($shop_photo = unserialize($join['shop_photo'])) {
+            foreach ($shop_photo as $v) {
+                $v && $showImg[] = \Our\Common::getStaticFile($v, \Our\ImageConst::Register, 'ossHost');
+            }
+        }
+        return array($qualificationPics,$showImg);
     }
     /**
      * 获取搜索页推荐关键字

application/models/DAO/DeliveryFormula.php

@@ -133,7 +133,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
     }
 
     public function delDeliverFormulaByStoreId($storeId){
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db6\DeliveryFormulaRedisModel::getInstance(),array(&$this, 'getOne'),array(),\Our\ApiConst::sevenDaySecond,array($storeId));
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db6\DeliveryFormulaRedisModel::getInstance(),array(&$this, 'getOne'),array(),array($storeId));
     }
 
     /**

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/Store.php

@@ -334,7 +334,11 @@ class StoreModel extends \DAO\AbstractModel
         }
         if ($storeInfo['open_flag'] != 1 || $storeInfo['store_state'] != 1) {
             if ($reportError) {
-                \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
+                if($storeInfo['open_flag'] != 1) {
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotOpen);
+                }else{
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
+                }
             } else {
                 $storeInfo['isClose'] = 1;
             }