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

application/controllers/Cart.php

@@ -161,7 +161,7 @@ class CartController extends \Our\Controller_AbstractApi{
         $sess=\Yaf\Session::getInstance();
         $currentAddress = $sess->get('currentAddress');
 
-        $result = $cartService->addOrder($data,$this->memberId,$currentAddress);
+        $result = $cartService->addOrder($data, $this->memberId,$currentAddress);
         $this->success($result);
     }
 

application/library/Order/OrderConfirmUtil.php

@@ -145,10 +145,10 @@ class OrderConfirmUtil {
             $cartList = $pBundlingService->getFormatCartListForOrder($storeCartList,$this->memberId,true,$dbName);
 			$gcIds = isset($cartList['gcIds'])?$cartList['gcIds']:array();
 			$storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>array_keys($cartList['list']),'goodsIds'=>$storeCartList['goodsIds'],'goodsCommonIds'=>$storeCartList['goodsCommonIds'],'blIds'=>$storeCartList['blIds'],'gcIds'=>$gcIds);
-        
+
         }
-        if($this->storeCouponIds&&$this->couponIds){
-            $storeCartData = $this->checkCouponForOrder($storeCartData,$this->memberId);
+        if ($this->storeCouponIds&&$this->couponIds) {
+            $storeCartData = $this->checkCouponForOrder($storeCartData, $this->memberId);
         }
         return $storeCartData;
 
@@ -1259,4 +1259,4 @@ class OrderConfirmUtil {
 
         return self::$_instance;
     }
-}
+}
\ No newline at end of file

application/library/Our/ApiConst.php

@@ -312,6 +312,7 @@ class ApiConst
     const signClassStyle = 2;
 
     const isEffective=0;
+    const notEffectiveAllRefund=3;
     const defaultAddressCount = 3;
 
 

application/models/Business/Cart/CartService.php

