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

application/models/Business/Store/ShopkeeperService.php

@@ -85,7 +85,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $data['favCount'] = $storeFavariteCount['favCount'];
         $data['todayOrderCount'] = $storeStats['todayOrderCount'];
         $data['todayOrderTotal'] = $storeStats['todayOrderTotal'];
-        $data['todayOrderTotalOnline']=$todayTotalOnline;
+        $data['todayOrderTotalOnline']=$todayTotalOnline['orderTotalOnline'];
         $data['tadayFavCount'] = $storeFavariteCount['todayFavCount'];
         $data['todayFavCount'] = $storeFavariteCount['todayFavCount'];
         return $data;
@@ -693,7 +693,6 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $storeDao=\DAO\StoreModel::getInstance();
         $memberFavoritesStoreMemberStatisticsDao=\DAO\Store\MemberFavoritesStoreStoreMemberStatisticsModel::getInstance(DbNameConst::masterDBConnectName);
         foreach($distincts as $order){
-
             $storeDao->deleteStoreTotalCount($order['storeId']);
            // $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'], true, true);
             $storeMemberStatisticsData['storeId']=$order['storeId'];

application/models/DAO/Order/Order.php

@@ -496,7 +496,7 @@ class OrderModel extends \DAO\AbstractModel
         }else{
             $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();
+        $res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,sum(order_amount) as orderTotalOnline")->fetchOne();
         if(!$res){
             $res=array();
             $res['orderTotalOnline']=ApiConst::zero;

conf/application.ini

@@ -290,7 +290,7 @@ elastic.master.scheme="http";
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "192.168.1.201"
 resources.database.params.port     = 3306
-resources.database.params.database = "qmcs"
+resources.database.params.database = "qmcs_ccw"
 resources.database.params.username = "root"
 resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
@@ -300,7 +300,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 resources.database.slave.params.driver   = "pdo_mysql"
 resources.database.slave.params.hostname = "192.168.1.201"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.database = "qmcs_ccw"
 resources.database.slave.params.username = "root"
 resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"

scripts/crontab/shopkeeper/index.php

@@ -70,6 +70,7 @@ class cliShopkeeperIndex extends basecli
         $shopkeeperService = \Business\Store\ShopkeeperServiceModel::getInstance();
         $shopkeeperService->baseDir= \Our\Common::getConfig('out.config');
         try {
+
             $shopkeeperService->insertStoreMemberStatics();
             //退货退款订单自动关闭
             $shopkeeperService->reduceStoreMemberStatics();