From be1e3067ec2942d4cab6e4c80df6c8ae4900ec40 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Wed, 5 Jun 2024 18:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=86=99=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreFinanceFlowLists.php | 39 +++++++++----- app/common/logic/PayNotifyLogic.php | 5 +- app/common/logic/StoreFinanceFlowLogic.php | 4 +- .../controller/finance/FinanceController.php | 51 +++++++++++++++++++ 4 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 app/store/controller/finance/FinanceController.php diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index f41563b4..8f0c8fe7 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -46,22 +46,37 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt public function lists(): array { return StoreFinanceFlow::where($this->searchWhere) + ->when(!empty($this->params['start_time']), function ($query) { + $query->whereTime('create_time', '>=', $this->params['start_time']); + }) + ->when(!empty($this->params['end_time']), function ($query) { + if ($this->params['end_time'] == $this->params['start_time']) { + $this->params['end_time'] = strtotime($this->params['end_time']) + 86399; + } + $query->whereTime('create_time', '<=', $this->params['end_time']); + }) + ->when(!empty($this->request->adminInfo['store_id']), function ($query) { + $query->where('store_id', '=', $this->request->adminInfo['store_id']); + }) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { - if($item['user_id']<=0){ - $item['nickname']='游客'; - }else{ - $item['nickname']=User::where('id',$item['user_id'])->value('nickname'); + if ($item['user_id'] <= 0) { + $item['nickname'] = '游客'; + } else { + $item['nickname'] = User::where('id', $item['user_id'])->value('nickname'); } - if($item['financial_pm']==0){ - $item['number']='-'.$item['number']; - }else{ - $item['number']='+'.$item['number']; + if (!empty($this->request->adminInfo['store_id'])) { + $item['financial_pm'] = $item['financial_pm'] == 0 ? 1 : 0; } - $item['staff_name']=SystemStoreStaff::where('id',$item['staff_id'])->value('staff_name'); - $item['pay_type_name']=PayEnum::getPaySceneDesc($item['pay_type']); - $item['financial_type_name']=OrderEnum::getFinancialType($item['financial_type']); + if ($item['financial_pm'] == 0) { + $item['number'] = '-' . $item['number']; + } else { + $item['number'] = '+' . $item['number']; + } + $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); + $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']); + $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']); }) ->toArray(); } @@ -78,4 +93,4 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt return StoreFinanceFlow::where($this->searchWhere)->count(); } -} \ No newline at end of file +} diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index d30c7de4..0a38dcec 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -151,7 +151,6 @@ class PayNotifyLogic extends BaseLogic if (!$order->save()) { throw new \Exception('订单保存出错'); } - self::afterPay($order); } /** @@ -204,9 +203,9 @@ class PayNotifyLogic extends BaseLogic $financeLogic->user = ['uid' => $order['uid']]; if ($order->pay_type != 9 || $order->pay_type != 10) { $financeLogic->in($transaction_id,$order['pay_price'], OrderEnum::USER_ORDER_PAY); + $financeLogic->out($transaction_id,$order['pay_price'], OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0); + $financeLogic->save(); } - $financeLogic->out($transaction_id,$order['pay_price'], OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0); - $financeLogic->save(); } //等级处理 diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php index 838abece..7a4c6c60 100644 --- a/app/common/logic/StoreFinanceFlowLogic.php +++ b/app/common/logic/StoreFinanceFlowLogic.php @@ -26,7 +26,7 @@ class StoreFinanceFlowLogic extends BaseLogic */ public function out($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1) { - $this->setData($number, $financialType, 1, $storeId, $staffId, $status,$transaction_id); + $this->setData($number, $financialType, 0, $storeId, $staffId, $status,$transaction_id); } /** @@ -40,7 +40,7 @@ class StoreFinanceFlowLogic extends BaseLogic */ public function in($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1) { - $this->setData($number, $financialType, 0, $storeId, $staffId, $status,$transaction_id); + $this->setData($number, $financialType, 1, $storeId, $staffId, $status,$transaction_id); } public function setData($number, $financialType, $pm, $storeId, $staffId, $status,$transaction_id) diff --git a/app/store/controller/finance/FinanceController.php b/app/store/controller/finance/FinanceController.php new file mode 100644 index 00000000..99e20b9e --- /dev/null +++ b/app/store/controller/finance/FinanceController.php @@ -0,0 +1,51 @@ + 'id', 'desc' => 'ID', 'type' => 'int'], + ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], + ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], + ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], + ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], + ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], + ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], + ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], + ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], + ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], + ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], + ['name' => 'price', 'desc' => '单价', 'type' => 'string'], + ]], + ]], + ]), + ] + public function lists() + { + return $this->dataLists(new StoreFinanceFlowLists()); + } + +}