@@ -409,7 +409,7 @@ class OrderModel extends \DAO\AbstractModel
...
@@ -409,7 +409,7 @@ class OrderModel extends \DAO\AbstractModel
if(is_array($memberIds)){
if(is_array($memberIds)){
$memberIds=implode(',',$memberIds);
$memberIds=implode(',',$memberIds);
}
}
$where=Common::format(" store_id in({0}) and buyer_id in({1}) and order_state not in({2})",$storeIds,$memberIds,'-1,0');
$where=Common::format(" store_id in({0}) and buyer_id in({1}) and order_state not in({2}) and refund_amount={3}",$storeIds,$memberIds,'-1,0',ApiConst::zero);
$res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,(SUM(order_amount)) AS orderTotal")->group('buyer_id')->group('store_id')->fetchAll();
$res=$this->db->from($this->_tableName)->where($where)->select(" buyer_id as buyerId,store_id as storeId,(SUM(order_amount)) AS orderTotal")->group('buyer_id')->group('store_id')->fetchAll();
return$res;
return$res;
}
}
...
@@ -848,6 +848,8 @@ class OrderModel extends \DAO\AbstractModel
...
@@ -848,6 +848,8 @@ class OrderModel extends \DAO\AbstractModel
public$sumField='sum(order_total) as orderTotal,count(*) as orderGoodsCount';
public$field="fav_type as favType,member_id as memberId,member_mobile as memberMobile,is_backlist as isBacklist,fav_time as favTime,member_avatar as memberAvatar,member_name as memberName,order_total as orderTotal,order_goods_count as orderGoodsCount";
public$field="fav_type as favType,member_id as memberId,member_mobile as memberMobile,is_backlist as isBacklist,fav_time as favTime,member_avatar as memberAvatar,member_name as memberName,order_total as orderTotal,order_goods_count as orderGoodsCount";
/**
/**
...
@@ -130,7 +131,7 @@ class MemberFavoritesStoreStoreMemberStatisticsModel extends \DAO\AbstractModel
...
@@ -130,7 +131,7 @@ class MemberFavoritesStoreStoreMemberStatisticsModel extends \DAO\AbstractModel