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

application/models/Business/Goods/GoodsCommonService.php

@@ -293,7 +293,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $attrs = $this->getAttr($goodsCommonId,$memberId);
         $commonInfo = $attrs['commonInfo'];
         $commonInfo['goods_image'] = \Our\ImageUtil::getGoodsImgUrl($commonInfo['goods_image']);
-
         //所在地
         $area = '';
         if($commonInfo['areaid_1'] && $commonInfo['areaid_2']){

application/models/Business/Order/OrderService.php

@@ -298,12 +298,14 @@ class OrderServiceModel extends \Business\AbstractModel
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel);
             if ($res) {
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
-                $resultRefund=$refundReturnDao->refundMoney($order);
-                if($resultRefund){
-                    $where['order_id']=$order['orderId'];
-                    //$orderGoodsUpdateData['refund_state_name']='退款成功';
-                    $orderGoodsUpdateData['is_refund']=1;
-                    $orderGoodsDao->update($where,$orderGoodsUpdateData);
+                if($order['paymentTime']>ApiConst::zero){
+                    $resultRefund=$refundReturnDao->refundMoney($order);
+                    if($resultRefund){
+                        $where['order_id']=$order['orderId'];
+                        //$orderGoodsUpdateData['refund_state_name']='退款成功';
+                        $orderGoodsUpdateData['is_refund']=1;
+                        $orderGoodsDao->update($where,$orderGoodsUpdateData);
+                    }
                 }
                 if ($memberId) {
                     $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);

application/models/Business/Store/StoreService.php

@@ -14,21 +14,6 @@ class StoreServiceModel extends \Business\AbstractModel{
     public function init() {
     }
 
-//    public function get($storeId,$label = true){
-//        $storeInstance = \DAO\StoreModel::getInstance();
-//        $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeInstance, 'getInfoById'),array($storeId));
-//        if(!$storeInfo){
-//            \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
-//        }
-//
-//        if($label){
-//            //店铺头像
-//            $storeLabel = $storeInstance->getStoreLabelSrc($storeInfo['store_label']);
-//
-//            return array($storeInfo,$storeLabel);
-//        }
-//        return $storeInfo;
-//    }
 
     /**
      * 获取店铺首页渲染信息
@@ -62,12 +47,6 @@ class StoreServiceModel extends \Business\AbstractModel{
                         \DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'store_id'=>$storeId));
                     }
                 }
-//                $storeMember['storeId'] = $storeId;
-//                $storeMember['memberId'] = $memberId;
-//                $storeMember['type']    = \Our\ApiConst::storeQrcodeMember;
-//                $storeMembers[] = $storeMember;
-//                $storeMemberDao = \DAO\StoreMemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
-//                $result = $storeMemberDao->addBatch($storeMembers);
             }else{
                 $sess=\Yaf\Session::getInstance();
                 $scan_store_ids = $sess->get('scan_store_ids');

application/models/Business/User/MemberCenterService.php

@@ -224,34 +224,6 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         $list = \Our\RedisHelper::cachedFunction(\Redis\Db4\FavoritesRedisModel::getInstance(),array(&$favoritesInstance, 'getList'),array($where,$field,$pageIndex,$pageSize,$memberId),\Our\ApiConst::oneDaySecond,array($memberId));
         $goods = array();
         if(is_array($list) && !empty($list)){
-//            $storeIds = array_column($list,'store_id');
-//            $storeIds = array_unique($storeIds);
-//            foreach ($storeIds as $storeId) {
-//                $tempStores = [];
-//                $queryStores = [];
-//                $storeDAO = \DAO\StoreModel::getInstance();
-//                $exist = \Our\RedisHelper::cachedFunctionExist(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDAO, 'getInfoById'),array($storeId),array($storeId));
-//                if($exist) {
-//                    $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDAO, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
-//                    $tempStores[] = $storeInfo;
-//                }elseif ($exist === false) {
-//                    $queryStores[] = $storeId;
-//                }
-//            }
-//            if($queryStores) {
-//                var_dump($queryStores);
-//                $storeList = $storeDAO->getList('store_id in('.implode(',',$queryStores).')',\Our\ApiConst::zero,$pageSize);
-//                if($storeList) {
-//                    foreach ($storeList as $store) {
-//                        \Our\RedisHelper::setCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDAO, 'getInfoById'),$store,array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
-//                        $tempStores[] = $store;
-//                    }
-//                }
-//            }
-//            $stores = [];
-//            foreach ($tempStores as $store) {
-//                $stores[$store['store_id']] = [$store['store_state'],$store['open_flag']];
-//            }
             foreach ($list as $v){
                 //if($stores['store_id'] && $stores['store_id']['open_flag'] == 1 && $stores['store_id']['store_state'] == 1) {
                     $goods[] = array('favid'=>$v['favid'],'goodsCommonId'=>$v['goods_commonid'],'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::goodsCollectionImgSize),'goodsName'=>$v['goods_name'],'goodsPrice'=>$v['goods_price'],'goodsId'=>$v['goods_id']);

application/models/DAO/Order/Order.php

@@ -133,14 +133,20 @@ class OrderModel extends \DAO\AbstractModel
     //判断订单是否允许取消
     public function isAllowCancel($order)
     {
-        if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
-            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP && $order['paymentTime']>ApiConst::zero ){
+        if($order['paymentTime']==ApiConst::zero){
+            if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
+                return true;
+            } else {
                 return false;
             }
-            return true;
-        } else {
-            return false;
+        }else{
+            if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
+                return false;
+            }else{
+                return true;
+            }
         }
+
     }
 
     //列表转换

application/models/DAO/Store.php

@@ -268,7 +268,7 @@ class StoreModel extends \DAO\AbstractModel
     public function get($storeId,$label = true)
     {
         $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$this, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
-        if(!$storeInfo){
+        if(!$storeInfo || $storeInfo['open_flag'] == 0 || $storeInfo['store_state'] != 1){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
         }