From 5d95bac351706e92a2a9c35dfa739fe3534052b9 Mon Sep 17 00:00:00 2001 From: wanyongkang <937888580@qq.com> Date: Wed, 28 Oct 2020 15:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=98=E5=AE=9D=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/order/controller/TbRefund.php | 15 ++++++++++----- script/income_check_script.php | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/order/controller/TbRefund.php b/app/order/controller/TbRefund.php index 17b7ff1..7c14632 100644 --- a/app/order/controller/TbRefund.php +++ b/app/order/controller/TbRefund.php @@ -5,7 +5,7 @@ * @Author: kangkang * @Date: 2020-10-13 19:52:37 * @LastEditors: kangkang - * @LastEditTime: 2020-10-23 11:20:28 + * @LastEditTime: 2020-10-28 14:58:56 */ namespace app\order\controller; @@ -57,9 +57,10 @@ class TbRefund extends Controller if (!$_GET) { die; } + $page = ($_GET['page'] - 1) * 50; $refund = new RefundMOdel; $userModel = new UserModel; - $get_list = $refund->getListPage([],'*','Modified desc'); + $get_list = $refund->getListPage([],'*','Modified desc', "$page,50"); $user_phone = []; $lists = []; $list = []; @@ -148,12 +149,15 @@ class TbRefund extends Controller $user_info = $userModel->getOne('LoginCode = '.$refund_info['Phone'].' OR Phone='.$refund_info['Phone']); //判断余额是否大于退款金额 $returnOk = $user_info['RestAmount'] - $refund_info["RefundFee"]; + if ($returnOk < 0) { \result([], '余额不足', 20000); } else { - $update_data['f_balance'] = $user_info['RestAmount']; + $update_data['f_balance'] = $returnOk; if ($refund->updateOne(['Id' => $id], $update_data)) { - $userModel->updateOne('LoginCode = '.$refund_info['Phone'].' OR Phone='.$refund_info['Phone'], ['RestAmount' => $returnOk]); + $user_update['RestAmount'] = $returnOk; + $fff=$userModel->updateOne("LoginCode = '".$refund_info['Phone']."' OR Phone='".$refund_info['Phone']."'", $user_update); + //记录资金明细 $score_data = [ 'UserId' => $user_info['Id'], @@ -178,9 +182,10 @@ class TbRefund extends Controller $return = [ 'Code' => 30000, 'msg' => '操作成功', - 'balance' => $update_data['f_balance'], + 'balance' => $fff?$returnOk:$update_data['f_balance'], ]; echo json_encode($return); } + } diff --git a/script/income_check_script.php b/script/income_check_script.php index 04638ef..2b742d7 100644 --- a/script/income_check_script.php +++ b/script/income_check_script.php @@ -5,7 +5,7 @@ * @Author: kangkang * @Date: 2020-10-03 18:23:43 * @LastEditors: kangkang - * @LastEditTime: 2020-10-26 12:19:59 + * @LastEditTime: 2020-10-28 10:29:17 */ $is_script = 1; include __DIR__ . '/../index.php'; @@ -132,17 +132,19 @@ $data['refund_amount'] = $product_order_model //获取昨天的数据 $yestoday_user_balance = $income_check_model->getNewOne()['user_balance'] ?? 0; //base＝次日会员余额一当日会员余额＋支付宝充值＋微信充值＋淘宝充值＋管理员充值＋退款金额一管理员扣除一提现一淘宝退款扣除 -$base_money = $data['user_balance'] - $yestoday_user_balance + $data['ali_invest'] + $data['wechat_invest'] + $data['taobao_invest'] + $data['manager_invest'] + $data['refund_amount'] - $data['manager_deduct'] - $data['cash_out'] - $data['taobao_refund'] + $data['cash_out_refund']; -//余额差值＝次日会员余额一当日会员余额＋支付宝充值＋微信充值＋淘宝充值＋管理员充值＋退款金额一管理员扣除一提现一淘宝退款扣除 一余额支付 -//收支差值＝次日会员余额一当日会员余额＋支付宝充值＋微信充值＋淘宝充值＋管理员充值＋退款金额一管理员扣除一提现一淘宝退款扣除 ＋余额支付＋支付宝支付＋微信支付一新开金额一续费金额 +$base_money = $yestoday_user_balance - $data['user_balance'] + $data['ali_invest'] + $data['wechat_invest'] + $data['taobao_invest'] + $data['manager_invest'] + $data['refund_amount'] - $data['manager_deduct'] - $data['cash_out'] - $data['taobao_refund'] + $data['cash_out_refund']; +// 余额差值＝次日会员余额一当日会员余额＋支付宝充值＋微信充值＋淘宝充值＋管理员充值＋退款金额一管理员扣除一提现一淘宝退款扣除 一余额支付 +// update 余额差值=当日0点会员余额-当日24点会员余额+支付宝充+微信充+淘宝充+管理员充+退款金额+提现拒绝返还-管理员扣除-提现扣除-淘宝退款扣除-余额支付 +// 收支差值＝次日会员余额一当日会员余额＋支付宝充值＋微信充值＋淘宝充值＋管理员充值＋退款金额一管理员扣除一提现一淘宝退款扣除 ＋余额支付＋支付宝支付＋微信支付一新开金额一续费金额 +//10月26日需修改为：支付差值=余额支付+支付宝付+微信付一新开金额一续费金额 //当日销售额=新开金额＋续费金额一退货金额 //当日在总进账＝支付宝充值＋微信充值＋淘宝充值＋支付宝支付＋微信支付 //当日总支出=提现扣除金额＋淘宝扣除金额 $data['balance_diff'] = $base_money - $data['balance_pay']; -$data['in_out_diff'] = $base_money + $data['balance_pay'] + $data['ali_pay'] + $data['wechat_pay'] - $data['new_amount'] - $data['renew_amount']; +$data['in_out_diff'] = $data['balance_pay'] + $data['ali_pay'] + $data['wechat_pay'] - $data['new_amount'] - $data['renew_amount']; $data['sell_monet'] = $data['new_amount'] + $data['renew_amount'] - $data['refund_amount']; -$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['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['day_time'] = date('Y-m-d H:i:s'); -dump($data);die; + $income_check_model->add($data);