@@ -603,7 +603,7 @@ class CartServiceModel extends \Business\AbstractModel{
         foreach($storeIds as $storeId){
             $store = $storeDao->get($storeId,false);
             $storeCarts = $storeCartData['cartList'][$storeId];
-            $deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付
+            $deliverySetting['onelinePay'] = $store['wx_pay']&&$store['onlinepay_flag']?\Our\ApiConst::one:\Our\ApiConst::zero;//是否支持线上支付
             $deliverySetting['offlinePay'] = $store['offline_pay'];
 
             if($deliverySetting['offlinePay']){
@@ -680,7 +680,7 @@ class CartServiceModel extends \Business\AbstractModel{
         foreach($storeIds as $storeId){
             $store = $storeDao->get($storeId,false);
             $storeCarts = $storeCartData['cartList'][$storeId];
-            $deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付
+            $deliverySetting['onelinePay'] = $store['wx_pay']&&$store['onlinepay_flag']?\Our\ApiConst::one:\Our\ApiConst::zero;//是否支持线上支付
             $deliverySetting['offlinePay'] = $store['offline_pay'];
             $deliverySetting['offlinePayway'] = array('payway'=>'','imageUrls'=>array());
             if($deliverySetting['offlinePay']){

application/models/Business/Goods/GoodsCommonService.php

@@ -319,32 +319,37 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $endTime = TIMESTAMP;
 
         $where = 'goods_edittime > '.$beginTime.' and goods_edittime<=' . $endTime . ' and goods_id in (select sg.goods_id from han_stat_goods sg)';
-        $field = 'goods_id,is_del,goods_name,goods_storage,goods_price,store_id';
+        $field = 'goods_id,goods_commonid,is_del,goods_name,goods_storage,goods_price,store_id';
 
         $result = true;
         $goodsDao = \DAO\GoodsModel::getInstance();
         $storeDao = \DAO\StoreModel::getInstance();
         $statGoodsDao = \DAO\StatGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $store_tmp = array();
-        if($datas = $goodsDao->getList($where, $field)) {   //更新商品报表
-            echo 'in:'.count($datas);
-            foreach ($datas as $key=>$val) {
-                if(isset($store_tmp[$val['store_id']])) {
-                    $store_info = $store_tmp[$val['store_id']];
-                } else {
-                    $store_info = $storeDao->getFieldsInfo(array('store_id'=>$val['store_id']), 'province_id, city_id, area_id');
-                }
-                $update_stat_goods = $val;
-                $update_stat_goods['upd_time'] = $endTime;
-                $update_stat_goods['province_id'] = $store_info['province_id'];
-                $update_stat_goods['city_id'] = $store_info['city_id'];
-                $update_stat_goods['area_id'] = $store_info['area_id'];
-                unset($update_stat_goods['goods_id']);
-                $where = 'goods_id='.$val['goods_id']. ' and upd_time <'.$beginTime;
-                if(!$statGoodsDao->update($where, $update_stat_goods)){
-                    $result = false;
+        $count = $statGoodsDao->getCountByWhere('1=1');
+        if($count > 0) {
+            if($datas = $goodsDao->getList($where, $field)) {   //更新商品报表
+                echo 'in:'.count($datas);
+                foreach ($datas as $key=>$val) {
+                    if(isset($store_tmp[$val['store_id']])) {
+                        $store_info = $store_tmp[$val['store_id']];
+                    } else {
+                        $store_info = $storeDao->getFieldsInfo(array('store_id'=>$val['store_id']), 'province_id, city_id, area_id');
+                    }
+                    $update_stat_goods = $val;
+                    $update_stat_goods['upd_time'] = $endTime;
+                    $update_stat_goods['province_id'] = $store_info['province_id'];
+                    $update_stat_goods['city_id'] = $store_info['city_id'];
+                    $update_stat_goods['area_id'] = $store_info['area_id'];
+                    unset($update_stat_goods['goods_id']);
+                    $where = 'goods_id='.$val['goods_id']. ' and upd_time <'.$beginTime;
+                    if(!$statGoodsDao->update($where, $update_stat_goods)){
+                        $result = false;
+                    }
                 }
             }
+        } else {
+            file_put_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, '0');
         }
 
         $where = 'goods_id not in (select sg.goods_id from han_stat_goods sg)';
@@ -368,9 +373,13 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 }
             }
         }
+        echo "\n";
 
         if($result) {   //商品报表更新成功
             file_put_contents($this->baseDir . \Our\PathConst::goodsStatTime, $endTime);
+            echo "upd goods succ";
+        } else {
+            echo "upd goods fail";
         }
         return $result;
     }
@@ -382,7 +391,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
      * Time: 下午 6:19
      */
     public function updateStatGoodsSell(){
-        file_put_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, '');
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP;
@@ -419,8 +427,12 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 }
             }
             if(!$result) {
+                echo "\n";
+                echo 'upd sell fail';
                 $statGoodsDao->db->doRollback();
             } else {   //商品报表更新成功
+                echo "\n";
+                echo 'upd sell succ';
 				$statGoodsDao->db->doCommit();
 				file_put_contents($this->baseDir . \Our\PathConst::goodsSellStatTime, $endTime);
 			}

application/models/Business/Order/RefundService.php

@@ -1257,6 +1257,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundArray['add_time'] = TIMESTAMP;
         $refundArray['refund_type']=$refund['refundType'];
         $refundArray['refund_shipping_type']=isset($refund['refundShippingType'])?$refund['refundShippingType']:ApiConst::zero;
+        $refundArray['payment_type']=$orderInfo['paymentType'];
         $refundArrayUnLine=Common::convertUnderline($refundArray);
         $state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods);
 

application/models/Business/Store/DeliveryService.php

@@ -76,7 +76,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $qmDeliveryManLogData['distribution_fee'] =$data['distributionFee'];
         $qmDeliveryManLogData['order_type'] = $data['orderType'];
         if($data['orderType']==ApiConst::orderTypeRefund){
-            $qmDeliveryManLogData['shipping_fee']=$orderD['need_shipping_fee'];
+            $qmDeliveryManLogData['shipping_fee']=$orderD['needShippingFee'];
         }else{
             $qmDeliveryManLogData['shipping_fee'] =    $orderD['shippingFee'];
         }

application/models/Business/Store/ShopkeeperService.php

@@ -963,8 +963,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
 //        $storeMemberStatisticDao = \DAO\StoreMemberStatisticsModel::getInstance(DbNameConst::masterDBConnectName);
-//        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-//        $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
+        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+       $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $gmtUpdate = file_get_contents($this->baseDir . PathConst::refundRetrunGmtUpdate);
         $gmtUpdate = $gmtUpdate ? $gmtUpdate : ApiConst::zero;
         $this->taskIndex = PageConst::taskPageBegin;
@@ -974,14 +974,28 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             $this->taskIndex++;
             $refundReturns = isset($refundReturns['list']) ? $refundReturns['list'] : false;
             $reduceDatasDistinct=array();
+
             if (!empty($refundReturns)) {
                 foreach ($refundReturns as $refundReturn) {
+                    $res = $orderGoodsDao->getCountByOrderId($refundReturn['orderId']);
+                    if($res){
+                        $refundReturnWhere['order_id']=$refundReturn['orderId'];
+                        $refundReturnWhere['is_suc_refund']=ApiConst::refundSuccess;
+                        $refundCount= $refundReturnDao->getCount($refundReturnWhere);
+                        if($res==$refundCount){
+                            $orderWhere['order_id']=$refundReturn['orderId'];
+                            $updateData['is_effective']=ApiConst::notEffectiveAllRefund;
+                            $orderDao->update($orderWhere,$updateData);
+                        }
+                    }
                     $key=$refundReturn['storeId'].'+'.$refundReturn['buyerId'];
                     $reduceDatasDistinct[$key]=$refundReturn;
                 }
             }
+
             $this->insertStoreMemberStaticsDistinct($reduceDatasDistinct);
 
+
         } while ($refundReturns);
         //$storeMemberStatisticDao->addAllReduce($refundReturns);
         file_put_contents($this->baseDir . PathConst::refundRetrunGmtUpdate, TIMESTAMP);

