From 2e548361b132b8d81c8294d5f64e8c7648ec94aa Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Wed, 2 Mar 2022 16:49:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/order/StoreOrderRefundController.php | 15 +++++++++++++++ crmeb/app/api/route/v1.php | 1 + crmeb/app/dao/order/StoreOrderDao.php | 2 +- crmeb/app/model/user/UserMoney.php | 9 +++++++++ .../services/order/StoreOrderCreateServices.php | 4 ++-- crmeb/app/services/user/UserMoneyServices.php | 1 + crmeb/app/services/user/UserServices.php | 11 +++++++---- 7 files changed, 36 insertions(+), 7 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php b/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php index ee8add2cc..17bc6fb99 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php @@ -93,4 +93,19 @@ class StoreOrderRefundController else return app('json')->fail('提交失败'); } + + /** + * 删除退款单 + * @param Request $request + * @param $order_id + * @return mixed + */ + public function delRefund(Request $request, $uni) + { + $res = $this->services->update(['order_id' => $uni, 'uid' => $request->uid()], ['is_del' => 1]); + if ($res) + return app('json')->successful('删除成功'); + else + return app('json')->fail('删除失败'); + } } diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index 836e07274..8598feab9 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -243,6 +243,7 @@ Route::group(function () { Route::get('order/refund/detail/:uni', 'v1.order.StoreOrderRefundController/refundDetail')->name('refundDetail');//退款单详情 Route::post('order/refund/cancel/:uni', 'v1.order.StoreOrderRefundController/cancelApply')->name('cancelApply');//用户取消退款申请 Route::post('order/refund/express', 'v1.order.StoreOrderRefundController/applyExpress')->name('refundDetail');//退款单详情 + Route::get('order/refund/del/:uni', 'v1.order.StoreOrderRefundController/delRefund')->name('delRefund');//用户取消退款申请 /** 代理商相关 */ Route::get('agent/apply/info', 'v1.user.DivisionController/applyInfo')->name('申请详情');//申请详情 diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php index 9e63ee27e..ec7f61abb 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -359,7 +359,7 @@ class StoreOrderDao extends BaseDao */ public function storeOrderCount() { - return $this->search(['paid' => 1, 'is_del' => 0, 'refund_status' => 0, 'status' => 1, 'shipping_type' => 1])->count(); + return $this->search(['paid' => 1, 'is_del' => 0, 'refund_status' => 0, 'status' => 1, 'shipping_type' => 1, 'pid' => 0])->count(); } /** diff --git a/crmeb/app/model/user/UserMoney.php b/crmeb/app/model/user/UserMoney.php index 0cfebdc51..373750be1 100644 --- a/crmeb/app/model/user/UserMoney.php +++ b/crmeb/app/model/user/UserMoney.php @@ -43,6 +43,15 @@ class UserMoney extends BaseModel if ($value != '') $query->where('type', $value); } + /** + * @param Model $query + * @param $value + */ + public function searchNotTypeAttr($query, $value) + { + if (is_array($value) && count($value)) $query->whereNotIn('type', $value); + } + /** * @param Model $query * @param $value diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index b59af21e0..226647bf2 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -661,8 +661,8 @@ class StoreOrderCreateServices extends BaseServices $agentLevelServices = app()->make(AgentLevelServices::class); [$one_brokerage_up, $two_brokerage_up, $spread_one_uid, $spread_two_uid] = $agentLevelServices->getAgentLevelBrokerage($uid); - $BrokerageOne = sys_config('store_brokerage_ratio') != '' ?: 0; - $BrokerageTwo = sys_config('store_brokerage_two') != '' ?: 0; + $BrokerageOne = sys_config('store_brokerage_ratio') != '' ? sys_config('store_brokerage_ratio') : 0; + $BrokerageTwo = sys_config('store_brokerage_two') != '' ? sys_config('store_brokerage_two') : 0; $storeBrokerageRatio = $BrokerageOne + (($BrokerageOne * $one_brokerage_up) / 100); $storeBrokerageTwo = $BrokerageTwo + (($BrokerageTwo * $two_brokerage_up) / 100); diff --git a/crmeb/app/services/user/UserMoneyServices.php b/crmeb/app/services/user/UserMoneyServices.php index 2c666341d..77d8b36e7 100644 --- a/crmeb/app/services/user/UserMoneyServices.php +++ b/crmeb/app/services/user/UserMoneyServices.php @@ -341,6 +341,7 @@ class UserMoneyServices extends BaseServices $where['pm'] = 0; } elseif ($type == 2) { $where['pm'] = 1; + $where['not_type'] = ['pay_product_refund']; } $list = $this->dao->getList($where, $page, $limit); $count = $this->dao->count($where); diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index 2a124159e..17dc691cb 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -1392,13 +1392,13 @@ class UserServices extends BaseServices $messageSystemServices = app()->make(MessageSystemServices::class); /** @var DiyServices $diyServices */ $diyServices = app()->make(DiyServices::class); + /** @var AgentLevelServices $agentLevelServices */ + $agentLevelServices = app()->make(AgentLevelServices::class); //看付费会员是否开启 $isOpenMember = $memberCardService->isOpenMemberCard(); $user['is_open_member'] = $isOpenMember; $user['agent_level_name'] = ''; if ($user['agent_level']) { - /** @var AgentLevelServices $agentLevelServices */ - $agentLevelServices = app()->make(AgentLevelServices::class); $levelInfo = $agentLevelServices->getLevelInfo((int)$user['agent_level'], 'id,name'); $user['agent_level_name'] = $levelInfo && $levelInfo['name'] ? $levelInfo['name'] : ''; } @@ -1415,8 +1415,10 @@ class UserServices extends BaseServices /** @var UserMoneyServices $userMoney */ $userMoney = app()->make(UserMoneyServices::class); - $user['recharge'] = $userMoney->sum(['uid' => $uid, 'pm' => 1], 'number'); - $user['orderStatusSum'] = $userMoney->sum(['uid' => $uid, 'pm' => 0], 'number'); + $user['recharge'] = $userMoney->sum([ + ['uid', '=', $uid], ['pm', '=', 1], ['type', 'in', ['recharge', 'system_add', 'extract']] + ], 'number'); + $user['orderStatusSum'] = bcsub((string)$user['recharge'], (string)$user['now_money'], 2); $user['extractTotalPrice'] = $userExtract->getExtractSum(['uid' => $uid, 'status' => 1]);//累计提现 $user['extractPrice'] = $user['brokerage_price'];//可提现 $user['statu'] = (int)sys_config('store_brokerage_statu'); @@ -1499,6 +1501,7 @@ class UserServices extends BaseServices $user['spread_level_count'] = $agentLevel->count(['status' => 1, 'is_del' => 0]); $user['extract_type'] = sys_config('extract_type'); $user['integral'] = intval($user['integral']); + $user['is_agent_level'] = $agentLevelServices->count(['status' => 1, 'is_del' => 0]) > 0 ? 1 : 0; return $user; }