收支核对修改
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
* @Author: kangkang
|
||||
* @Date: 2020-10-03 18:23:43
|
||||
* @LastEditors: kangkang
|
||||
* @LastEditTime: 2020-10-24 14:52:12
|
||||
* @LastEditTime: 2020-10-26 11:45:39
|
||||
*/
|
||||
$is_script = 1;
|
||||
include __DIR__ . '/../index.php';
|
||||
@@ -37,20 +37,25 @@ $today = date('Y-m-d', time());
|
||||
$yesterday = date('Y-m-d', (time() - 86400));
|
||||
$data['user_balance'] = $user->field('SUM(`RestAmount`) AS balance')->fetch()['balance'];
|
||||
|
||||
$where = ['UpdateTime' => [['<', $today],['>', $yesterday]]];
|
||||
$where1 = ['UpdateTime' => ['<', $today]];
|
||||
$where2 = ['UpdateTime' => ['>', $yesterday]];
|
||||
|
||||
$data['ali_invest'] = $charge_order_model
|
||||
->field('SUM(`OrderAmount`) AS ali_invest')
|
||||
->wheres(['TradeNo' => ['like', '2020%'], 'OrderState' => ['in', $charge_order_enum::$PayComplete], 'UpdateTime' => [['<', date('Y-m-d', time())],['>', date('Y-m-d', (time() - 86400))]]])
|
||||
->where(['TradeNo' => ['like', '2020%'], 'OrderState' => ['in', $charge_order_enum::$PayComplete], 'UpdateTime' => ['<', $today]])
|
||||
->where(['UpdateTime' => ['>', $yesterday]])
|
||||
->fetch()["ali_invest"] ?? 0;
|
||||
|
||||
$data['wechat_invest'] = $charge_order_model
|
||||
->field('SUM(`OrderAmount`) AS wechat_invest')
|
||||
->wheres(['TradeNo' => ['like', '4200%'], 'OrderState' => ['in', $charge_order_enum::$PayComplete], 'UpdateTime' => [['<', date('Y-m-d', time())],['>', date('Y-m-d', (time() - 86400))]]])
|
||||
->where(['TradeNo' => ['like', '4200%'], 'OrderState' => ['in', $charge_order_enum::$PayComplete], 'UpdateTime' => ['<', $today]])
|
||||
->where(['UpdateTime' => ['>', $yesterday]])
|
||||
->fetch()["wechat_invest"] ?? 0;
|
||||
|
||||
$invest_info = $score_model
|
||||
->field('ScoreType,SUM(`ScoreValue`) AS money')
|
||||
->wheres($where)
|
||||
->where($where1)
|
||||
->where($where2)
|
||||
->group(['ScoreType'])
|
||||
->fetchAll();
|
||||
|
||||
@@ -78,10 +83,11 @@ foreach ($invest_info as $v) {
|
||||
}
|
||||
}
|
||||
|
||||
$pay_info_where = array_merge($where, ['OrderState' => ['in', $product_order_enum::$PayComplete]]);
|
||||
$pay_info_where = array_merge($where2, ['OrderState' => ['in', $product_order_enum::$PayComplete]]);
|
||||
$pay_info = $product_order_model
|
||||
->field('PayType,SUM(`PaymentAmount`) AS money')
|
||||
->wheres($pay_info_where)
|
||||
->where($where1)
|
||||
->where($pay_info_where)
|
||||
->group(['PayType'])
|
||||
->fetchAll();
|
||||
foreach ($pay_info as $v) {
|
||||
@@ -97,10 +103,11 @@ foreach ($pay_info as $v) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
$amount_info_where = array_merge($where, ['OrderState' => ['in', $product_order_enum::$PayComplete]]);
|
||||
$amount_info_where = array_merge($where2, ['OrderState' => ['in', $product_order_enum::$PayComplete]]);
|
||||
$amount_info = $product_order_model
|
||||
->field('OrderType,SUM(`PaymentAmount`) AS money')
|
||||
->wheres($amount_info_where)
|
||||
->where($where1)
|
||||
->where($amount_info_where)
|
||||
->group(['OrderType'])
|
||||
->fetchAll();
|
||||
|
||||
@@ -119,7 +126,8 @@ foreach ($amount_info as $v) {
|
||||
}
|
||||
$data['refund_amount'] = $product_order_model
|
||||
->field('SUM(`RefundAmount`) AS refund_amount')
|
||||
->wheres(array_merge($where, ['OrderState' => ['in', $product_order_enum::$Refunds]]))
|
||||
->where($where1)
|
||||
->where(array_merge($where2, ['OrderState' => ['in', $product_order_enum::$Refunds]]))
|
||||
->fetch()["refund_amount"] ?? 0;
|
||||
//获取昨天的数据
|
||||
$yestoday_user_balance = $income_check_model->getNewOne()['user_balance'] ?? 0;
|
||||
@@ -136,5 +144,5 @@ $data['sell_monet'] = $data['new_amount'] + $data['renew_amount'] - $data['refun
|
||||
$data['income'] = $data['ali_invest'] + $data['wechat_invest'] - $data['taobao_invest'] + $data['ali_pay'] + $data['wechat_pay'];
|
||||
$data['expend'] = $data['cash_out'] + $data['taobao_refund'] - $data['cash_out_refund'];
|
||||
$data['day_time'] = date('Y-m-d H:i:s');
|
||||
// dump($data);die;
|
||||
dump($data);die;
|
||||
$income_check_model->add($data);
|
||||
|
||||
Reference in New Issue
Block a user