From 054258a4504552af4d88e938a6263ace2f579934 Mon Sep 17 00:00:00 2001 From: yaosen <741606767@qq.com> Date: Fri, 28 Jun 2024 17:30:56 +0800 Subject: [PATCH] a --- .idea/inspectionProfiles/Project_Default.xml | 6 + admin/src/router/index.js | 97 ++-- .../dashboard/admin/components/PanelGroup.vue | 10 +- admin/src/views/order/abandoned.vue | 535 +++++++++++++++++ admin/src/views/order/used.vue | 538 ++++++++++++++++++ admin/src/views/qa/problem.vue | 306 +++++----- admin/src/views/qa/qa.vue | 42 +- .../app/admin/controller/IndexController.php | 72 ++- .../app/admin/controller/OrderController.php | 18 +- service/app/admin/controller/QaController.php | 49 +- service/app/model/Orders.php | 8 +- service/app/model/QaQuestions.php | 8 + service/app/model/Qas.php | 5 + 13 files changed, 1448 insertions(+), 246 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 admin/src/views/order/abandoned.vue create mode 100644 admin/src/views/order/used.vue create mode 100644 service/app/model/QaQuestions.php diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..03d9549e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/admin/src/router/index.js b/admin/src/router/index.js index 56f77af6..49102804 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -162,12 +162,21 @@ export const asyncRoutes = [ } }, { - path: 'product', - component: () => import('@/views/order/product'), - name: 'productNameList', + path: 'abandoned', + component: () => import('@/views/order/abandoned'), + name: 'OrderBack', meta: { - title: '产品统计', - roles: ['order_pub', 'editor'] + title: '已放弃订单', + roles: ['order_back', 'editor'] + } + }, + { + path: 'used', + component: () => import('@/views/order/used'), + name: 'OrderBack', + meta: { + title: '已使用订单', + roles: ['order_back', 'editor'] } }, ] @@ -198,7 +207,7 @@ export const asyncRoutes = [ component: () => import('@/views/qa/qa.vue'), name: 'qa', meta: { - title: 'QA列表', + title: 'QA管理列表', roles: ['admin'] } }, @@ -207,45 +216,12 @@ export const asyncRoutes = [ component: () => import('@/views/qa/city.vue'), name: 'city', meta: { - title: '城市列表', + title: '城市管理列表', roles: ['admin'] } } ] }, - { - path: '/log', - component: Layout, - redirect: '/log/index', - alwaysShow: true, - name: 'Log', - meta: { - title: '日志记录', - icon: 'nested', - roles: ['follow_index', 'log_index', 'editor'] - }, - children: [ - { - path: 'follow', - component: () => import('@/views/log/follow'), - name: 'Follow', - meta: { - title: '跟进记录', - roles: ['follow_index', 'editor'] - } - }, - { - path: 'index', - component: () => import('@/views/log/index'), - name: 'LogIndex', - meta: { - title: '日志记录', - roles: ['log_index'] - } - } - ] - }, - { path: '/data', component: Layout, @@ -258,6 +234,15 @@ export const asyncRoutes = [ roles: ['data_index'] }, children: [ + { + path: 'product', + component: () => import('@/views/order/product'), + name: 'productNameList', + meta: { + title: '产品统计', + roles: ['order_pub', 'editor'] + } + }, { path: 'index', component: () => import('@/views/data/index'), @@ -295,8 +280,38 @@ export const asyncRoutes = [ } } ] + },{ + path: '/log', + component: Layout, + redirect: '/log/index', + alwaysShow: true, + name: 'Log', + meta: { + title: '日志记录', + icon: 'nested', + roles: ['follow_index', 'log_index', 'editor'] + }, + children: [ + { + path: 'follow', + component: () => import('@/views/log/follow'), + name: 'Follow', + meta: { + title: '跟进记录', + roles: ['follow_index', 'editor'] + } + }, + { + path: 'index', + component: () => import('@/views/log/index'), + name: 'LogIndex', + meta: { + title: '日志记录', + roles: ['log_index'] + } + } + ] }, - { path: '/icon', component: Layout, diff --git a/admin/src/views/dashboard/admin/components/PanelGroup.vue b/admin/src/views/dashboard/admin/components/PanelGroup.vue index 3d99dc0e..ad3834d0 100644 --- a/admin/src/views/dashboard/admin/components/PanelGroup.vue +++ b/admin/src/views/dashboard/admin/components/PanelGroup.vue @@ -104,7 +104,7 @@ - + @@ -221,6 +221,12 @@ export default { this.asset_price = parseFloat(res.data.asset_price)/100 this.refund = parseFloat(res.data.refund) this.refund_price = parseFloat(res.data.refund_price)/100 + this.refund_30 = parseFloat(res.data.refund_30) + this.refund_price_30 = parseFloat(res.data.refund_price_30)/100 + this.refund_60 = parseFloat(res.data.refund_60) + this.refund_price_60 = parseFloat(res.data.refund_price_60)/100 + this.refund_80 = parseFloat(res.data.refund_80) + this.refund_price_80 = parseFloat(res.data.refund_price_80)/100 }).catch(err=>{ console.log(err) }) diff --git a/admin/src/views/order/abandoned.vue b/admin/src/views/order/abandoned.vue new file mode 100644 index 00000000..db50cdb7 --- /dev/null +++ b/admin/src/views/order/abandoned.vue @@ -0,0 +1,535 @@ + + + + + diff --git a/admin/src/views/order/used.vue b/admin/src/views/order/used.vue new file mode 100644 index 00000000..4b18bda3 --- /dev/null +++ b/admin/src/views/order/used.vue @@ -0,0 +1,538 @@ + + + + + diff --git a/admin/src/views/qa/problem.vue b/admin/src/views/qa/problem.vue index 59e3c8d9..0871338b 100644 --- a/admin/src/views/qa/problem.vue +++ b/admin/src/views/qa/problem.vue @@ -1,39 +1,39 @@ @@ -41,60 +41,60 @@ @@ -104,81 +104,81 @@ body{ font-family: PingFang !important; } .infinite-list{ - list-style-type: none; - height: calc(100vh - 154px); - padding: 0; - margin: 0; + list-style-type: none; + height: calc(100vh - 154px); + padding: 0; + margin: 0; } .desc_container{ - - & + .desc_container{ - margin-top: 10px; - padding-top: 10px; - // border-top: 1px solid #333333; - } - .desc_title{ - font-size: 18px; - font-weight: 500; - color: #333333; - line-height: 25px; - margin-bottom: 10px; - } - .desc_content{ - font-size: 14px; - font-weight: 300; - } + + & + .desc_container{ + margin-top: 10px; + padding-top: 10px; + // border-top: 1px solid #333333; + } + .desc_title{ + font-size: 18px; + font-weight: 500; + color: #333333; + line-height: 25px; + margin-bottom: 10px; + } + .desc_content{ + font-size: 14px; + font-weight: 300; + } } .problem{ - .problem_form{ - margin-top: 10px; - display: flex; - justify-content: center; - } - .problem_container{ - display: flex; - .problem_left{ - font-family: PingFang, sans-serif; - font-weight: 300; - width: 18%; - background: #fff; - padding: 0 20px; - border-right: 2px solid #46a6ff; - height: calc(100vh - 154px); - .btn{ - padding: 10px 20px; - cursor: pointer; - text-align: center; - background: #46a6ff; - border-radius: 10px; - & + .btn{ - margin-top: 10px; - } - } - } - .problem_right{ - width: 100%; - background: #fff; - padding: 0 20px; - .problem_right_container{ - & + .problem_right_container{ - margin-top: 20px; - } - .title{ - font-size: 20px; - font-weight: 600; - margin-bottom: 10px; - color: #46a6ff; - &>:nth-child(1){ - margin-right: 40px; - } - } - .desc{ - font-size: 14px; - color: #666; - line-height: 24px; - } - } + .problem_form{ + margin-top: 10px; + display: flex; + justify-content: center; + } + .problem_container{ + display: flex; + .problem_left{ + font-family: PingFang, sans-serif; + font-weight: 300; + width: 18%; + background: #fff; + padding: 0 20px; + border-right: 2px solid #46a6ff; + height: calc(100vh - 154px); + .btn{ + padding: 10px 20px; + cursor: pointer; + text-align: center; + background: #46a6ff; + border-radius: 10px; + & + .btn{ + margin-top: 10px; } + } } + .problem_right{ + width: 100%; + background: #fff; + padding: 0 20px; + .problem_right_container{ + & + .problem_right_container{ + margin-top: 20px; + } + .title{ + font-size: 20px; + font-weight: 600; + margin-bottom: 10px; + color: #46a6ff; + &>:nth-child(1){ + margin-right: 40px; + } + } + .desc{ + font-size: 14px; + color: #666; + line-height: 24px; + } + } + } + } } - \ No newline at end of file + diff --git a/admin/src/views/qa/qa.vue b/admin/src/views/qa/qa.vue index 5ed6228f..9b3d125a 100644 --- a/admin/src/views/qa/qa.vue +++ b/admin/src/views/qa/qa.vue @@ -79,8 +79,8 @@ > - - (请上传zip格式的文件图片) + + (请上传zip格式的文件图片) - - (本行程请上传,ppt,word,pdf格式的文件) + + (本行程请上传,ppt,word,pdf格式的文件)
@@ -152,8 +152,8 @@ > - - (请上传zip格式的文件图片) + + (请上传zip格式的文件图片) - - (本行程请上传,ppt,word,pdf格式的文件) + + (本行程请上传,ppt,word,pdf格式的文件)
@@ -218,10 +218,10 @@ export default { methods: { handleAdd(){ this.anchors.qaQuestions.push({ - sort:this.anchors.qaQuestions[this.anchors.qaQuestions.length-1].sort+1, - title: '', - content: '' - }) + sort:this.anchors.qaQuestions[this.anchors.qaQuestions.length-1].sort+1, + title: '', + content: '' + }) }, handleDel(id){ if(this.anchors.qaQuestions.length==1){ @@ -255,16 +255,16 @@ export default { onAdd() { this.anchors = { qaQuestions:[{ - sort:1, - title: '', - content: '' - }] + sort:1, + title: '', + content: '' + }] } // 初始化时默认排序值为0 this.dialogCreate = true }, onEdit(item) { if(!item.qaQuestions){ - this.anchors = { + this.anchors = { ...item, qaQuestions:[{ sort:1, @@ -330,10 +330,10 @@ export default { width: 90%; } .mistake-right{ - padding-left: 20px; - height: auto; - display: flex; - align-items: center; + padding-left: 20px; + height: auto; + display: flex; + align-items: center; } .app-container { position: relative; diff --git a/service/app/admin/controller/IndexController.php b/service/app/admin/controller/IndexController.php index 3c6620e8..c2155aed 100644 --- a/service/app/admin/controller/IndexController.php +++ b/service/app/admin/controller/IndexController.php @@ -7,6 +7,7 @@ use app\model\Backs; use app\model\Finances; use app\model\Onlines; use app\model\Orders; +use DateTime; use Qiniu\Auth; use support\Log; use support\Redis; @@ -90,25 +91,69 @@ class IndexController extends base public function orders(Request $request) { - $order = Orders::where('sn','>',0) + // 获取当天结束时间（23:59:59） + $currentTime = new DateTime(); + $currentTime->setTime(23, 59, 59); + $endOfDayTimestamp = $currentTime->getTimestamp() * 1000; + + // 获取前30天的开始时间（00:00:00） + $thirtyDaysAgo = new DateTime('-30 days'); + $thirtyDaysAgo->setTime(0, 0, 0); + $startOfThirtyDaysAgoTimestamp = $thirtyDaysAgo->getTimestamp() * 1000; + + // 获取前60天的开始时间（00:00:00） + $sixtyDaysAgo = new DateTime('-60 days'); + $sixtyDaysAgo->setTime(0, 0, 0); + $startOfSixtyDaysAgoTimestamp = $sixtyDaysAgo->getTimestamp() * 1000; + + // 获取前80天的开始时间（00:00:00） + $eightyDaysAgo = new DateTime('-80 days'); + $eightyDaysAgo->setTime(0, 0, 0); + $startOfEightyDaysAgoTimestamp = $eightyDaysAgo->getTimestamp() * 1000; + + $order = Orders::where('sn', '>', 0) ->fieldRaw(' SUM(IF(status=0,1,0)) as wait, SUM(IF(status=1,1,0)) as doing, SUM(total_price) as total, - count(id) as `all`, + COUNT(id) as `all`, SUM(IF(asset_price>0 AND status=2,1,0)) as asset, SUM(IF(asset_price>0 AND status=2,asset_price,0)) as asset_price, SUM(CASE - WHEN (os = 1 AND STATUS = 5) OR (os = 3 AND STATUS = 4) OR (os = 2 AND STATUS = 1) THEN 1 + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) THEN 1 ELSE 0 END) AS refund, SUM(CASE - WHEN (os = 1 AND STATUS = 5) OR (os = 3 AND STATUS = 4) OR (os = 2 AND STATUS = 1) THEN actual_price + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) THEN actual_price ELSE 0 - END) AS refund_price - '); + END) AS refund_price, + SUM(CASE + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) AND create_at >= ' . $startOfThirtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN 1 + ELSE 0 + END) AS refund_30, + SUM(CASE + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) AND create_at >= ' . $startOfThirtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN actual_price + ELSE 0 + END) AS refund_price_30, + SUM(CASE + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) AND create_at >= ' . $startOfSixtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN 1 + ELSE 0 + END) AS refund_60, + SUM(CASE + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) AND create_at >= ' . $startOfSixtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN actual_price + ELSE 0 + END) AS refund_price_60, + SUM(CASE + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) AND create_at >= ' . $startOfEightyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN 1 + ELSE 0 + END) AS refund_80, + SUM(CASE + WHEN ((os = 1 AND status = 5) OR (os = 3 AND status = 4) OR (os = 2 AND status = 1)) AND create_at >= ' . $startOfEightyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN actual_price + ELSE 0 + END) AS refund_price_80 + '); - if ($request->admin->id !=1){ + if ($request->admin->id != 1) { $order = $order->where('admin_id', $request->admin->id); } @@ -123,15 +168,16 @@ class IndexController extends base 'asset_price' => $order->asset_price ?? 0, 'refund' => $order->refund ?? 0, 'refund_price' => $order->refund_price ?? 0, - 'refund_30' => $list->refund_30 ?? 0, - 'refund_price_30' => $list->refund_price_30 ?? 0.00, - 'refund_60' => $list->refund_60 ?? 0, - 'refund_price_60' => $list->refund_price_60 ?? 0.00, - 'refund_80' => $list->refund_80 ?? 0, - 'refund_price_80' => $list->refund_price_80 ?? 0.00 + 'refund_30' => $order->refund_30 ?? 0, + 'refund_price_30' => $order->refund_price_30 ?? 0.00, + 'refund_60' => $order->refund_60 ?? 0, + 'refund_price_60' => $order->refund_price_60 ?? 0.00, + 'refund_80' => $order->refund_80 ?? 0, + 'refund_price_80' => $order->refund_price_80 ?? 0.00 ]); } + public function pie() { $time = strtotime(date('Y-m-d')); diff --git a/service/app/admin/controller/OrderController.php b/service/app/admin/controller/OrderController.php index cb7755c0..ed46ce1e 100644 --- a/service/app/admin/controller/OrderController.php +++ b/service/app/admin/controller/OrderController.php @@ -37,15 +37,19 @@ class OrderController extends base ->order('create_at','desc') ->order('update_time','desc') ->order('id','desc'); + + if($os_status) { + if ($os_status[0] == array_search(Orders::OSS[4],Orders::OSS)){ + $query->whereRaw(Orders::AllOssStatusSql[$os_status[1]]); + }else{ + $query->where('os', $os_status[0] ?? 0 )->where('order_status', $os_status[1] ?? 0); + } + } if($status!=null && $status >= 0) { $query->where('status', $status); } - if($os_status) { - $query->where('os', $os_status[0] ?? 0 )->where('order_status', $os_status[1] ?? 0); - } - $mobile = $request->get('mobile'); if($mobile){ $query->where('mobile','like', '%'.$mobile.'%'); @@ -114,9 +118,9 @@ class OrderController extends base $statss = Orders::KuaishouStatus; }elseif($key ==3) { $statss = Orders::DouyinStatus; - }/*elseif ($key == 4) { - $statss = Orders::AllPlatform; - }*/ + }elseif ($key == 4) { + $statss = Orders::AllOssStatus; + } $_ch = []; foreach($statss as $k=>$v) { diff --git a/service/app/admin/controller/QaController.php b/service/app/admin/controller/QaController.php index 89270ff9..34666d0a 100644 --- a/service/app/admin/controller/QaController.php +++ b/service/app/admin/controller/QaController.php @@ -3,9 +3,11 @@ namespace app\admin\controller; use app\model\QaCitys; +use app\model\QaQuestions; use app\model\Qas; use support\Log; use support\Request; +use think\facade\Db; class QaController extends base { @@ -14,7 +16,7 @@ class QaController extends base $city_id = $request->get('city_id'); $keyword = $request->get('keyword'); - $list = Qas::order('id decs'); + $list = Qas::with('qaQuestions')->order('id decs'); if (!empty($city_id)){ $list = $list->where(['status' => 1, 'city_id' => $city_id]); @@ -38,7 +40,7 @@ class QaController extends base $title = $request->get('title'); $status = $request->get('status'); - $list = Qas::with('qaCitys')->order('create_time desc'); + $list = Qas::with(['qaCitys','qaQuestions'])->order('create_time desc'); if (!empty($title)){ $list = $list->where('title','like','%'.$title.'%'); @@ -56,7 +58,7 @@ class QaController extends base $id = $request->get('id'); if (empty($id)) return $this->error(2001, 'id data cannot be empty!'); - $data = Qas::where('status',1)->find(); + $data = Qas::with(['qaCitys','qaQuestions'])->where('status',1)->find(); return $this->success($data); } @@ -66,29 +68,60 @@ class QaController extends base $post = $request->post(); if (empty($post['city_id'])) return $this->error(2001, 'city_id data cannot be empty!'); if (empty($post['title'])) return $this->error(2001, 'title data cannot be empty!'); - if (empty($post['content'])) return $this->error(2001, 'content data cannot be empty!'); + + $qaQuestion = $post['qaQuestions']; + unset($post['qaQuestions']); try { - $data = Qas::create($post); + Db::transaction(function () use ($post,$qaQuestion){ + $data = Qas::create($post); + if (!empty($qaQuestion)){ + foreach ($qaQuestion as $k => $v){ + $qaQuestion = new QaQuestions(); + $qaQuestion->qa_id = $data->id; + $qaQuestion->title = $v['title']; + $qaQuestion->content = $v['content']; + $qaQuestion->sort = $v['sort']; + $qaQuestion->save(); + } + $data->qaQuestions = $qaQuestion; + } + }); } catch (\Exception $e) { return $this->error(2002, $e->getMessage()); } - return $this->success($data); + return $this->success(null); } public function editQa(Request $request) { $post = $request->post(); if (empty($post['id'])) return $this->error(2001, 'id data cannot be empty!'); + $qaQuestion = $post['qaQuestions']; unset($post['create_time']); unset($post['update_time']); + unset($post['qaQuestions']); try { - $data = Qas::update($post); + Db::transaction(function () use ($post,$qaQuestion){ + $data = Qas::update($post); + if (!empty($qaQuestion)){ + QaQuestions::where('qa_id',$post['id'])->delete(); + foreach ($qaQuestion as $k => $v){ + $qaQuestion = new QaQuestions(); + $qaQuestion->qa_id = $data->id; + $qaQuestion->title = $v['title']; + $qaQuestion->content = $v['content']; + $qaQuestion->sort = $v['sort']; + $qaQuestion->save(); + } + $data->qa_question = $qaQuestion; + } + }); } catch (\Exception $e) { return $this->error(2002, $e->getMessage()); } - return $this->success($data); + return $this->success(null); } public function delQa(Request $request) diff --git a/service/app/model/Orders.php b/service/app/model/Orders.php index ee9bdab9..961437de 100644 --- a/service/app/model/Orders.php +++ b/service/app/model/Orders.php @@ -16,7 +16,13 @@ class Orders extends base const DouyinReservationStatus = [1 => '未预约', 2 => '待接单', 3 => '已预约', 4 => '已取消', 5 => '已完成', 6 => '取消/退款申请']; const DouyinStatus = [1 => '未核销', 2 => '已核销', 3 => '申请退款中', 4 => '已退款', 5 => '部分核销']; - const AllPlatform = [1 => '待使用', 2 => '已核销', 3 => '已退款']; + const AllOssStatus = [1 => '待使用', 2 => '已核销', 3 => '已退款']; + + const AllOssStatusSql = [ + 1 => '((os=1 and order_status=3) or (os=2 and order_status=4) or (os=3 and order_status=1))', //待使用 + 2 => '((os=1 and order_status=4) or (os=2 and order_status=5) or (os=3 and order_status=2))', //已核销 + 3 => '((os=1 and order_status=5) or (os=3 and order_status=4))' //已退款(快手暂无已退款状态) + ]; const StatusName = ['待跟进', '跟进中', '已核销', '核销失败', '放弃跟单']; const OSS = [1 => '美团', 2 => '快手', 3 => '抖音', 4 => '全平台']; diff --git a/service/app/model/QaQuestions.php b/service/app/model/QaQuestions.php new file mode 100644 index 00000000..fca24a13 --- /dev/null +++ b/service/app/model/QaQuestions.php @@ -0,0 +1,8 @@ +hasOne(QaCitys::class,'city_id','city_id'); } + public function qaQuestions() + { + return $this->hasMany(QaQuestions::class,'qa_id','id')->order('sort desc'); + } + } \ No newline at end of file