application/models/Business/Store/StoreService.php

@@ -213,14 +213,9 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $storeMember['fav_type'] = \Our\ApiConst::one;
                 $storeMembers[] = $storeMember;
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
-                $one = $favoritesStoreDao->getOne('store_id',array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one,'fav_from'=>\Our\ApiConst::scanFavor),'');
-                if(!$one) {
-                    $result = $favoritesStoreDao->insertAll($storeMembers);
-                    if($result) {
-                        $favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
-                    }
-                    $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
-                    \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
+                $result = $favoritesStoreDao->insertAll($storeMembers);
+                if($result) {
+                    $favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
                 }
 
             }else{

application/models/Business/User/MemberService.php

@@ -376,8 +376,6 @@ class MemberServiceModel extends \Business\AbstractModel
                     return false;
                 }
                 $favoritesStoreDao->updateStoreCollecitonsCache($storeIds,$memberId,2);
-                $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
-                \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
             }
 
         }

application/models/DAO/FavoritesStore.php

@@ -205,6 +205,8 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$this, 'getOne'),array(),array($memberId));
         }
         \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$this, 'getFavoritesStores'),array(),array($memberId));
+        \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array(),array($memberId));
+
         //更新个人中心首页数量
         \DAO\MemberModel::getInstance()->_changeNum(\Our\NameConst::storeCollection,$memberId,$type == 1 ? -(count($storeIds)) : count($storeIds));
         return true;

application/models/DAO/Order/Order.php

