pc

application/models/DAO/Order/Order.php

@@ -90,11 +90,11 @@ class OrderModel extends \DAO\AbstractModel
         $where = Common::format(" store_id={0} and order_state not in ({1})", $storeId,$notInState);
         $orderTotal = $this->getOrderCounts($where, $this->countField);
         $refundAmount=$refundReturnDao->getRefundSuccessMoneyByStoreId($storeId);
-        $orderTotal=$orderTotal-$refundAmount;
+        $orderTotal['orderTotal']=$orderTotal['orderTotal']-$refundAmount;
         $where .= Common::format(" and gmt_update between {0} and {1}", $begin, $end);
         $todayTotal = $this->getOrderCounts($where, $this->countField);
         $todayRefund=$refundReturnDao->getRefundSuccessMoneyByStoreId($storeId,$begin,$end);
-        $todayTotal=$todayTotal-$todayRefund;
+        $todayTotal['orderTotal']=$todayTotal['orderTotal']-$todayRefund;
         $total['todayOrderTotal'] = isset($todayTotal['orderTotal']) ? $todayTotal['orderTotal'] : ApiConst::zero;
         $total['todayOrderCount'] = isset($todayTotal['orderCount']) ? $todayTotal['orderCount'] : ApiConst::zero;
         $total['orderTotal'] = isset($orderTotal['orderTotal']) ? (int)$orderTotal['orderTotal'] : ApiConst::zero;

application/models/DAO/Order/RefundReturn.php

@@ -52,12 +52,12 @@ class RefundReturnModel extends \DAO\AbstractModel {
     public function getRefundSuccessMoneyByStoreId($storeId,$beginTime=false,$endTime=false){
         $this->setDb($this->dbName);
         if($beginTime){
-            $where=\Our\Common::format(" store_id={0} and refund_state={1} and between {2} and {3}",$storeId,ApiConst::refundSuccess,$beginTime,$endTime);
+            $where=\Our\Common::format(" store_id={0} and is_suc_refund={1}  and gmt_update between {2} and {3}",$storeId,ApiConst::refundSuccess,$beginTime,$endTime);
         }else{
-            $where=\Our\Common::format(" store_id={0}  and refund_state={1}",$storeId);
+            $where=\Our\Common::format(" store_id={0}  and is_suc_refund={1}",$storeId,ApiConst::refundSuccess);
         }
         $res=$this->db->from($this->_tableName)->select($this->sumRefundAmount)->where($where)->fetchValue();
-        return $res?$res:ApiConst::zero;
+        return !empty($res)?$res:ApiConst::zero;
 
     }
     /**