diff --git a/app/common/dao/user/UserBillDao.php b/app/common/dao/user/UserBillDao.php index 96a841c..e5e3b80 100644 --- a/app/common/dao/user/UserBillDao.php +++ b/app/common/dao/user/UserBillDao.php @@ -139,6 +139,22 @@ class UserBillDao extends BaseDao $refundPrice = bcadd($refundPrice, $billTwo['number'], 2); } + // 合伙人分红 + $commissionPartnerList = UserBill::getDB()->where('category', 'brokerage') + ->whereIn('type', ['commission_partner']) + ->where('uid', $uid) + ->where('status', 0) + ->field('link_id,number') + ->select() + ->toArray(); + // if (count($lst)) { + // $refundPrice = -1 * UserBill::getDB()->whereIn('link_id', array_column($lst, 'link_id'))->where('uid', $uid) + // ->where('category', 'brokerage')->whereIn('type', ['refund_two', 'refund_one'])->sum('number'); + // } + foreach ($commissionPartnerList as $billThree) { + $refundPrice = bcadd($refundPrice, $billThree['number'], 2); + } + return $refundPrice; } diff --git a/app/common/repositories/store/platformCommission/RecordRepository.php b/app/common/repositories/store/platformCommission/RecordRepository.php index a9b8be8..38cfed7 100644 --- a/app/common/repositories/store/platformCommission/RecordRepository.php +++ b/app/common/repositories/store/platformCommission/RecordRepository.php @@ -111,6 +111,7 @@ class RecordRepository extends BaseRepository{ public function getTotalCommission($startTime,$endTime):float{ return (float)$this->dao->getSearch([]) ->whereBetweenTime('create_time', $startTime, $endTime) + ->where('commission_partner_status',0) ->sum('commission_partner_money'); } /** diff --git a/app/common/repositories/user/UserBillRepository.php b/app/common/repositories/user/UserBillRepository.php index 9fe3e07..ded28d4 100644 --- a/app/common/repositories/user/UserBillRepository.php +++ b/app/common/repositories/user/UserBillRepository.php @@ -34,7 +34,7 @@ class UserBillRepository extends BaseRepository 'brokerage/order_two' => '获得二级推广佣金', 'brokerage/refund_one' => '退还一级佣金', 'brokerage/refund_two' => '退还二级佣金', - 'brokerage/commission_partner' => '权重值分红',// 权重值分红 + 'brokerage/commission_partner' => '权重值分红',// 合伙人佣金 'brokerage/commission_merchants' => '招商员佣金', 'brokerage/commission_promoter' => '推广员佣金', 'integral/cancel' => '退回积分',