Commit 86a1041a authored by wwccw0591's avatar wwccw0591

pc

parent a16dac68
...@@ -505,7 +505,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -505,7 +505,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
if(!empty($ordersCount) && !empty($refundLists)){ if(!empty($ordersCount) && !empty($refundLists)){
foreach($ordersCount as &$order){ foreach($ordersCount as &$order){
foreach($refundLists as $refund){ foreach($refundLists as $refund){
if($order['buyerId']==$refund['buyerId'] and $order['storeId']==$refund['storeId']){ if($order['buyerId']==$refund['buyerId'] && $order['storeId']==$refund['storeId']){
$order['orderTotal']=$order['orderTotal']-$refund['refundTotal']; $order['orderTotal']=$order['orderTotal']-$refund['refundTotal'];
} }
} }
......
...@@ -436,7 +436,6 @@ class RefundReturnModel extends \DAO\AbstractModel { ...@@ -436,7 +436,6 @@ class RefundReturnModel extends \DAO\AbstractModel {
public function getMemberStoreStaticsByGmtUpdate($gmtUpdate,$pageIndex,$pageSize){ public function getMemberStoreStaticsByGmtUpdate($gmtUpdate,$pageIndex,$pageSize){
$this->setDb($this->dbName); $this->setDb($this->dbName);
$where =\Our\Common::format(' gmt_update>={0} and gmt_update<{1} and refund_state={2}',$gmtUpdate,TIMESTAMP,ApiConst::refundStateComplete); $where =\Our\Common::format(' gmt_update>={0} and gmt_update<{1} and refund_state={2}',$gmtUpdate,TIMESTAMP,ApiConst::refundStateComplete);
echo $where.'|'.$this->sumField.$pageIndex.$pageSize.';';
$res=$this->lists($where,array('gmt_update'=>'asc'),$this->sumField,$pageIndex,$pageSize); $res=$this->lists($where,array('gmt_update'=>'asc'),$this->sumField,$pageIndex,$pageSize);
return $res['list']?$res:false; return $res['list']?$res:false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment