|
@@ -556,7 +556,7 @@ class PartnerTools{
|
|
|
$where["customerId"] = $customerId;
|
|
$where["customerId"] = $customerId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $data = $this->dbNewCommissionDetail->select(["customerId"=>$customerId], "*", "id desc", $parms["limit"], $parms["offset"]);
|
|
|
|
|
|
|
+ $data = $this->dbNewCommissionDetail->select($where, "*", "id desc", $parms["limit"], $parms["offset"]);
|
|
|
$total = $this->dbNewCommissionDetail->count($where);
|
|
$total = $this->dbNewCommissionDetail->count($where);
|
|
|
if(empty($data)){
|
|
if(empty($data)){
|
|
|
$data = [];
|
|
$data = [];
|
|
@@ -575,7 +575,7 @@ class PartnerTools{
|
|
|
if(!empty($customerId)){
|
|
if(!empty($customerId)){
|
|
|
$where["customerId"] = $customerId;
|
|
$where["customerId"] = $customerId;
|
|
|
}
|
|
}
|
|
|
- $data = $this->dbNewCommissionBalanceDetail->select(["customer_id"=>$customerId], "*", "id desc", $parms["limit"], $parms["offset"]);
|
|
|
|
|
|
|
+ $data = $this->dbNewCommissionBalanceDetail->select($where, "*", "id desc", $parms["limit"], $parms["offset"]);
|
|
|
$total = $this->dbNewCommissionBalanceDetail->count($where);
|
|
$total = $this->dbNewCommissionBalanceDetail->count($where);
|
|
|
if(empty($data)){
|
|
if(empty($data)){
|
|
|
$data = [];
|
|
$data = [];
|
|
@@ -723,10 +723,13 @@ class PartnerTools{
|
|
|
*/
|
|
*/
|
|
|
public function getPartnerApplyCashList($customerId,$parms){
|
|
public function getPartnerApplyCashList($customerId,$parms){
|
|
|
$where=[];
|
|
$where=[];
|
|
|
|
|
+ if(!empty($parms["where"])){
|
|
|
|
|
+ $where= $parms["where"];
|
|
|
|
|
+ }
|
|
|
if(!empty($customerId)){
|
|
if(!empty($customerId)){
|
|
|
$where["customerId"] = $customerId;
|
|
$where["customerId"] = $customerId;
|
|
|
}
|
|
}
|
|
|
- $data = $this->dbNewCommissionCash->select(["customer_id"=>$customerId], "*", "id desc", $parms["limit"], $parms["offset"]);
|
|
|
|
|
|
|
+ $data = $this->dbNewCommissionCash->select($where, "*", "id desc", $parms["limit"], $parms["offset"]);
|
|
|
$total = $this->dbNewCommissionCash->count($where);
|
|
$total = $this->dbNewCommissionCash->count($where);
|
|
|
if(empty($data)){
|
|
if(empty($data)){
|
|
|
$data = [];
|
|
$data = [];
|