@@ -492,9 +492,9 @@ class OrderModel extends \DAO\AbstractModel
           $where= $this->db->getSqlWhereByArray($where);
         }
         if($today){
-            $refundAmount=   $refundReturnDao->getSumRefundAmountByStoreId($storeId,$today);
+            $refundAmount=   $refundReturnDao->getSumRefundAmountByStoreId($storeId,$today,true);
         }else{
-            $refundAmount=   $refundReturnDao->getSumRefundAmountByStoreId($storeId);
+            $refundAmount=   $refundReturnDao->getSumRefundAmountByStoreId($storeId,false,true);
         }
         $res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,order_amount as orderTotalOnline")->fetchOne();
         if(!$res){

application/models/DAO/Order/OrderGoods.php

@@ -37,7 +37,16 @@ class OrderGoodsModel extends \DAO\AbstractModel
     {
 
     }
-
+   public function getCountByWhere($where){
+       $this->setDb($this->dbName);
+       $goodsCount = $this->db->select("count(*)  as cou")->from($this->_tableName)->where($where)->fetchNum();
+       return $goodsCount?$goodsCount:ApiConst::zero;
+   }
+    public function getCountByOrderId($orderId){
+        $this->setDb($this->dbName);
+        $where['order_id']=$orderId;
+        return $this->getCountByWhere($where);
+    }
     public function getOrderGoodsList($where, $field, $group = null, $limit = [])
     {
         $this->setDb();

application/models/DAO/Order/RefundReturn.php

@@ -7,6 +7,7 @@ use Error\CodeConfigModel;
 use Error\ErrorModel;
 use OSS\Common;
 use Our\ApiConst;
+use Our\ArrayConst;
 use Our\DbNameConst;
 use Our\DescribeConst;
 use Our\ImageConst;
@@ -43,8 +44,8 @@ class RefundReturnModel extends \DAO\AbstractModel
 
     public function getCount($where)
     {
-        $this->setDb();
-        return $this->db->from($this->_tableName)->where($where)->fetchNum();
+        $this->setDb($this->dbName);
+        return $this->db->from($this->_tableName)->where($where)->select()->fetchNum();
     }
 
     public function getAll($where, $field, $db = DbNameConst::salveDBConnectName)
@@ -55,13 +56,26 @@ class RefundReturnModel extends \DAO\AbstractModel
     }
 
 
-    public function getRefundSuccessMoneyByStoreId($storeId, $beginTime = false, $endTime = false)
+    public function getRefundSuccessMoneyByStoreId($storeId, $beginTime = false, $endTime = false,$online=false)
     {
         $this->setDb($this->dbName);
         if ($beginTime) {
-            $where = \Our\Common::format(" store_id={0} and is_suc_refund={1}  and gmt_update between {2} and {3}", $storeId, ApiConst::refundSuccess, $beginTime, $endTime);
+            $where['store_id']=$storeId;
+            $where['is_suc_refund']=ApiConst::refundSuccess;
+            if($online){
+                $where['payment_type']=array('in',ArrayConst::orderPayTypeOnlines);
+            }
+            $where['gmt_update']=array('between',$beginTime,$endTime);
         } else {
-            $where = \Our\Common::format(" store_id={0}  and is_suc_refund={1}", $storeId, ApiConst::refundSuccess);
+            $where['store_id']=$storeId;
+            $where['is_suc_refund']=ApiConst::refundSuccess;
+            if($online){
+                $where['payment_type']=array('in',ArrayConst::orderPayTypeOnlines);
+            }
+            //$where = \Our\Common::format(" store_id={0}  and is_suc_refund={1}", $storeId, ApiConst::refundSuccess);
+        }
+        if(is_array($where)){
+            $where = $this->db->getSqlWhereByArray($where);
         }
         $res = $this->db->from($this->_tableName)->select($this->sumRefundAmount)->where($where)->fetchValue();
         return !empty($res) ? $res : ApiConst::zero;
@@ -729,13 +743,13 @@ class RefundReturnModel extends \DAO\AbstractModel
         return $res?$res:array();
     }
 
-    public function getSumRefundAmountByStoreId($storeId,$today=false){
+    public function getSumRefundAmountByStoreId($storeId,$today=false,$isOnline=false){
         $this->setDb($this->dbName);
         if($today){
             $todayBegin=\Our\Common::getTodayBeginTimpSpan();
-            $res=$this->getRefundSuccessMoneyByStoreId($storeId,$todayBegin,TIMESTAMP);
+            $res=$this->getRefundSuccessMoneyByStoreId($storeId,$todayBegin,TIMESTAMP,$isOnline);
         }else{
-            $res=$this->getRefundSuccessMoneyByStoreId($storeId);
+            $res=$this->getRefundSuccessMoneyByStoreId($storeId,false,false,$isOnline);
         }
         return $res?$res:ApiConst::zero;