diff --git a/app/common/repositories/system/HuitongRepository.php b/app/common/repositories/system/HuitongRepository.php index 785b1fc..fc5f30f 100644 --- a/app/common/repositories/system/HuitongRepository.php +++ b/app/common/repositories/system/HuitongRepository.php @@ -16,6 +16,7 @@ use app\common\dao\system\HuitongDao; use app\common\repositories\BaseRepository; use app\common\repositories\store\order\StoreOrderBaseRepository; use app\common\repositories\user\UserAssetsRepository; +use think\facade\Log; /** @@ -48,10 +49,11 @@ class HuitongRepository extends BaseRepository * @var StoreOrderBaseRepository $orderBase */ $orderBase = app()->make(StoreOrderBaseRepository::class); - $count = $orderBase->getTotalBase(); + $count = $orderBase->getTotalBase(date('Y-m-d', strtotime('-1day'))); if (empty($count)) { return; } + Log::info("+++++++"); $base = round($config['huitong_add'] * $count / 100, 2); if ($base < 0.01) { $base = 0.01; diff --git a/app/common/repositories/system/merchant/FinancialRecordRepository.php b/app/common/repositories/system/merchant/FinancialRecordRepository.php index 55890f7..d3cea48 100644 --- a/app/common/repositories/system/merchant/FinancialRecordRepository.php +++ b/app/common/repositories/system/merchant/FinancialRecordRepository.php @@ -209,6 +209,7 @@ class FinancialRecordRepository extends BaseRepository $extract_minimum_line = systemConfig('extract_minimum_line'); //商户可提现金额 $_line = bcsub($mer_money,$extract_minimum_line,2); + $_line = max($_line, 0); //退款支出金额 $refund_order = $this->dao->search($where)->where('financial_type','refund_order')->sum('number'); diff --git a/app/common/repositories/user/UserAssetsLogRepository.php b/app/common/repositories/user/UserAssetsLogRepository.php index 741255e..0ba7674 100644 --- a/app/common/repositories/user/UserAssetsLogRepository.php +++ b/app/common/repositories/user/UserAssetsLogRepository.php @@ -761,7 +761,7 @@ class UserAssetsLogRepository extends BaseRepository $item['user_nickname'] = $user['nickname']; $item['user_phone'] = $user['phone']; }else{ - $item['user_nickname'] = '未知'; + $item['user_nickname'] = '平台'; $item['user_phone'] = '未知'; } $list[] = $item;