|
@@ -110,11 +110,9 @@ class UserRecharge extends BaseModel
|
|
|
if (!$order) return false;
|
|
|
$user = User::getUserInfo($order['uid']);
|
|
|
self::beginTrans();
|
|
|
- if($user['level']==0) {
|
|
|
+ if ($user['level'] == 0) {
|
|
|
$price = bcadd($order['price'], $order['give_price'], 2);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
+ } else {
|
|
|
$price = bcadd($order['price'], $order['give_price'], 2);
|
|
|
}
|
|
|
|
|
@@ -143,17 +141,17 @@ class UserRecharge extends BaseModel
|
|
|
$user = User::getUserInfo($uid);
|
|
|
self::beginTrans();
|
|
|
try {
|
|
|
- $broken_time = intval(sys_config('extract_time'));
|
|
|
+ $broken_time = intval(sys_config('extract_time', 0, true));
|
|
|
$search_time = time() - 86400 * $broken_time;
|
|
|
|
|
|
|
|
|
$brokerage_commission = UserBill::where(['uid' => $uid, 'category' => 'now_money', 'type' => 'brokerage'])
|
|
|
- ->where('add_time', '>', $search_time)
|
|
|
+ ->where('add_time', '>', date("Y-m-d H:i:s", $search_time))
|
|
|
->where('pm', 1)
|
|
|
->sum('number');
|
|
|
|
|
|
$refund_commission = UserBill::where(['uid' => $uid, 'category' => 'now_money', 'type' => 'brokerage'])
|
|
|
- ->where('add_time', '>', $search_time)
|
|
|
+ ->where('add_time', '>', date("Y-m-d H:i:s", $search_time))
|
|
|
->where('pm', 0)
|
|
|
->sum('number');
|
|
|
$broken_commission = bcsub($brokerage_commission, $refund_commission, 2);
|