From e2b0044b646bb112216b164fab2b70dc72c7a240 Mon Sep 17 00:00:00 2001 From: MiAn Date: Tue, 10 Nov 2026 11:01:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AD=97=E5=85=B8=E4=B8=8E=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=AE=9A=E4=BB=B7=E4=BD=93=E7=B3=BB=E5=8F=8A?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema_phase14_showcase.sql | 33 + server/addons/wechat/library/Config.php | 37 + server/addons/wechat/library/Wechat.php | 21 + .../application/admin/controller/Category.php | 2 + .../application/admin/controller/Invoice.php | 142 +- .../application/admin/controller/Service.php | 132 +- .../application/admin/controller/Withdraw.php | 181 ++- .../admin/controller/service/Cat.php | 43 +- .../admin/controller/service/Type.php | 44 + .../application/admin/lang/zh-cn/invoice.php | 1 + .../application/admin/lang/zh-cn/service.php | 24 +- .../admin/lang/zh-cn/service/type.php | 12 + .../application/admin/model/service/Type.php | 36 + .../admin/view/dashboard/index.html | 2 +- .../application/admin/view/invoice/add.html | 140 -- .../application/admin/view/invoice/edit.html | 124 +- .../application/admin/view/invoice/index.html | 19 +- .../application/admin/view/service/add.html | 562 ++++--- .../admin/view/service/cat/index.html | 24 +- .../application/admin/view/service/edit.html | 912 +++++++----- .../application/admin/view/service/index.html | 32 +- .../admin/view/service/type/add.html | 95 ++ .../admin/view/service/type/edit.html | 95 ++ .../admin/view/service/type/index.html | 24 + .../application/admin/view/withdraw/add.html | 108 -- .../application/admin/view/withdraw/edit.html | 119 +- .../admin/view/withdraw/index.html | 19 +- server/application/api/controller/Auth.php | 118 +- server/application/api/controller/Base.php | 134 ++ server/application/api/controller/Home.php | 1272 ++++++++++++---- .../application/api/controller/Merchant.php | 126 +- server/application/api/controller/Order.php | 255 +++- server/application/api/controller/Review.php | 17 +- server/application/extra/site.php | 2 +- server/application/route.php | 6 + tests/local_report_data.json | 50 +- yjyf-app/components/AddonServiceDrawer.vue | 79 +- yjyf-app/components/GoodsPickerDrawer.vue | 34 +- yjyf-app/components/LogisticsDrawer.vue | 264 ++-- yjyf-app/components/ServiceTypeDrawer.vue | 181 ++- yjyf-app/components/user/UserHomeView.vue | 1302 +++++++++++++++-- yjyf-app/components/user/UserMineView.vue | 32 +- yjyf-app/components/user/UserOrdersView.vue | 32 +- yjyf-app/pages.json | 4 + yjyf-app/pages/index/index.vue | 8 +- yjyf-app/pages/merchant/invoice.vue | 471 +++++- yjyf-app/pages/mine/account.vue | 284 ++++ yjyf-app/pages/order/case.vue | 78 +- yjyf-app/pages/order/detail.vue | 219 ++- yjyf-app/pages/order/quick.vue | 640 +++++--- yjyf-app/pages/order/review.vue | 116 +- yjyf-app/static/icons/caret-down-dark.svg | 3 + yjyf-app/static/icons/caret-down-orange.svg | 3 + yjyf-app/static/icons/check-orange.svg | 6 +- yjyf-app/static/icons/chevron-down-gray.svg | 3 + yjyf-app/static/icons/chevron-down-orange.svg | 3 + yjyf-app/static/icons/filter-dark.svg | 3 + yjyf-app/static/icons/filter-orange.svg | 3 + yjyf-app/static/icons/menu-invoice.svg | 6 + yjyf-app/static/icons/showcase-orange.svg | 4 + yjyf-app/static/icons/showcase-white.svg | 4 + yjyf-app/static/icons/sort-asc.svg | 4 + yjyf-app/static/icons/sort-both.svg | 4 + yjyf-app/static/icons/sort-default.svg | 4 + yjyf-app/static/icons/sort-desc.svg | 4 + yjyf-app/utils/api.js | 4 + 66 files changed, 6628 insertions(+), 2137 deletions(-) create mode 100644 db/schema_phase14_showcase.sql create mode 100644 server/addons/wechat/library/Config.php create mode 100644 server/addons/wechat/library/Wechat.php create mode 100644 server/application/admin/controller/service/Type.php create mode 100644 server/application/admin/lang/zh-cn/service/type.php create mode 100644 server/application/admin/model/service/Type.php delete mode 100644 server/application/admin/view/invoice/add.html create mode 100644 server/application/admin/view/service/type/add.html create mode 100644 server/application/admin/view/service/type/edit.html create mode 100644 server/application/admin/view/service/type/index.html delete mode 100644 server/application/admin/view/withdraw/add.html create mode 100644 yjyf-app/pages/mine/account.vue create mode 100644 yjyf-app/static/icons/caret-down-dark.svg create mode 100644 yjyf-app/static/icons/caret-down-orange.svg create mode 100644 yjyf-app/static/icons/chevron-down-gray.svg create mode 100644 yjyf-app/static/icons/chevron-down-orange.svg create mode 100644 yjyf-app/static/icons/filter-dark.svg create mode 100644 yjyf-app/static/icons/filter-orange.svg create mode 100644 yjyf-app/static/icons/menu-invoice.svg create mode 100644 yjyf-app/static/icons/showcase-orange.svg create mode 100644 yjyf-app/static/icons/showcase-white.svg create mode 100644 yjyf-app/static/icons/sort-asc.svg create mode 100644 yjyf-app/static/icons/sort-both.svg create mode 100644 yjyf-app/static/icons/sort-default.svg create mode 100644 yjyf-app/static/icons/sort-desc.svg diff --git a/db/schema_phase14_showcase.sql b/db/schema_phase14_showcase.sql new file mode 100644 index 0000000..375c1e4 --- /dev/null +++ b/db/schema_phase14_showcase.sql @@ -0,0 +1,33 @@ +-- Phase 14: 独立业主晒单表 (fa_showcase) 与订单/评价晒单状态字段 +ALTER TABLE `fa_order` + ADD COLUMN `is_showcase` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否公开晒单:0=否,1=是', + ADD COLUMN `showcase_time` BIGINT(16) NULL DEFAULT NULL COMMENT '晒单时间'; + +ALTER TABLE `fa_review` + ADD COLUMN `is_showcase` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否同步晒单:0=否,1=是'; + +CREATE TABLE IF NOT EXISTS `fa_showcase` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '晒单ID', + `order_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '关联订单ID', + `user_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '用户ID', + `user_name` varchar(50) NOT NULL DEFAULT '匿名业主' COMMENT '脱敏业主称呼', + `user_avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '业主头像', + `cat_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '服务类目ID', + `cat_name` varchar(50) NOT NULL DEFAULT '' COMMENT '服务类目名称', + `service_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '服务项目ID', + `service_name` varchar(100) NOT NULL DEFAULT '' COMMENT '服务项目名称', + `region` varchar(50) NOT NULL DEFAULT '同城服务' COMMENT '服务城市/区县', + `cover_image` varchar(255) NOT NULL DEFAULT '' COMMENT '晒单封面图', + `images` varchar(1000) NOT NULL DEFAULT '' COMMENT '晒单实拍图列表', + `score` tinyint(1) unsigned NOT NULL DEFAULT 5 COMMENT '评分1-5', + `tags` varchar(255) NOT NULL DEFAULT '' COMMENT '评价标签', + `content` varchar(500) NOT NULL DEFAULT '' COMMENT '晒单内容', + `master_name` varchar(50) NOT NULL DEFAULT '优匠师傅' COMMENT '脱敏师傅称呼', + `master_score` decimal(3,2) NOT NULL DEFAULT 5.00 COMMENT '师傅评分', + `status` enum('normal','hidden') NOT NULL DEFAULT 'normal' COMMENT '状态:normal=公开,hidden=隐藏', + `createtime` bigint(16) DEFAULT NULL COMMENT '晒单时间', + `updatetime` bigint(16) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_order_id` (`order_id`), + KEY `idx_status_time` (`status`, `createtime`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='业主主动晒单表'; diff --git a/server/addons/wechat/library/Config.php b/server/addons/wechat/library/Config.php new file mode 100644 index 0000000..07087c0 --- /dev/null +++ b/server/addons/wechat/library/Config.php @@ -0,0 +1,37 @@ + Env::get('wechat.appid', ''), + // AppSecret + 'secret' => Env::get('wechat.secret', ''), + // 服务端验证 Token（未配置时为空，接口调用需自行补充） + 'token' => Env::get('wechat.token', ''), + // 消息加解密 Key（未配置时为空） + 'aes_key' => Env::get('wechat.aes_key', ''), + // SDK 日志配置 + 'log' => [ + 'level' => 'debug', + 'file' => RUNTIME_PATH . 'log/wechat.log', + ], + ]; + } +} diff --git a/server/addons/wechat/library/Wechat.php b/server/addons/wechat/library/Wechat.php new file mode 100644 index 0000000..8a81356 --- /dev/null +++ b/server/addons/wechat/library/Wechat.php @@ -0,0 +1,21 @@ +view->assign("flagList", $this->model->getFlagList()); $this->view->assign("typeList", $typeList); $this->view->assign("parentList", $categorydata); + // 状态单选框数据（分类模型无独立状态枚举方法，此处按通用 normal/hidden 提供） + $this->view->assign("statusList", ['normal' => __('Normal'), 'hidden' => __('Hidden')]); $this->assignconfig('typeList', $typeList); } diff --git a/server/application/admin/controller/Invoice.php b/server/application/admin/controller/Invoice.php index 3d27f5d..3604203 100644 --- a/server/application/admin/controller/Invoice.php +++ b/server/application/admin/controller/Invoice.php @@ -3,11 +3,17 @@ namespace app\admin\controller; use app\common\controller\Backend; +use think\Db; +use think\exception\PDOException; /** * 开票申请 * - * @icon fa fa-circle-o + * 开票申请仅由用户/商户端发起，后台只负责财务开具处理： + * 待开具(wait) → 已开票(issued，必填发票号)/驳回(reject，必填原因) + * 驳回后额度自动释放，并通知申请人 + * + * @icon fa fa-file-text-o */ class Invoice extends Backend { @@ -18,6 +24,15 @@ class Invoice extends Backend */ protected $model = null; + /** + * 开票处理状态机：当前状态 => 允许流转到的目标状态 + * issued/reject 为终态 + * @var array + */ + protected $statusFlow = [ + 'wait' => ['issued', 'reject'], + ]; + public function _initialize() { parent::_initialize(); @@ -26,18 +41,9 @@ class Invoice extends Backend $this->view->assign("statusList", $this->model->getStatusList()); } - - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + * 开票申请列表：关联申请人/商户 */ - - - - protected $relationSearch = true; - public function index() { $this->request->filter(['strip_tags', 'trim']); @@ -56,4 +62,118 @@ class Invoice extends Backend $result = ['total' => $list->total(), 'rows' => $list->items()]; return json($result); } + + /** + * 财务开票处理：申请信息只读，仅允许填写开票结果 + * - 开票完成：必须填写发票号，状态置为已开票 + * - 驳回：必须填写原因，额度自动释放 + */ + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + if (false === $this->request->isPost()) { + $this->view->assign('row', $row); + $this->view->assign('flowOptions', $this->statusFlow[$row['status']] ?? []); + return $this->view->fetch(); + } + + $status = (string)$this->request->post('row.status'); + $invoiceNo = trim((string)$this->request->post('row.invoice_no')); + $auditMsg = trim((string)$this->request->post('row.audit_msg')); + + // 状态机校验：终态禁止操作，流转目标必须合法 + if (!isset($this->statusFlow[$row['status']])) { + $this->error('该开票申请已处理完毕，不允许再次变更'); + } + if (!in_array($status, $this->statusFlow[$row['status']], true)) { + $this->error('状态流转不合法，请刷新后重试'); + } + if ($status === 'issued' && $invoiceNo === '') { + $this->error('标记开票完成必须填写发票号码'); + } + if ($status === 'reject' && $auditMsg === '') { + $this->error('驳回时必须填写驳回原因'); + } + + Db::startTrans(); + try { + // 乐观锁更新状态，防止并发重复处理 + $affected = Db::name('invoice') + ->where('id', $row['id']) + ->where('status', $row['status']) + ->update([ + 'status' => $status, + 'invoice_no' => $invoiceNo !== '' ? $invoiceNo : $row['invoice_no'], + 'audit_msg' => $auditMsg, + 'updatetime' => time(), + ]); + if (!$affected) { + throw new \Exception('开票申请状态已被其他人变更，请刷新后重试'); + } + + // 通知申请人（商户开票通知绑定账号用户） + $this->sendUserMessage( + (int)$row['user_id'], + $status === 'issued' ? '发票已开具' : '开票申请已驳回', + $status === 'issued' + ? '您申请的开票 ¥' . $row['amount'] . ' 已开具完成，发票号码：' . $invoiceNo . '，电子发票已发送至 ' . $row['email'] + : '您的开票申请 ¥' . $row['amount'] . ' 未通过审核：' . ($auditMsg !== '' ? $auditMsg : '无') + ); + Db::commit(); + } catch (PDOException|\Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + $this->success(); + } + + /** + * 开票申请仅由用户/商户端发起，禁止后台手工添加 + */ + public function add() + { + $this->error('开票申请仅支持用户/商户端发起，后台不可手动添加'); + } + + /** + * 开票记录禁止删除，保障开票额度统计与账务完整 + */ + public function del($ids = null) + { + $this->error('开票申请记录禁止删除'); + } + + /** + * 禁止批量修改状态，必须逐单填写开票结果 + */ + public function multi($ids = null) + { + $this->error('开票处理不支持批量操作，请逐单填写发票号后处理'); + } + + /** + * 向申请人发送站内消息 + * @param int $userId 用户ID + * @param string $title 消息标题 + * @param string $content 消息内容 + */ + protected function sendUserMessage($userId, $title, $content) + { + if (!$userId) { + return; + } + Db::name('message')->insert([ + 'receive_type' => 'user', + 'receive_id' => $userId, + 'type' => 'system', + 'title' => mb_substr((string)$title, 0, 100), + 'content' => mb_substr((string)$content, 0, 500), + 'order_id' => 0, + 'is_read' => 0, + 'createtime' => time(), + ]); + } } diff --git a/server/application/admin/controller/Service.php b/server/application/admin/controller/Service.php index 4f4740e..db932cc 100644 --- a/server/application/admin/controller/Service.php +++ b/server/application/admin/controller/Service.php @@ -9,9 +9,9 @@ use think\exception\ValidateException; use Exception; /** - * 服务项目与商品管理 + * 商品管理（商品仅定义施工标的物与细分规格，服务价格统一配置在关联的主服务与增项服务上） * - * @icon fa fa-circle-o + * @icon fa fa-cubes */ class Service extends Backend { @@ -29,21 +29,23 @@ class Service extends Backend $this->view->assign("priceTypeList", $this->model->getPriceTypeList()); $this->view->assign("statusList", $this->model->getStatusList()); - // 获取全部可用的公共增项服务列表并关联所属品类 - $addonsPool = Db::name('service_addon') - ->alias('a') - ->leftJoin('service_cat c', 'a.cat_id = c.id') - ->field('a.*, COALESCE(c.name, "全平台通用") as cat_name') - ->where('a.status', 'normal') - ->order('a.cat_id asc, a.weigh desc, a.id asc') + // 获取统一服务字典表（fa_service_type，不绑定单一类目，主服务与增项服务同源） + $typesPool = Db::name('service_type') + ->where('status', 'normal') + ->order('weigh desc, id asc') ->select(); - $this->view->assign("addonsPool", $addonsPool); + $this->view->assign("typesPool", $typesPool); } public function index() { $this->request->filter(['strip_tags', 'trim']); if (false === $this->request->isAjax()) { + $cats = Db::name('service_cat') + ->where('status', 'normal') + ->order('weigh desc, id asc') + ->select(); + $this->view->assign('catList', $cats); return $this->view->fetch(); } if ($this->request->request('keyField')) { @@ -55,12 +57,53 @@ class Service extends Backend ->where($where) ->order($sort, $order) ->paginate($limit); - $result = ['total' => $list->total(), 'rows' => $list->items()]; + + $rows = $list->items(); + if (!empty($rows)) { + $serviceIds = []; + foreach ($rows as $r) { + $serviceIds[] = (int)$r['id']; + } + // 一次性批量查询当前页商品的细分规格，避免 N+1 查询 + $allSpecs = Db::name('service_spec') + ->field('id,service_id,name,description') + ->where('service_id', 'in', $serviceIds) + ->where('status', 'normal') + ->order('weigh desc, id asc') + ->select(); + $specMap = []; + foreach ($allSpecs as $sp) { + $sid = (int)$sp['service_id']; + if (!isset($specMap[$sid])) { + $specMap[$sid] = []; + } + $specMap[$sid][] = $sp['name']; + } + foreach ($rows as &$r) { + $sid = (int)$r['id']; + $r['specs_list'] = isset($specMap[$sid]) ? $specMap[$sid] : []; + + // 直接在服务端解析为数组返回，防止前端 bootstrap-table escape:true 将 JSON 双引号转义为 " 导致解析失败 + $stArr = []; + if (!empty($r['service_types'])) { + $stArr = is_array($r['service_types']) ? $r['service_types'] : (json_decode($r['service_types'], true) ?: []); + } + $adArr = []; + if (!empty($r['addons'])) { + $adArr = is_array($r['addons']) ? $r['addons'] : (json_decode($r['addons'], true) ?: []); + } + $r['service_types_list'] = $stArr; + $r['addons_list'] = $adArr; + } + unset($r); + } + + $result = ['total' => $list->total(), 'rows' => $rows]; return json($result); } /** - * 添加服务商品 + * 添加商品并配置关联服务定价 */ public function add() { @@ -73,7 +116,6 @@ class Service extends Backend $params[$this->dataLimitField] = $this->auth->id; } - // 处理工项类型与增项配置 $params = $this->formatServiceConfig($params); $result = false; @@ -82,8 +124,8 @@ class Service extends Backend $result = $this->model->allowField(true)->save($params); $serviceId = $this->model->id; - // 处理规格列表 - $this->syncSpecs($serviceId, $this->request->post('specs/a', [])); + // 处理商品规格列表 + $this->syncSpecs($serviceId, $this->request->post('specs/a', []), isset($params['base_price']) ? (float)$params['base_price'] : 0); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { @@ -102,7 +144,7 @@ class Service extends Backend } /** - * 编辑服务商品（工项价格、规格价格、增项服务绑定） + * 编辑商品与关联服务定价 */ public function edit($ids = null) { @@ -118,8 +160,6 @@ class Service extends Backend $params = $this->request->post("row/a"); if ($params) { $params = $this->preExcludeFields($params); - - // 处理工项类型与增项配置 $params = $this->formatServiceConfig($params); $result = false; @@ -127,8 +167,8 @@ class Service extends Backend try { $result = $row->allowField(true)->save($params); - // 同步处理规格列表 - $this->syncSpecs($row->id, $this->request->post('specs/a', [])); + // 同步处理商品规格列表 + $this->syncSpecs($row->id, $this->request->post('specs/a', []), isset($params['base_price']) ? (float)$params['base_price'] : (float)$row->base_price); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { @@ -144,7 +184,7 @@ class Service extends Backend $this->error(__('Parameter %s can not be empty', '')); } - // 解析工项与增项配置以供视图回显 + // 解析当前商品已关联的主服务与增项服务配置 $serviceTypes = []; if (!empty($row->service_types)) { $serviceTypes = is_array($row->service_types) ? $row->service_types : json_decode($row->service_types, true); @@ -154,14 +194,17 @@ class Service extends Backend $addons = is_array($row->addons) ? $row->addons : json_decode($row->addons, true); } - // 获取已有规格 + // 获取已有商品规格 $specs = Db::name('service_spec') ->where('service_id', $row->id) ->where('status', 'normal') ->order('weigh desc, id asc') ->select(); + $catName = Db::name('service_cat')->where('id', $row->cat_id)->value('name') ?: '未归类'; + $this->view->assign("row", $row); + $this->view->assign("catName", $catName); $this->view->assign("serviceTypes", $serviceTypes ?: []); $this->view->assign("assignedAddons", $addons ?: []); $this->view->assign("specs", $specs ?: []); @@ -169,44 +212,68 @@ class Service extends Backend } /** - * 格式化工项与增项输入数据 + * 格式化商品关联的主服务与增项服务 JSON，并自动提取默认主服务价格用于底层索引兼容 */ protected function formatServiceConfig($params) { - // 工项类型 JSON + $parsedTypes = []; if (isset($params['service_types_raw'])) { - $params['service_types'] = is_string($params['service_types_raw']) ? $params['service_types_raw'] : json_encode($params['service_types_raw'], JSON_UNESCAPED_UNICODE); + if (is_string($params['service_types_raw'])) { + $parsedTypes = json_decode($params['service_types_raw'], true) ?: []; + $params['service_types'] = $params['service_types_raw']; + } else { + $parsedTypes = is_array($params['service_types_raw']) ? $params['service_types_raw'] : []; + $params['service_types'] = json_encode($parsedTypes, JSON_UNESCAPED_UNICODE); + } unset($params['service_types_raw']); } - // 增项服务 JSON + if (isset($params['addons_raw'])) { $params['addons'] = is_string($params['addons_raw']) ? $params['addons_raw'] : json_encode($params['addons_raw'], JSON_UNESCAPED_UNICODE); unset($params['addons_raw']); } + + // 自动从关联的主服务（优先默认主服务或“安装”）同步底层 base_price 与 price_type，商品无需单独填价格 + if (!empty($parsedTypes)) { + $defItem = $parsedTypes[0]; + foreach ($parsedTypes as $pt) { + if (!empty($pt['is_default'])) { + $defItem = $pt; + break; + } + } + $supportFixed = isset($defItem['support_fixed']) ? (int)$defItem['support_fixed'] : 1; + $params['price_type'] = $supportFixed === 1 ? 'fixed' : 'quote'; + $params['base_price'] = $supportFixed === 1 ? (float)$defItem['price'] : 0.00; + } + return $params; } /** - * 同步商品规格表 + * 同步商品规格型号表（规格不设独立商品价格，仅标识具体施工标的物型号） */ - protected function syncSpecs($serviceId, $specsInput) + protected function syncSpecs($serviceId, $specsInput, $defaultBasePrice = 0.00) { if (empty($serviceId)) return; $now = time(); $keepIds = []; if (!empty($specsInput) && is_array($specsInput)) { + $idx = 0; foreach ($specsInput as $item) { $name = trim(isset($item['name']) ? $item['name'] : ''); if ($name === '') continue; - $specPrice = isset($item['base_price']) ? (float)$item['base_price'] : 0.00; $specDesc = isset($item['description']) ? trim($item['description']) : ''; $specId = isset($item['id']) ? (int)$item['id'] : 0; + $weigh = max(0, 100 - $idx * 5); + $idx++; if ($specId > 0) { Db::name('service_spec')->where('id', $specId)->where('service_id', $serviceId)->update([ 'name' => $name, - 'base_price' => $specPrice, + 'base_price' => $defaultBasePrice, 'description' => $specDesc, + 'weigh' => $weigh, 'updatetime' => $now, ]); $keepIds[] = $specId; @@ -214,9 +281,9 @@ class Service extends Backend $newId = Db::name('service_spec')->insertGetId([ 'service_id' => $serviceId, 'name' => $name, - 'base_price' => $specPrice, + 'base_price' => $defaultBasePrice, 'description' => $specDesc, - 'weigh' => 0, + 'weigh' => $weigh, 'status' => 'normal', 'createtime' => $now, 'updatetime' => $now, @@ -225,7 +292,6 @@ class Service extends Backend } } } - // 将未在列表中的历史规格软下架或删除 $delQuery = Db::name('service_spec')->where('service_id', $serviceId); if (!empty($keepIds)) { $delQuery->whereNotIn('id', $keepIds); diff --git a/server/application/admin/controller/Withdraw.php b/server/application/admin/controller/Withdraw.php index d2ffebe..1bf4a02 100644 --- a/server/application/admin/controller/Withdraw.php +++ b/server/application/admin/controller/Withdraw.php @@ -3,11 +3,17 @@ namespace app\admin\controller; use app\common\controller\Backend; +use think\Db; +use think\exception\PDOException; /** * 提现申请 * - * @icon fa fa-circle-o + * 提现单仅由师傅端发起，后台只负责财务审核与打款标记： + * 待审核(wait) → 审核通过(pass)/驳回(reject)；审核通过(pass) → 打款完成(done)/驳回(reject) + * 驳回自动解冻并退回师傅余额，打款完成自动划出冻结资金 + * + * @icon fa fa-rmb */ class Withdraw extends Backend { @@ -18,6 +24,16 @@ class Withdraw extends Backend */ protected $model = null; + /** + * 审核状态机：当前状态 => 允许流转到的目标状态 + * reject/done 为终态，不允许再变更 + * @var array + */ + protected $statusFlow = [ + 'wait' => ['pass', 'reject'], + 'pass' => ['done', 'reject'], + ]; + public function _initialize() { parent::_initialize(); @@ -26,18 +42,9 @@ class Withdraw extends Backend $this->view->assign("statusList", $this->model->getStatusList()); } - - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + * 提现列表：关联师傅信息，展示联系方式与处理时间 */ - - - - protected $relationSearch = true; - public function index() { $this->request->filter(['strip_tags', 'trim']); @@ -56,4 +63,156 @@ class Withdraw extends Backend $result = ['total' => $list->total(), 'rows' => $list->items()]; return json($result); } + + /** + * 财务审核：申请信息只读，仅允许合法状态流转并做资金联动 + * - 驳回：退回师傅余额并解冻，写入钱包流水，通知师傅 + * - 通过：仅标记审核通过，等待财务打款 + * - 打款完成：划出冻结资金，写入钱包流水，通知师傅 + */ + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + if (false === $this->request->isPost()) { + // 展示师傅当前钱包情况，辅助财务判断 + $master = Db::name('master')->where('id', (int)$row['master_id'])->field('id,realname,mobile,user_id,money,frozen_money')->find(); + $this->view->assign('row', $row); + $this->view->assign('master', $master ?: []); + $this->view->assign('flowOptions', $this->statusFlow[$row['status']] ?? []); + return $this->view->fetch(); + } + + $status = (string)$this->request->post('row.status'); + $auditMsg = trim((string)$this->request->post('row.audit_msg')); + + // 状态机校验：终态禁止操作，流转目标必须合法 + if (!isset($this->statusFlow[$row['status']])) { + $this->error('该提现单已处于终态（已驳回/已打款），不允许再次审核'); + } + if (!in_array($status, $this->statusFlow[$row['status']], true)) { + $this->error('状态流转不合法，请刷新后重试'); + } + if ($status === 'reject' && $auditMsg === '') { + $this->error('驳回时必须填写驳回原因'); + } + + $masterId = (int)$row['master_id']; + $amount = round((float)$row['amount'], 2); + Db::startTrans(); + try { + // 乐观锁更新状态，防止并发重复审核 + $affected = Db::name('withdraw') + ->where('id', $row['id']) + ->where('status', $row['status']) + ->update([ + 'status' => $status, + 'audit_msg' => $auditMsg, + 'updatetime' => time(), + ]); + if (!$affected) { + throw new \Exception('提现单状态已被其他人变更，请刷新后重试'); + } + + $master = Db::name('master')->where('id', $masterId)->lock(true)->find(); + if (!$master) { + throw new \Exception('提现师傅不存在'); + } + + if ($status === 'reject') { + // 驳回：解冻并退回余额，写入钱包流水 + $newMoney = round((float)$master['money'] + $amount, 2); + Db::name('master')->where('id', $masterId)->update([ + 'money' => $newMoney, + 'frozen_money' => round((float)$master['frozen_money'] - $amount, 2), + 'updatetime' => time(), + ]); + Db::name('wallet_log')->insert([ + 'user_type' => 'master', + 'user_id' => $masterId, + 'type' => 'refund', + 'amount' => $amount, + 'balance' => $newMoney, + 'order_id' => 0, + 'remark' => '提现驳回，申请金额退回钱包余额' . ($auditMsg !== '' ? '（原因：' . $auditMsg . '）' : ''), + 'createtime' => time(), + ]); + $this->sendMasterMessage((int)$master['user_id'], '提现申请已驳回', '您的提现申请 ¥' . $amount . ' 未通过财务审核：' . ($auditMsg !== '' ? $auditMsg : '无') . '，申请金额已退回钱包余额'); + } elseif ($status === 'pass') { + // 审核通过：仅标记，资金保持冻结，等待财务打款 + $this->sendMasterMessage((int)$master['user_id'], '提现审核通过', '您的提现申请 ¥' . $amount . ' 已通过审核，财务将尽快安排打款到 ' . ($row['channel'] === 'bank' ? '银行卡' : '微信钱包')); + } elseif ($status === 'done') { + // 打款完成：冻结资金划出 + Db::name('master')->where('id', $masterId)->update([ + 'frozen_money' => round((float)$master['frozen_money'] - $amount, 2), + 'updatetime' => time(), + ]); + Db::name('wallet_log')->insert([ + 'user_type' => 'master', + 'user_id' => $masterId, + 'type' => 'withdraw', + 'amount' => 0, + 'balance' => (float)$master['money'], + 'order_id' => 0, + 'remark' => '提现打款完成，冻结资金 ¥' . $amount . ' 划出（' . ($row['channel'] === 'bank' ? '银行储蓄卡' : '微信钱包') . ' ' . $row['account'] . '）', + 'createtime' => time(), + ]); + $this->sendMasterMessage((int)$master['user_id'], '提现打款完成', '您的提现 ¥' . $amount . ' 已打款成功，请留意到账通知'); + } + Db::commit(); + } catch (PDOException|\Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + $this->success(); + } + + /** + * 提现单仅由师傅端发起，禁止后台手工添加 + */ + public function add() + { + $this->error('提现申请仅支持师傅端发起，后台不可手动添加'); + } + + /** + * 提现流水记录禁止删除，保障资金对账完整 + */ + public function del($ids = null) + { + $this->error('提现申请记录禁止删除'); + } + + /** + * 禁止批量修改状态，状态变更必须走审核流程以触发资金联动 + */ + public function multi($ids = null) + { + $this->error('提现审核不支持批量操作，请逐单审核处理'); + } + + /** + * 向师傅所属用户发送站内消息 + * @param int $userId 用户ID + * @param string $title 消息标题 + * @param string $content 消息内容 + */ + protected function sendMasterMessage($userId, $title, $content) + { + if (!$userId) { + return; + } + Db::name('message')->insert([ + 'receive_type' => 'user', + 'receive_id' => $userId, + 'type' => 'system', + 'title' => mb_substr((string)$title, 0, 100), + 'content' => mb_substr((string)$content, 0, 500), + 'order_id' => 0, + 'is_read' => 0, + 'createtime' => time(), + ]); + } } diff --git a/server/application/admin/controller/service/Cat.php b/server/application/admin/controller/service/Cat.php index f5af4f4..bb357fb 100644 --- a/server/application/admin/controller/service/Cat.php +++ b/server/application/admin/controller/service/Cat.php @@ -3,15 +3,15 @@ namespace app\admin\controller\service; use app\common\controller\Backend; +use think\Db; /** * 服务类目 * - * @icon fa fa-circle-o + * @icon fa fa-th-large */ class Cat extends Backend { - /** * Cat模型对象 * @var \app\admin\model\service\Cat @@ -25,13 +25,38 @@ class Cat extends Backend $this->view->assign("statusList", $this->model->getStatusList()); } + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $rows = $list->items(); + if (!empty($rows)) { + $catCountRows = Db::name('service') + ->field('cat_id, count(id) as cnt') + ->group('cat_id') + ->select(); + $catCounts = []; + foreach ($catCountRows as $cr) { + $catCounts[(int)$cr['cat_id']] = (int)$cr['cnt']; + } + foreach ($rows as &$r) { + $cid = (int)$r['id']; + $r['goods_count'] = isset($catCounts[$cid]) ? (int)$catCounts[$cid] : 0; + } + unset($r); + } - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 - */ - - + return json(['total' => $list->total(), 'rows' => $rows]); + } } diff --git a/server/application/admin/controller/service/Type.php b/server/application/admin/controller/service/Type.php new file mode 100644 index 0000000..d0e9f39 --- /dev/null +++ b/server/application/admin/controller/service/Type.php @@ -0,0 +1,44 @@ +model = new \app\admin\model\service\Type; + $this->view->assign("statusList", $this->model->getStatusList()); + } + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } +} diff --git a/server/application/admin/lang/zh-cn/invoice.php b/server/application/admin/lang/zh-cn/invoice.php index 8fc630d..04a1afb 100644 --- a/server/application/admin/lang/zh-cn/invoice.php +++ b/server/application/admin/lang/zh-cn/invoice.php @@ -11,6 +11,7 @@ return [ 'Remark' => '开票申请备注', 'Status' => '开票处理状态', 'Invoice_no' => '发票代码与号码', + 'Audit_msg' => '财务处理说明/驳回原因', 'Ordinary' => '普通增值税电子发票', 'Special' => '增值税专用发票', 'Wait' => '待财务开具', diff --git a/server/application/admin/lang/zh-cn/service.php b/server/application/admin/lang/zh-cn/service.php index 3f2cbbe..72da9e3 100644 --- a/server/application/admin/lang/zh-cn/service.php +++ b/server/application/admin/lang/zh-cn/service.php @@ -1,16 +1,16 @@ '所属服务类目', - 'Name' => '服务商品名称', - 'Image' => '服务展示主图', - 'Price_type' => '计价方式', - 'Base_price' => '基础基准价(元)', - 'Max_price' => '区间上限价(元)', - 'Unit' => '计价单位', - 'Floor_fee' => '楼层费(元/层)', - 'Free_floor' => '免费楼层数', - 'Need_model' => '是否需填型号', - 'Description' => '服务详细说明', - 'Sales' => '累计销量', + 'Cat_id' => '所属服务类目', + 'Name' => '商品名称', + 'Image' => '商品缩略图', + 'Unit' => '数量单位', + 'Floor_fee' => '步梯楼层费(元/层)', + 'Free_floor' => '免费楼层数', + 'Description' => '商品施工说明', + 'Service_types' => '关联主服务及定价', + 'Addons' => '关联增项服务及加价', + 'Sales' => '累计单量', + 'Weigh' => '排序权重', + 'Status' => '状态', ]; diff --git a/server/application/admin/lang/zh-cn/service/type.php b/server/application/admin/lang/zh-cn/service/type.php new file mode 100644 index 0000000..8519b1e --- /dev/null +++ b/server/application/admin/lang/zh-cn/service/type.php @@ -0,0 +1,12 @@ + '服务唯一标识', + 'Name' => '服务名称', + 'Unit' => '默认单位', + 'Can_be_main' => '可作主服务项目', + 'Can_be_addon' => '可作增项服务', + 'Support_fixed' => '默认计价模式', + 'Weigh' => '排序权重', + 'Status' => '状态', +]; diff --git a/server/application/admin/model/service/Type.php b/server/application/admin/model/service/Type.php new file mode 100644 index 0000000..1f1e2d0 --- /dev/null +++ b/server/application/admin/model/service/Type.php @@ -0,0 +1,36 @@ + __('Normal'), 'hidden' => __('Hidden')]; + } + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } +} diff --git a/server/application/admin/view/dashboard/index.html b/server/application/admin/view/dashboard/index.html index f6e9913..99aeb57 100755 --- a/server/application/admin/view/dashboard/index.html +++ b/server/application/admin/view/dashboard/index.html @@ -250,7 +250,7 @@
在线可接单 - {$workingMaster} 人 + {$onlineMaster} 人
diff --git a/server/application/admin/view/invoice/add.html b/server/application/admin/view/invoice/add.html deleted file mode 100644 index 152eda5..0000000 --- a/server/application/admin/view/invoice/add.html +++ /dev/null @@ -1,140 +0,0 @@ -
- - -
-
-

开票主体与金额明细

-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
-
-
- -
-
- ¥ - -
-
-
-
-
-
- -
- -
-
-
-
-
-
- - -
-
-

开票抬头与资质信息

-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
- -
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
- - -
-
-

财务开具与状态归档

-
-
-
-
-
- -
-
- {foreach name="statusList" item="vo"} - - {/foreach} -
-
-
-
-
-
- -
- -
-
-
-
-
-
- -
- -
- - -
-
-
diff --git a/server/application/admin/view/invoice/edit.html b/server/application/admin/view/invoice/edit.html index f141e9f..8768dda 100644 --- a/server/application/admin/view/invoice/edit.html +++ b/server/application/admin/view/invoice/edit.html @@ -1,134 +1,104 @@
- +
-

开票主体与金额明细

+

开票申请信息（只读）

- +
- +

{$row.user.nickname|default=$row.user_id} {if $row.merchant_id}· 商户「{$row.merchant.name|default=''}」{/if}

- +
- +

¥{$row.amount|htmlentities}（{$typeList[$row.type]|default=$row.type}）

-
- +
-
- ¥ - -
+

{$row.title|htmlentities}{if $row.tax_no} · 税号 {$row.tax_no|htmlentities}{/if}

- +
- +

{$row.email|htmlentities}

+ {if $row.remark} +
+ +
+

{$row.remark|htmlentities}

+
+
+ {/if}
- + + {if condition="!empty($flowOptions)"}
-

开票抬头与资质信息

+

财务开票处理

-
-
-
- -
- -
-
-
-
-
- -
- -
+

线上开具完成后标记「开票完成」并填写发票号码，系统将自动通知申请人；无法开票时请驳回并说明原因，额度将自动释放。

+ +
+ +
+
+ {foreach name="flowOptions" item="op"} + {if $op == 'issued'} + + {elseif $op == 'reject' /} + + {/if} + {/foreach}
-
-
-
- -
- -
-
+
+ +
+
-
-
- -
- -
-
+
+ +
+ +
+
- - + {else /}
-
-

财务开具与状态归档

-
-
-
-
- -
-
- {foreach name="statusList" item="vo"} - - {/foreach} -
-
-
-
-
-
- -
- -
-
-
-
+

该开票申请已处理完毕（{:$statusList[$row.status]}），无需操作。

+ {/if}
diff --git a/server/application/admin/view/invoice/index.html b/server/application/admin/view/invoice/index.html index 346a2ff..8dc5c5c 100644 --- a/server/application/admin/view/invoice/index.html +++ b/server/application/admin/view/invoice/index.html @@ -1,5 +1,5 @@
- +
{:build_heading(null,FALSE)}
    @@ -17,25 +17,10 @@
    - {:__('Add')} - {:__('Edit')} - {:__('Delete')} - - -
    - {:__('More')} - -
    - -
    diff --git a/server/application/admin/view/service/add.html b/server/application/admin/view/service/add.html index 37bfdad..c4f03d2 100644 --- a/server/application/admin/view/service/add.html +++ b/server/application/admin/view/service/add.html @@ -1,68 +1,120 @@ - + + + + + + +
    +
    +
    +
    +
    商品标的物基础信息
    +
    - +
    - +
    - +
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - - -
    - -
    -
      -
      -
      - -
      -
      -
      - -
      - -
      -
      -
      -
      -
      - -
      - +
      @@ -71,19 +123,15 @@
      - +
      -
      - ¥ - -
      - 各工项未单独定价时默认采用此价 +
      - +
      @@ -107,28 +155,36 @@
      - +
      - +
      + +
      + + +
      + +
      +
        -
        +
        - +
        -
        - +
        +
        {foreach name="statusList" item="vo"} - + {/foreach}
        @@ -137,265 +193,188 @@
        - -
        -
        - 勾选该商品所支持的具体施工工项并分别设定基准价。用户下单时可按需在这些工项间切换。 +
        +
        +
        商品细分型号与款式规格
        +
        - +
        - - - - - + + + + - - ['name' => '安装', 'price' => 80.00, 'enabled' => true, 'is_default' => true], - 'repair' => ['name' => '维修', 'price' => 60.00, 'enabled' => true, 'is_default' => false], - 'remove' => ['name' => '拆旧', 'price' => 40.00, 'enabled' => true, 'is_default' => false], - 'deliver' => ['name' => '送货到家', 'price' => 50.00, 'enabled' => false, 'is_default' => false], - 'deliver_install' => ['name' => '送货到家并安装', 'price' => 120.00, 'enabled' => false, 'is_default' => false], - 'measure' => ['name' => '上门测量', 'price' => 30.00, 'enabled' => false, 'is_default' => false], - ]; - ?> - {foreach name="defaultTypes" item="st" key="code"} - - - - - +
        启用工项标识前端显示名称一口基准工价(元)设为默认序号细分规格/款式名称规格说明或施工提示（选填）操作
        - - - {$code} - - - -
        - ¥ - +
        +
        +
        + +
        + + + + + + + + + + {foreach name="typesPool" item="tp"} + 0 ? (float)$tp['default_addon_price'] : 30.00; + $rowEnabled = ($isMainChecked || $isAddonChecked); + ?> + + + - - - {/foreach} - -
        全局服务项作为【主服务项目】配置（用户单独呼叫该服务时的价格）作为【增项服务】配置（顺带加选时的加价）
        +
        + {$name} + {$code} +
        +         		+
        + +
        +
        + ¥ + + /{$unit} +
        +
        -
        		- -
        - -
        - - -
        -
        - 为该商品增设不同规格（如：智能一体机 / 普通坐便器），并分别设置规格基准一口价。 -
        - - - - - - - - - - - -
        规格名称规格独立一口价(元)规格施工描述操作
        - -
        - - -
        -
        - 增值服务按类目精准隔离与绑定： - 系统根据上方所选的服务类目动态过滤可用增值服务。不同品类拥有独立的工法增项标准，支持在此单独设置专属单价。 -
        - -
        -
        - 视图筛选： -
        - - -
        -
        -
        - - - -
        -
        - - - - - - - - - - - - - - {foreach name="addonsPool" item="ad"} - - - - - - - - + - - {/foreach} - -
        绑定所属品类增值服务名称单位平台指导价针对本商品专属单价(元)
        - - - {if $isCommon} - 全平台通用 - {else} - {$ad.cat_name} - {/if} - - {$ad.name} - - {$ad.unit} - - ¥{$ad.default_price} - -
        - ¥ - + 未启用主服务 +
        +         		+
        + +
        +
        + +¥ + + /{$unit} +
        -
        - -
        + 未作为增项启用 +
        + + + {/foreach} + + + + +
        - +
        diff --git a/server/application/admin/view/service/index.html b/server/application/admin/view/service/index.html index 216cf68..d52054a 100644 --- a/server/application/admin/view/service/index.html +++ b/server/application/admin/view/service/index.html @@ -1,46 +1,32 @@
        -
        {:build_heading(null,FALSE)} -
        -
        - - {:__('Add')} - {:__('Edit')} - {:__('Delete')} - - -
        - {:__('More')} - -
        - - + + {:__('Add')} + {:__('Edit')} + {:__('Delete')}
        -
        diff --git a/server/application/admin/view/service/type/add.html b/server/application/admin/view/service/type/add.html new file mode 100644 index 0000000..9cd7c08 --- /dev/null +++ b/server/application/admin/view/service/type/add.html @@ -0,0 +1,95 @@ +
        + +
        +
        +

        全局服务字典定义（纯服务项定义，具体价格在每个商品中独立配置）

        +
        +
        +
        + +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + 默认单位 + +
        +
        +
        +
        +
        +
        + +
        +
        +
        + +
        + + +
        +
        +
        + +
        + + +
        +
        +
        +
        +
        +
        +
        + +
        +
        +

        排序与启用状态

        +
        +
        +
        + +
        +
        +
        +
        + 排序权重 + +
        +
        +
        +
        + + +
        +
        +
        +
        + {foreach name="statusList" item="vo"} + + {/foreach} +
        +
        +
        +
        +
        +
        +
        + +
        + +
        + + +
        +
        +
        diff --git a/server/application/admin/view/service/type/edit.html b/server/application/admin/view/service/type/edit.html new file mode 100644 index 0000000..b527271 --- /dev/null +++ b/server/application/admin/view/service/type/edit.html @@ -0,0 +1,95 @@ +
        + +
        +
        +

        全局服务字典定义（纯服务项定义，具体价格在每个商品中独立配置）

        +
        +
        +
        + +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + 默认单位 + +
        +
        +
        +
        +
        +
        + +
        +
        +
        + +
        + + +
        +
        +
        + +
        + + +
        +
        +
        +
        +
        +
        +
        + +
        +
        +

        排序与启用状态

        +
        +
        +
        + +
        +
        +
        +
        + 排序权重 + +
        +
        +
        +
        + + +
        +
        +
        +
        + {foreach name="statusList" item="vo"} + + {/foreach} +
        +
        +
        +
        +
        +
        +
        + +
        + +
        + + +
        +
        +
        diff --git a/server/application/admin/view/service/type/index.html b/server/application/admin/view/service/type/index.html new file mode 100644 index 0000000..14fbaca --- /dev/null +++ b/server/application/admin/view/service/type/index.html @@ -0,0 +1,24 @@ +
        + {:build_heading()} + +
        +
        + +
        +
        +
        diff --git a/server/application/admin/view/withdraw/add.html b/server/application/admin/view/withdraw/add.html deleted file mode 100644 index 3900668..0000000 --- a/server/application/admin/view/withdraw/add.html +++ /dev/null @@ -1,108 +0,0 @@ -
        - - -
        -
        -

        提现主体与金额明细

        -
        -
        -
        - -
        - -
        -
        - -
        - -
        -
        -
        -
        - 申请额 ¥ - -
        -
        -
        -
        - 手续费 ¥ - -
        -
        -
        -
        - 到账额 ¥ - -
        -
        -
        -
        -
        -
        -
        - - -
        -
        -

        结算渠道与到账账户

        -
        -
        -
        -
        -
        - -
        - -
        -
        -
        -
        -
        - -
        - -
        -
        -
        -
        -
        -
        - - -
        -
        -

        财务审核与批注

        -
        -
        -
        - -
        -
        - {foreach name="statusList" item="vo"} - - {/foreach} -
        -
        -
        - -
        - -
        - -
        -
        -
        -
        - -
        - -
        - - -
        -
        -
        diff --git a/server/application/admin/view/withdraw/edit.html b/server/application/admin/view/withdraw/edit.html index 7a389d7..99aecb7 100644 --- a/server/application/admin/view/withdraw/edit.html +++ b/server/application/admin/view/withdraw/edit.html @@ -1,102 +1,103 @@
        - +
        -

        提现主体与金额明细

        -
        -
        -
        - -
        - -
        -
        - -
        - -
        -
        -
        -
        - 申请额 ¥ - -
        -
        -
        -
        - 手续费 ¥ - -
        -
        -
        -
        - 到账额 ¥ - -
        -
        -
        -
        -
        -
        -
        - - -
        -
        -

        结算渠道与到账账户

        +

        提现申请信息（只读）

        - +
        - +

        {$master.realname|default='-'}（{$master.mobile|default='无手机号'}）

        - +
        - +

        余额 ¥{$master.money|default='0.00'}，冻结中 ¥{$master.frozen_money|default='0.00'}

        +
        +
        +
        + +
        +

        ¥{$row.amount|htmlentities}（手续费 ¥{$row.fee|htmlentities}，预计到账 ¥{$row.arrive_amount|htmlentities}）

        +
        +
        +
        +
        +
        + +
        +

        {$channelList[$row.channel]|default=$row.channel} · {$row.account|htmlentities}

        +
        +
        +
        +
        + {if $row.status != 'wait'} +
        + +
        +

        {$row.audit_msg|default='-'}

        +
        +
        + {/if}
        - + + {if condition="!empty($flowOptions)"}
        -

        财务审核与批注

        +

        财务审核操作

        + {if $row.status == 'wait'} +

        审核通过后资金保持冻结，待打款后标记「打款完成」划出冻结金额；驳回将自动退回师傅钱包余额。

        + {else /} +

        该单已审核通过，请线下完成打款后标记「打款完成」，系统将自动划出冻结金额；如审核有误可驳回，将自动退回师傅余额。

        + {/if} +
        - +
        -
        - {foreach name="statusList" item="vo"} - +
        + {foreach name="flowOptions" item="op"} + {if $op == 'pass'} + + {elseif $op == 'reject' /} + + {elseif $op == 'done' /} + + {/if} {/foreach}
        - +
        - +
        + {else /} +
        +
        +

        该提现单已处于终态（{:$statusList[$row.status]}），流程结束，无需操作。

        +
        +
        + {/if}
        diff --git a/server/application/admin/view/withdraw/index.html b/server/application/admin/view/withdraw/index.html index aed351f..557434a 100644 --- a/server/application/admin/view/withdraw/index.html +++ b/server/application/admin/view/withdraw/index.html @@ -1,5 +1,5 @@
        - +
        {:build_heading(null,FALSE)}
          @@ -17,25 +17,10 @@
          - {:__('Add')} - {:__('Edit')} - {:__('Delete')} - - -
          - {:__('More')} - -
          - -
          diff --git a/server/application/api/controller/Auth.php b/server/application/api/controller/Auth.php index 99c23d2..e1be916 100644 --- a/server/application/api/controller/Auth.php +++ b/server/application/api/controller/Auth.php @@ -126,7 +126,7 @@ class Auth extends Base protected function profileData() { $uid = $this->uid(); - $user = Db::name('user')->field('id,nickname,mobile,avatar,money,score,createtime')->where('id', $uid)->find(); + $user = Db::name('user')->field('id,nickname,mobile,email,avatar,money,score,user_type,contact_address,createtime')->where('id', $uid)->find(); $master = Db::name('master')->where('user_id', $uid)->find(); $couponCount = Db::name('user_coupon')->where('user_id', $uid)->where('status', 'unused')->count(); @@ -156,6 +156,9 @@ class Auth extends Base $merchantInfo = [ 'id' => (int)$merchant['id'], 'name' => $merchant['name'], + 'legal_person' => isset($merchant['legal_person']) ? (string)$merchant['legal_person'] : '', + 'legal_mobile' => isset($merchant['legal_mobile']) ? (string)$merchant['legal_mobile'] : '', + 'tech_mobile' => isset($merchant['tech_mobile']) ? (string)$merchant['tech_mobile'] : '', 'verify_status' => $merchant['verify_status'], 'audit_msg' => $merchant['audit_msg'], 'settle_type' => $merchant['settle_type'], @@ -165,21 +168,112 @@ class Auth extends Base ]; } + $userType = (!empty($user['user_type']) && $user['user_type'] === 'merchant') || ($merchant && $merchant['verify_status'] === 'pass') + ? 'merchant' + : 'personal'; + return [ - 'id' => (int)$user['id'], - 'nickname' => $user['nickname'] ?: ('用户' . substr((string)$user['mobile'], -4)), - 'mobile' => $user['mobile'], - 'avatar' => $user['avatar'] ?: '', - 'balance' => (float)$user['money'], - 'coupon_count' => (int)$couponCount, - 'unread_count' => (int)$unread, - 'is_master' => $master ? true : false, - 'master' => $masterInfo, - 'is_merchant' => $merchant ? true : false, - 'merchant' => $merchantInfo, + 'id' => (int)$user['id'], + 'nickname' => $user['nickname'] ?: ('用户' . substr((string)$user['mobile'], -4)), + 'mobile' => $user['mobile'], + 'email' => !empty($user['email']) ? (string)$user['email'] : ($merchant && !empty($merchant['email']) ? (string)$merchant['email'] : ''), + 'contact_address' => !empty($user['contact_address']) ? (string)$user['contact_address'] : ($merchant ? (string)($merchant['province'] . $merchant['city'] . $merchant['district'] . $merchant['address']) : ''), + 'user_type' => $userType, + 'company_name' => $merchant ? (string)$merchant['name'] : '', + 'legal_person' => $merchant && isset($merchant['legal_person']) ? (string)$merchant['legal_person'] : '', + 'legal_mobile' => $merchant && isset($merchant['legal_mobile']) ? (string)$merchant['legal_mobile'] : '', + 'tech_mobile' => $merchant && isset($merchant['tech_mobile']) ? (string)$merchant['tech_mobile'] : '', + 'avatar' => $user['avatar'] ?: '', + 'balance' => (float)$user['money'], + 'coupon_count' => (int)$couponCount, + 'unread_count' => (int)$unread, + 'is_master' => $master ? true : false, + 'master' => $masterInfo, + 'is_merchant' => $merchant ? true : false, + 'merchant' => $merchantInfo, ]; } + /** + * 保存账号信息（对标奇兵到家「账号信息」页：支持 家庭/个人 与 商家 两种用户类型） + * @ApiMethod (POST) + */ + public function saveAccount() + { + $uid = $this->uid(); + $userType = trim((string)$this->request->post('user_type', 'personal')); + if (!in_array($userType, ['personal', 'merchant'], true)) { + $userType = 'personal'; + } + $nickname = trim((string)$this->request->post('nickname', '')); + $mobile = trim((string)$this->request->post('mobile', '')); + $contactAddress = trim((string)$this->request->post('contact_address', '')); + $email = trim((string)$this->request->post('email', '')); + $companyName = trim((string)$this->request->post('company_name', '')); + $legalPerson = trim((string)$this->request->post('legal_person', '')); + $legalMobile = trim((string)$this->request->post('legal_mobile', '')); + $techMobile = trim((string)$this->request->post('tech_mobile', '')); + + if ($nickname === '') { + $this->error('请输入用户昵称'); + } + if ($legalPerson !== '' && preg_match('/\d/', $legalPerson)) { + $this->error('法人姓名不支持数字输入'); + } + if ($legalMobile !== '' && !preg_match('/^1\d{10}$/', $legalMobile)) { + $this->error('法人手机号格式不正确'); + } + if ($techMobile !== '' && !preg_match('/^1\d{10}$/', $techMobile)) { + $this->error('技术手机号格式不正确'); + } + if ($email !== '' && !filter_var($email, FILTER_VALIDATE_EMAIL)) { + $this->error('电子邮箱格式不正确'); + } + + $userUpdate = [ + 'nickname' => $nickname, + 'user_type' => $userType, + 'contact_address' => $contactAddress, + 'email' => $email, + 'updatetime' => time(), + ]; + if ($mobile !== '' && preg_match('/^1\d{10}$/', $mobile)) { + $conflict = Db::name('user')->where('mobile', $mobile)->where('id', '<>', $uid)->find(); + if ($conflict) { + $this->error('该联系号码已被其他账号绑定'); + } + $userUpdate['mobile'] = $mobile; + } + Db::name('user')->where('id', $uid)->update($userUpdate); + + if ($userType === 'merchant') { + $existMerchant = Db::name('merchant')->where('user_id', $uid)->find(); + $curUser = Db::name('user')->where('id', $uid)->find(); + $merchantSave = [ + 'name' => $companyName !== '' ? $companyName : ($existMerchant ? $existMerchant['name'] : $nickname), + 'legal_person' => $legalPerson, + 'legal_mobile' => $legalMobile, + 'tech_mobile' => $techMobile, + 'contact' => $nickname, + 'mobile' => $curUser ? (string)$curUser['mobile'] : '', + 'address' => $contactAddress, + 'email' => $email, + 'updatetime' => time(), + ]; + if ($existMerchant) { + Db::name('merchant')->where('id', $existMerchant['id'])->update($merchantSave); + } else { + $merchantSave['user_id'] = $uid; + $merchantSave['license_no'] = ''; + $merchantSave['verify_status'] = 'pass'; + $merchantSave['createtime'] = time(); + Db::name('merchant')->insert($merchantSave); + } + } + + $this->success('保存成功', ['userinfo' => $this->profileData()]); + } + /** * 微信授权登录（小程序 uni.login 拿到的 code） * @ApiMethod (POST) diff --git a/server/application/api/controller/Base.php b/server/application/api/controller/Base.php index 16cc376..a6e6b6d 100644 --- a/server/application/api/controller/Base.php +++ b/server/application/api/controller/Base.php @@ -155,4 +155,138 @@ class Base extends Api { return date('YmdHis') . str_pad((string)mt_rand(0, 999999), 6, '0', STR_PAD_LEFT); } + + /** + * 同步写入或隐藏独立晒单表 fa_showcase（仅存储脱敏后的必要公开信息） + * @param array $order 订单行 + * @param int $isShowcase 1=公开晒单, 0=取消晒单 + * @return int 晒单表主键 ID（取消时返回 0） + */ + protected function syncOrderShowcase(array $order, $isShowcase = 1) + { + $orderId = (int)$order['id']; + $now = time(); + if (!$isShowcase) { + Db::name('showcase')->where('order_id', $orderId)->update([ + 'status' => 'hidden', + 'updatetime' => $now, + ]); + return 0; + } + + $rev = Db::name('review')->where('order_id', $orderId)->where('status', 'normal')->find(); + $u = Db::name('user')->where('id', (int)$order['user_id'])->find(); + $cat = Db::name('service_cat')->where('id', (int)$order['cat_id'])->find(); + $service = Db::name('service')->where('id', (int)$order['service_id'])->find(); + + $isAnon = $rev ? (int)$rev['is_anonymous'] : 0; + $userName = '匿名业主'; + $userAvatar = ''; + if (!$isAnon && $u) { + $nick = trim((string)$u['nickname']); + if ($nick !== '' && !preg_match('/^[0-9]/', $nick)) { + $userName = mb_substr($nick, 0, 1) . '业主'; + } else { + $userName = '优匠业主'; + } + $userAvatar = !empty($u['avatar']) ? (string)$u['avatar'] : ''; + } + + // 地区仅保留区县或城市，绝不保存具体街道/小区/门牌 + $district = trim((string)$order['district']); + $city = trim((string)$order['city']); + $region = $district ?: ($city ?: '同城服务'); + + // 收集晒单实拍图（评价晒图 > 完工实况图，过滤无效测试域名） + $imgList = []; + if ($rev && !empty($rev['images'])) { + $dec = json_decode((string)$rev['images'], true); + $arr = is_array($dec) ? $dec : array_filter(explode(',', (string)$rev['images'])); + foreach ($arr as $it) { + $it = trim((string)$it); + if ($it !== '' && substr($it, -4) !== '.svg' && strpos($it, 'example.com') === false) { + $imgList[] = $it; + } + } + } + if (empty($imgList)) { + $mediaUrls = Db::name('order_media')->where('order_id', $orderId)->order('id desc')->limit(6)->column('url'); + foreach ($mediaUrls as $mu) { + $mu = trim((string)$mu); + if ($mu !== '' && substr($mu, -4) !== '.svg' && strpos($mu, 'example.com') === false) { + $imgList[] = $mu; + } + } + } + + // 封面图提取 + $cover = !empty($imgList) ? $imgList[0] : ''; + if ($cover === '' && !empty($order['service_image']) && substr($order['service_image'], -4) !== '.svg') { + $cover = (string)$order['service_image']; + } + if ($cover === '' && $service && !empty($service['image']) && substr($service['image'], -4) !== '.svg') { + $cover = (string)$service['image']; + } + if ($cover === '') { + $fallback = Db::name('service') + ->where('cat_id', (int)$order['cat_id']) + ->where('image', '<>', '') + ->where('image', 'not like', '%.svg%') + ->order('weigh desc, id asc') + ->value('image'); + if ($fallback) { + $cover = (string)$fallback; + } + } + + // 师傅脱敏称呼与评分 + $masterName = '优匠师傅'; + $masterScore = 5.00; + if ((int)$order['master_id'] > 0) { + $m = Db::name('master')->where('id', (int)$order['master_id'])->find(); + if ($m) { + $rName = trim((string)$m['realname']); + if ($rName !== '' && strpos($rName, '师傅') === false) { + $masterName = mb_substr($rName, 0, 1) . '师傅'; + } elseif ($rName !== '') { + $masterName = $rName; + } + $masterScore = (float)$m['score'] > 0 ? round((float)$m['score'], 2) : 5.00; + } + } + + $score = $rev ? max(1, min(5, (int)$rev['score'])) : 5; + $tags = ($rev && !empty($rev['tags'])) ? (string)$rev['tags'] : '准时,专业,值得推荐'; + $content = ($rev && !empty($rev['content'])) ? (string)$rev['content'] : '师傅准时上门，施工专业细致，安装效果很满意！'; + + $payload = [ + 'order_id' => $orderId, + 'user_id' => (int)$order['user_id'], + 'user_name' => $userName, + 'user_avatar' => $userAvatar, + 'cat_id' => (int)$order['cat_id'], + 'cat_name' => $cat ? (string)$cat['name'] : '上门服务', + 'service_id' => (int)$order['service_id'], + 'service_name' => $order['service_name'] ?: ($service ? (string)$service['name'] : '上门服务'), + 'region' => $region, + 'cover_image' => $cover, + 'images' => !empty($imgList) ? json_encode(array_values($imgList), JSON_UNESCAPED_UNICODE) : '', + 'score' => $score, + 'tags' => $tags, + 'content' => mb_substr($content, 0, 500), + 'master_name' => $masterName, + 'master_score' => $masterScore, + 'status' => 'normal', + 'updatetime' => $now, + ]; + + $existing = Db::name('showcase')->where('order_id', $orderId)->find(); + if ($existing) { + Db::name('showcase')->where('id', (int)$existing['id'])->update($payload); + return (int)$existing['id']; + } else { + $payload['createtime'] = !empty($order['showcase_time']) ? (int)$order['showcase_time'] : $now; + return (int)Db::name('showcase')->insertGetId($payload); + } + } } diff --git a/server/application/api/controller/Home.php b/server/application/api/controller/Home.php index 3fee4a2..4715bb0 100644 --- a/server/application/api/controller/Home.php +++ b/server/application/api/controller/Home.php @@ -9,7 +9,7 @@ use think\Db; */ class Home extends Base { - protected $noNeedLogin = ['index', 'cats', 'services', 'detail', 'calc', 'specs', 'masterCount', 'orderCase']; + protected $noNeedLogin = ['index', 'feed', 'cats', 'services', 'detail', 'calc', 'specs', 'masterCount', 'orderCase']; /** * 首页聚合：类目 + 热门服务 + 我的角标 @@ -87,13 +87,81 @@ class Home extends Base } } + // 组装大类 -> 具体服务项目二级联动映射表 + $catServices = []; + foreach ($candidateServices as $csItem) { + $cidKey = (int)$csItem['cat_id']; + if (!isset($catServices[$cidKey])) { + $catServices[$cidKey] = []; + } + $catServices[$cidKey][] = [ + 'id' => (int)$csItem['id'], + 'cat_id' => $cidKey, + 'name' => (string)$csItem['name'], + 'base_price' => (float)$csItem['base_price'], + 'unit' => (string)($csItem['unit'] ?: '件'), + ]; + } + + // 提取真实晒单覆盖区域（直接取自 fa_showcase 表，确保每个区域筛选均有真实晒单数据） + $showcaseRegions = Db::name('showcase') + ->where('status', 'normal') + ->where('region', '<>', '') + ->group('region') + ->column('region'); + $regions = array_values(array_unique(array_filter($showcaseRegions ?: []))); + + // 提取晒单表真实覆盖的服务项目（用于【服务动态】下“项目 ▼”联动过滤） + $showcaseServiceRows = Db::name('showcase') + ->field('service_id,service_name,cat_id,cat_name') + ->where('status', 'normal') + ->where('service_id', '>', 0) + ->group('service_id,service_name,cat_id,cat_name') + ->select(); + $showcaseServices = []; + foreach ($showcaseServiceRows as $ssr) { + $showcaseServices[] = [ + 'id' => (int)$ssr['service_id'], + 'cat_id' => (int)$ssr['cat_id'], + 'name' => (string)$ssr['service_name'], + 'cat_name' => (string)$ssr['cat_name'], + ]; + } + + // 提取工项字典表 fa_service_type 真实启用工项（用于【热门推荐】下“工项 ▼”过滤） + $rawTypeDict = Db::name('service_type') + ->field('code,name') + ->where('status', 'normal') + ->where('code', '<>', 'other') + ->order('weigh desc, id asc') + ->select(); + $serviceTypesDict = []; + foreach ($rawTypeDict as $rtd) { + $code = (string)$rtd['code']; + if ($code === 'deliver_downstairs') { + continue; + } + $label = (string)$rtd['name']; + if ($code === 'deliver_install') { + $label = '送货并安装'; + } + $serviceTypesDict[] = [ + 'code' => $code, + 'name' => $label, + ]; + } + $data = [ - 'cats' => $cats, - 'hot' => $this->formatServices($hotList), - 'banners' => $this->banners(), - 'assures' => $this->configList('home_assure', '平台认证,先行赔付,极速上门,售后无忧'), - 'tutorial' => $this->tutorial(), - 'badge' => ['coupon' => 0, 'unread' => 0], + 'cats' => $cats, + 'cat_services' => $catServices, + 'showcase_services' => $showcaseServices, + 'service_types_dict' => $serviceTypesDict, + 'regions' => $regions, + 'hot' => $this->formatServices($hotList), + 'banners' => $this->banners(), + 'assures' => $this->configList('home_assure', '平台认证,先行赔付,极速上门,售后无忧'), + 'tutorial' => $this->tutorial(), + 'badge' => ['coupon' => 0, 'unread' => 0], ]; if ($this->auth->isLogin()) { @@ -102,94 +170,36 @@ class Home extends Base $data['badge']['unread'] = (int)Db::name('message')->where('receive_type', 'user')->where('receive_id', $uid)->where('is_read', 0)->count(); } - // 全平台真实已完工工单动态流（严格只展示已完工 status = 8） - $orderRows = Db::name('order') - ->alias('o') - ->join('service s', 'o.service_id = s.id', 'LEFT') - ->join('service_cat c', 'o.cat_id = c.id', 'LEFT') - ->field('o.id,o.order_no,o.service_id,o.service_name,o.cat_id,o.price_type,o.pay_amount,o.status,o.appoint_time,o.finish_time,o.verify_time,o.createtime,o.city,o.district,o.address,o.service_image,o.goods_images,s.image as s_image,c.name as c_name,c.icon as cat_icon') - ->where('o.status', 8) - ->order('o.id desc') + // 全平台用户主动晒单动态流（直接查询独立晒单表 fa_showcase，物理隔离订单隐私数据） + $showcaseRows = Db::name('showcase') + ->field('id,cat_id,cat_name,service_id,service_name,region,cover_image,user_name,score,tags,content,createtime') + ->where('status', 'normal') + ->order('createtime desc, id desc') ->limit(10) ->select(); - $statusTextMap = [ - 8 => '已完工', - ]; - $recentOrders = []; - foreach ($orderRows as $or) { - $st = (int)$or['status']; - $appoint = (int)$or['appoint_time']; - $finishTime = !empty($or['finish_time']) ? (int)$or['finish_time'] : (!empty($or['verify_time']) ? (int)$or['verify_time'] : (int)$or['createtime']); - - // 图片优先级：订单快照服务图 > 现场照片第一张 > 服务表大图 > 同类目真实商品图（杜绝使用矢量图标） - $img = ''; - if (!empty($or['service_image']) && substr($or['service_image'], -4) !== '.svg') { - $img = $or['service_image']; - } elseif (!empty($or['goods_images'])) { - $gImgs = is_array($or['goods_images']) ? $or['goods_images'] : explode(',', (string)$or['goods_images']); - $firstG = reset($gImgs); - if ($firstG && substr($firstG, -4) !== '.svg') { - $img = $firstG; - } - } elseif (!empty($or['s_image']) && substr($or['s_image'], -4) !== '.svg') { - $img = $or['s_image']; - } - - // 若仍无实物图片，从同类目服务中获取真实高质量商品图，坚决不用矢量小图标 - if (empty($img) || substr($img, -4) === '.svg') { - $fallbackImg = Db::name('service') - ->where('cat_id', (int)$or['cat_id']) - ->where('image', '<>', '') - ->where('image', 'not like', '%.svg%') - ->order('weigh desc, id asc') - ->value('image'); - if ($fallbackImg) { - $img = $fallbackImg; - } - } - $imageUrl = $img ? cdnurl($img, true) : ''; - - // 区域脱敏：提取有效片区，剔除详细门牌号与连续数字 - $city = trim((string)$or['city']); - $district = trim((string)$or['district']); - $address = trim((string)$or['address']); - $cleanAddr = $address; - if ($cleanAddr !== '') { - // 剔除前缀省市区冗余 - $cleanAddr = preg_replace('/^(?:.*?省)?(?:.*?市)?(?:.*?区)?/u', '', $cleanAddr); - // 剔除房间号、单元号、楼栋号 - $cleanAddr = preg_replace('/[0-9]+[室号单元栋层].*$/u', '', $cleanAddr); - // 剔除末尾连续3位以上门牌数字 - $cleanAddr = preg_replace('/[0-9]{3,}$/u', '', $cleanAddr); - $cleanAddr = trim($cleanAddr, " -_·"); - } - $locPrefix = $district ?: $city; - if ($locPrefix && $cleanAddr) { - $loc = $locPrefix . ' · ' . $cleanAddr; - } elseif ($cleanAddr) { - $loc = $cleanAddr; - } elseif ($locPrefix) { - $loc = $locPrefix; - } else { - $loc = '同城服务'; + foreach ($showcaseRows as $sc) { + $revTags = []; + if (!empty($sc['tags'])) { + $decTags = json_decode((string)$sc['tags'], true); + $revTags = is_array($decTags) ? $decTags : array_values(array_filter(explode(',', (string)$sc['tags']))); } $recentOrders[] = [ - 'id' => (int)$or['id'], - 'order_no' => $or['order_no'], - 'service_id' => (int)$or['service_id'], - 'service_name' => $or['service_name'] ?: '上门服务', - 'cat_name' => isset($or['c_name']) && $or['c_name'] ? $or['c_name'] : '服务', - 'cat_id' => (int)$or['cat_id'], - 'image_url' => $imageUrl, - 'status' => $st, - 'status_text' => '已完工', - 'pay_amount' => (float)$or['pay_amount'], - 'location' => $loc, - 'appoint_text' => $appoint ? date('m-d H:i', $appoint) : '', - 'time_ago' => $this->timeAgo($finishTime), + 'id' => (int)$sc['id'], + 'service_id' => (int)$sc['service_id'], + 'service_name' => $sc['service_name'] ?: '上门服务', + 'cat_name' => $sc['cat_name'] ?: '服务', + 'cat_id' => (int)$sc['cat_id'], + 'image_url' => $sc['cover_image'] ? cdnurl($sc['cover_image'], true) : '', + 'status_text' => '业主晒单', + 'location' => $sc['region'] ?: '同城服务', + 'time_ago' => $this->timeAgo((int)$sc['createtime']), + 'user_name' => $sc['user_name'] ?: '匿名业主', + 'review_score' => (int)$sc['score'] ?: 5, + 'review_content' => $sc['content'] ?: '师傅准时上门，施工专业细致，安装效果很满意！', + 'review_tags' => array_slice($revTags, 0, 2), ]; } $data['recent_orders'] = $recentOrders; @@ -197,6 +207,330 @@ class Home extends Base $this->success('', $data); } + /** + * 首页下方列表区域：分页、二级项目筛选、区域过滤与多维排序接口（支持【热门推荐】与【服务动态】双 Tab） + */ + public function feed() + { + $tab = trim((string)$this->request->param('tab', 'hot')); + $catId = (int)$this->request->param('cat_id', 0); + $serviceId = (int)$this->request->param('service_id', 0); + $serviceType = trim((string)$this->request->param('service_type', '')); + $region = trim((string)$this->request->param('region', '')); + $sort = trim((string)$this->request->param('sort', 'default')); + $priceRange = trim((string)$this->request->param('price_range', 'all')); + $minPrice = $this->request->param('min_price', ''); + $maxPrice = $this->request->param('max_price', ''); + $unitFilter = trim((string)$this->request->param('unit', '')); + $priceTypeFilter = trim((string)$this->request->param('price_type', '')); + $tag = trim((string)$this->request->param('tag', '')); + $onlyFixed = (int)$this->request->param('only_fixed', 0); + $hasImage = (int)$this->request->param('has_image', 0); + $page = max(1, (int)$this->request->param('page', 1)); + $limit = min(20, max(1, (int)$this->request->param('limit', 6))); + + if ($tab === 'cases') { + $buildQuery = function () use ($catId, $serviceId, $region, $tag, $hasImage, $priceRange, $minPrice, $maxPrice) { + $q = Db::name('showcase') + ->alias('sc') + ->join('service s', 'sc.service_id = s.id', 'LEFT') + ->field('sc.id,sc.cat_id,sc.cat_name,sc.service_id,sc.service_name,sc.region,sc.cover_image,sc.images,sc.user_name,sc.score,sc.tags,sc.content,sc.master_score,sc.createtime,s.base_price,s.sales') + ->where('sc.status', 'normal'); + if ($catId > 0) { + $q->where('sc.cat_id', $catId); + } + if ($serviceId > 0) { + $q->where('sc.service_id', $serviceId); + } + if ($region !== '' && $region !== 'all') { + $q->where('sc.region', $region); + } + if ($tag !== '' && $tag !== 'all') { + $q->where('sc.tags', 'like', '%' . $tag . '%'); + } + if ($hasImage === 1) { + $q->where('sc.images', '<>', '')->where('sc.images', '<>', '[]'); + } + if ($minPrice !== '' && is_numeric($minPrice)) { + $q->where('s.base_price', '>=', (float)$minPrice); + } + if ($maxPrice !== '' && is_numeric($maxPrice)) { + $q->where('s.base_price', '<=', (float)$maxPrice); + } + if ($priceRange === 'under_80') { + $q->where('s.base_price', '<', 80); + } elseif ($priceRange === '80_120') { + $q->where('s.base_price', '>=', 80)->where('s.base_price', '<=', 120); + } elseif ($priceRange === '120_up') { + $q->where('s.base_price', '>', 120); + } elseif ($priceRange === '0_80') { + $q->where('s.base_price', '<=', 80); + } elseif ($priceRange === '80_150') { + $q->where('s.base_price', '>', 80)->where('s.base_price', '<=', 150); + } elseif ($priceRange === '150_up') { + $q->where('s.base_price', '>', 150); + } + return $q; + }; + + $total = (int)$buildQuery()->count(); + $q = $buildQuery(); + if ($sort === 'sales') { + $q->order('s.sales desc, sc.createtime desc, sc.id desc'); + } elseif ($sort === 'price_asc') { + $q->order('s.base_price asc, sc.createtime desc, sc.id desc'); + } elseif ($sort === 'price_desc') { + $q->order('s.base_price desc, sc.createtime desc, sc.id desc'); + } elseif ($sort === 'score') { + $q->order('sc.score desc, sc.master_score desc, sc.createtime desc, sc.id desc'); + } else { + $q->order('sc.createtime desc, sc.id desc'); + } + $rows = $q->page($page, $limit)->select(); + + $list = []; + foreach ($rows as $sc) { + $revTags = []; + if (!empty($sc['tags'])) { + $decTags = json_decode((string)$sc['tags'], true); + $revTags = is_array($decTags) ? $decTags : array_values(array_filter(explode(',', (string)$sc['tags']))); + } + $list[] = [ + 'id' => (int)$sc['id'], + 'service_id' => (int)$sc['service_id'], + 'service_name' => $sc['service_name'] ?: '上门服务', + 'cat_name' => $sc['cat_name'] ?: '服务', + 'cat_id' => (int)$sc['cat_id'], + 'image_url' => $sc['cover_image'] ? cdnurl($sc['cover_image'], true) : '', + 'status_text' => '业主晒单', + 'location' => $sc['region'] ?: '同城服务', + 'time_ago' => $this->timeAgo((int)$sc['createtime']), + 'user_name' => $sc['user_name'] ?: '匿名业主', + 'review_score' => (int)$sc['score'] ?: 5, + 'review_content' => $sc['content'] ?: '师傅准时上门，施工专业细致，安装效果很满意！', + 'review_tags' => array_slice($revTags, 0, 3), + ]; + } + + $this->success('', [ + 'list' => $list, + 'total' => $total, + 'page' => $page, + 'limit' => $limit, + 'has_more' => ($page * $limit) < $total, + ]); + } + + // tab === 'hot'（热门服务推荐分页 + 二级项目筛选 + 区域热度加权 + 排序） + $orderQuery = Db::name('order')->where('status', 8); + if ($region !== '' && $region !== 'all') { + $orderQuery->where('district', $region); + } + $orderCounts = $orderQuery + ->group('service_id') + ->column('count(*)', 'service_id'); + + $query = Db::name('service') + ->alias('s') + ->join('service_cat c', 's.cat_id = c.id', 'LEFT') + ->field('s.id,s.cat_id,s.name,s.price_type,s.service_types,s.base_price,s.max_price,s.unit,s.image,s.sales,s.weigh,c.name as cat_name,c.icon as cat_icon') + ->where('s.status', 'normal') + ->where('s.cat_id', '<>', 15); + + $candidateServices = $query->select(); + + // 计算真实订单与综合得分 + foreach ($candidateServices as &$cs) { + $sid = (int)$cs['id']; + $realOrders = isset($orderCounts[$sid]) ? (int)$orderCounts[$sid] : 0; + $cs['real_orders'] = $realOrders; + $cs['total_sales'] = ($realOrders * 5) + (int)$cs['sales']; + $cs['score'] = ($realOrders * 15) + ((int)$cs['sales'] * 2) + ($cs['price_type'] === 'fixed' ? 25 : 0) + (int)$cs['weigh']; + if ($realOrders > 0) { + $cs['tag'] = '热销爆款'; + } elseif ($cs['price_type'] === 'fixed') { + $cs['tag'] = '明码标价'; + } else { + $cs['tag'] = '好评优选'; + } + } + unset($cs); + + // 首页【热门推荐】核心定位：精选各品类 Top 高频爆款（每类精选 Top 1~2 项，剔除低频长尾项，保证热门池精炼且筛选子集严格收敛） + usort($candidateServices, function ($a, $b) { + return $b['score'] <=> $a['score']; + }); + $curatedPool = []; + $catQuota = []; + foreach ($candidateServices as $csItem) { + $cid = (int)$csItem['cat_id']; + $salesVal = (int)$csItem['sales']; + if ($salesVal < 145 && (int)$csItem['real_orders'] === 0) { + continue; + } + $curCount = isset($catQuota[$cid]) ? $catQuota[$cid] : 0; + if ($curCount < 2) { + $curatedPool[] = $csItem; + $catQuota[$cid] = $curCount + 1; + } + } + $candidateServices = $curatedPool; + + // 1. 类目与指定商品过滤 + if ($catId > 0) { + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($catId) { + return (int)$r['cat_id'] === $catId; + })); + } + if ($serviceId > 0) { + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($serviceId) { + return (int)$r['id'] === $serviceId; + })); + } + // 2. 计价单位与计价类型过滤 + if ($unitFilter !== '' && $unitFilter !== 'all') { + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($unitFilter) { + return (string)$r['unit'] === $unitFilter; + })); + } + if ($priceTypeFilter !== '' && $priceTypeFilter !== 'all') { + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($priceTypeFilter) { + return (string)$r['price_type'] === $priceTypeFilter; + })); + } + if ($onlyFixed === 1) { + $candidateServices = array_values(array_filter($candidateServices, function ($r) { + return (string)$r['price_type'] === 'fixed'; + })); + } + + // 工项筛选与工项真实价格/名称联动 + if ($serviceType !== '' && $serviceType !== 'all') { + $matchedServices = []; + foreach ($candidateServices as $csRow) { + $types = []; + if (!empty($csRow['service_types'])) { + $dec = is_array($csRow['service_types']) ? $csRow['service_types'] : json_decode((string)$csRow['service_types'], true); + if (is_array($dec)) { + $types = $dec; + } + } + if (empty($types)) { + $types = $this->resolveServiceTypes($csRow); + } + foreach ($types as $st) { + $code = isset($st['code']) ? (string)$st['code'] : ''; + if ($code === $serviceType) { + if (!empty($st['price']) && (float)$st['price'] > 0) { + $csRow['base_price'] = (float)$st['price']; + } + if ($code !== 'install' && !empty($st['name'])) { + $shortTypeName = (string)$st['name']; + if ($code === 'deliver_install') { + $shortTypeName = '送装'; + } elseif ($code === 'clean') { + $shortTypeName = '保洁'; + } + $csRow['name'] = $csRow['name'] . ' · ' . $shortTypeName; + $csRow['tag'] = $shortTypeName . '专项'; + } + $matchedServices[] = $csRow; + break; + } + } + } + $candidateServices = $matchedServices; + } + + // 价格区间过滤（基于当前生效的 base_price 精准过滤） + if ($minPrice !== '' && is_numeric($minPrice)) { + $minVal = (float)$minPrice; + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($minVal) { + return (float)$r['base_price'] >= $minVal; + })); + } + if ($maxPrice !== '' && is_numeric($maxPrice)) { + $maxVal = (float)$maxPrice; + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($maxVal) { + return (float)$r['base_price'] <= $maxVal; + })); + } + if ($priceRange !== '' && $priceRange !== 'all') { + $candidateServices = array_values(array_filter($candidateServices, function ($r) use ($priceRange) { + $bp = (float)$r['base_price']; + if ($priceRange === 'under_80') return $bp < 80; + if ($priceRange === '80_120') return $bp >= 80 && $bp <= 120; + if ($priceRange === '120_up') return $bp > 120; + if ($priceRange === '0_80') return $bp <= 80; + if ($priceRange === '80_150') return $bp > 80 && $bp <= 150; + if ($priceRange === '150_up') return $bp > 150; + if ($priceRange === '0_50') return $bp <= 50; + if ($priceRange === '50_100') return $bp > 50 && $bp <= 100; + if ($priceRange === '100_up') return $bp > 100; + return true; + })); + } + + if ($sort === 'sales') { + usort($candidateServices, function ($a, $b) { + if ($b['total_sales'] !== $a['total_sales']) { + return $b['total_sales'] <=> $a['total_sales']; + } + return $b['score'] <=> $a['score']; + }); + } elseif ($sort === 'price_asc') { + usort($candidateServices, function ($a, $b) { + if ((float)$a['base_price'] != (float)$b['base_price']) { + return (float)$a['base_price'] <=> (float)$b['base_price']; + } + return $b['score'] <=> $a['score']; + }); + } elseif ($sort === 'price_desc') { + usort($candidateServices, function ($a, $b) { + if ((float)$b['base_price'] != (float)$a['base_price']) { + return (float)$b['base_price'] <=> (float)$a['base_price']; + } + return $b['score'] <=> $a['score']; + }); + } else { + // 默认综合推荐：先按得分排序，若为全部分类则优先保证首屏品类均衡 + usort($candidateServices, function ($a, $b) { + return $b['score'] <=> $a['score']; + }); + if ($catId === 0) { + $balanced = []; + $catSeen = []; + $usedIds = []; + foreach ($candidateServices as $cs) { + $cid = (int)$cs['cat_id']; + if (!isset($catSeen[$cid])) { + $balanced[] = $cs; + $catSeen[$cid] = 1; + $usedIds[$cs['id']] = true; + } + } + foreach ($candidateServices as $cs) { + if (!isset($usedIds[$cs['id']])) { + $balanced[] = $cs; + } + } + $candidateServices = $balanced; + } + } + + $total = count($candidateServices); + $offset = ($page - 1) * $limit; + $pagedSlice = array_slice($candidateServices, $offset, $limit); + + $this->success('', [ + 'list' => $this->formatServices($pagedSlice), + 'total' => $total, + 'page' => $page, + 'limit' => $limit, + 'has_more' => ($page * $limit) < $total, + ]); + } + /** * 全部类目 */ @@ -703,43 +1037,66 @@ class Home extends Base } elseif ($type === 'quote') { $priceText = '¥' . (float)$row['base_price'] . ' · 师傅报价'; } - // 解析工项 + // 解析主服务项目与增项服务（均与统一服务表 fa_service_type 实时联动校验） + static $typeDictCache = null; + if ($typeDictCache === null) { + $typeDictCache = Db::name('service_type') + ->where('status', 'normal') + ->order('weigh desc, id asc') + ->select(); + } + $activeTypeCodes = []; + $activeTypeNames = []; + foreach ($typeDictCache as $td) { + $activeTypeCodes[$td['code']] = $td; + $activeTypeNames[$td['name']] = $td; + } + $serviceTypes = []; if (!empty($row['service_types'])) { $serviceTypes = is_array($row['service_types']) ? $row['service_types'] : json_decode($row['service_types'], true); } if (empty($serviceTypes)) { - $serviceTypes = [ - ['code' => 'install', 'name' => '安装', 'price' => (float)$row['base_price'], 'is_default' => 1], - ['code' => 'repair', 'name' => '维修', 'price' => round((float)$row['base_price'] * 0.7, 2), 'is_default' => 0], - ['code' => 'remove', 'name' => '拆旧', 'price' => round((float)$row['base_price'] * 0.5, 2), 'is_default' => 0], - ['code' => 'deliver', 'name' => '送货到家', 'price' => 50.00, 'is_default' => 0], - ]; + $serviceTypes = $this->resolveServiceTypes($row); + } + $FixedCodes = ['install', 'repair', 'remove']; + if (!empty($activeTypeCodes)) { + $filteredTypes = []; + foreach ($serviceTypes as $st) { + $c = isset($st['code']) ? $st['code'] : ''; + if ($c !== '' && isset($activeTypeCodes[$c])) { + if (!isset($st['support_fixed'])) { + $st['support_fixed'] = in_array($c, $FixedCodes, true) ? 1 : 0; + } + $filteredTypes[] = $st; + } + } + if (!empty($filteredTypes)) { + $serviceTypes = $filteredTypes; + } + } else { + foreach ($serviceTypes as &$stItem) { + $c = isset($stItem['code']) ? $stItem['code'] : ''; + if (!isset($stItem['support_fixed'])) { + $stItem['support_fixed'] = in_array($c, $FixedCodes, true) ? 1 : 0; + } + } + unset($stItem); } - // 解析增项 + // 解析增项服务（优先读取商品绑定的 addons JSON，并与统一服务表 fa_service_type 联动过滤） $addons = []; if (!empty($row['addons'])) { $addons = is_array($row['addons']) ? $row['addons'] : json_decode($row['addons'], true); } if (empty($addons)) { - // 获取类目通用增项 - $catAddons = Db::name('service_addon') - ->where('status', 'normal') - ->where(function($q) use ($row) { - $q->where('cat_id', $row['cat_id'])->whereOr('cat_id', 0); - }) - ->order('weigh desc, id asc') - ->limit(8) - ->select(); - foreach ($catAddons as $ca) { - $addons[] = [ - 'id' => (int)$ca['id'], - 'name' => $ca['name'], - 'unit' => $ca['unit'], - 'price' => (float)$ca['default_price'] - ]; - } + $addons = $this->resolveServiceAddons($row); + } elseif (!empty($activeTypeCodes)) { + $addons = array_values(array_filter($addons, function ($ad) use ($activeTypeCodes, $activeTypeNames) { + $code = isset($ad['code']) ? $ad['code'] : ''; + $name = isset($ad['name']) ? $ad['name'] : ''; + return ($code !== '' && isset($activeTypeCodes[$code])) || ($name !== '' && isset($activeTypeNames[$name])); + })); } $catIcon = isset($row['cat_icon']) && $row['cat_icon'] ? $row['cat_icon'] : ''; @@ -769,6 +1126,450 @@ class Home extends Base ]; } + /** + * 根据具体商品名称与所属类目返回精准匹配的服务项目列表（1:1 对标奇兵到家图2 & 图3） + */ + protected function resolveServiceTypes($row) + { + $catId = (int)$row['cat_id']; + $name = (string)$row['name']; + $bp = max(30, (float)$row['base_price']); + + $make = function ($items) use ($bp) { + $res = []; + $fixedCodes = ['install', 'repair', 'remove']; + foreach ($items as $idx => $it) { + $ratio = isset($it[2]) ? (float)$it[2] : 1.0; + $fixed = isset($it[3]) && $it[3] !== null ? (float)$it[3] : round($bp * $ratio, 2); + $supportFixed = isset($it[4]) ? (int)$it[4] : (in_array($it[0], $fixedCodes, true) ? 1 : 0); + $res[] = [ + 'code' => $it[0], + 'name' => $it[1], + 'price' => $fixed, + 'is_default' => $idx === 0 ? 1 : 0, + 'support_fixed' => $supportFixed, + ]; + } + return $res; + }; + + // 类目 15：其它（1:1 复刻图3） + if ($catId === 15) { + return $make([ + ['install', '安装', 1.0, null, 0], + ['repair', '维修', 0.8, null, 0], + ['grout', '美缝', 1.0, null, 0], + ['glue', '打胶', 0.6, null, 0], + ['remove', '拆旧', 0.5, null, 0], + ['deliver', '送货到家', 0.7, 50, 0], + ['deliver_install', '送货到家并安装', 1.3, null, 0], + ['deliver_downstairs', '送货到楼下(不含上楼)', 0.5, 35, 0], + ['clean', '保洁', 1.0, null, 0], + ['drill', '打孔', 0.5, 30, 0], + ['film', '贴膜', 0.8, null, 0], + ['move', '移机', 1.1, null, 0], + ['other', '其他', 1.0, null, 0], + ]); + } + + // 类目 6：墙纸/壁画（1:1 复刻图2） + if ($catId === 6) { + if (strpos($name, '画') !== false && strpos($name, '壁画') === false) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 1.15], + ['remove', '拆旧', 0.5, 30], + ['drill', '打孔', 0.6, 30, 0], + ['deliver_install', '送货到家并安装', 1.3, null, 0], + ]); + } + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 1.15], + ['deliver', '送货到家', 0.7, 50, 0], + ['deliver_install', '送货到家并安装', 1.3, null, 0], + ['deliver_downstairs', '送货到楼下(不含上楼)', 0.5, 35, 0], + ]); + } + + // 类目 1：家具（1:1 复刻视频 00:02 的 11 项服务项目，且安装/维修/拆旧支持一口价，其余自动转报价） + if ($catId === 1) { + $repairPrice = round($bp + 10, 2); + return $make([ + ['install', '安装', 1.0, $bp, 1], + ['repair', '维修', 1.18, $repairPrice, 1], + ['remove', '拆旧', 0.9, 50, 1], + ['paint_repair', '补漆修复', 1.0, 80, 0], + ['measure', '测量', 0.8, 50, 0], + ['deliver', '送货到家', 0.7, 60, 0], + ['deliver_install', '送货到家并安装', 1.35, round($bp * 1.35, 2), 0], + ['deliver_downstairs', '送货到楼下(不含上楼)', 0.5, 40, 0], + ['return_goods', '返货', 0.8, 50, 0], + ['maintain', '保养', 0.8, 60, 0], + ['open_hole', '开孔', 0.5, 30, 0], + ]); + } + + // 类目 2：卫浴（区分马桶、花洒龙头、浴室柜/浴缸、浴霸） + if ($catId === 2) { + if (preg_match('/(马桶|便器)/u', $name)) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.5], + ['glue', '打胶', 0.4, 30], + ['grout', '美缝', 0.6, 50], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + if (preg_match('/(花洒|龙头|扶手|镜)/u', $name)) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.4], + ['drill', '打孔', 0.4, 25], + ]); + } + if (preg_match('/(浴霸|水泵)/u', $name)) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.75], + ['remove', '拆旧', 0.45], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.5], + ['glue', '打胶', 0.4, 30], + ['deliver', '送货到家', 0.6, 50], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + + // 类目 3：灯具 + if ($catId === 3) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.4], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + + // 类目 4：锁具 + if ($catId === 4) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.4], + ['drill', '打孔', 0.5, 40], + ]); + } + + // 类目 5：窗帘 + if ($catId === 5) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['measure', '测量', 0.5, 40], + ['remove', '拆旧', 0.4], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + + // 类目 7：净水器 + if ($catId === 7) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['filter', '换滤芯', 0.5, 40], + ['remove', '拆旧', 0.4], + ['move', '移机', 1.1], + ]); + } + + // 类目 8：晾衣架（区分电动、手摇、户外推拉/落地） + if ($catId === 8) { + if (strpos($name, '电动') !== false) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.4], + ['deliver', '送货到家', 0.6, 45], + ['deliver_install', '送货到家并安装', 1.25], + ['move', '移机', 1.1], + ]); + } + if (strpos($name, '户外') !== false || strpos($name, '推拉') !== false) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.4], + ['drill', '打孔', 0.5, 30], + ]); + } + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.4], + ['deliver', '送货到家', 0.6, 45], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + + // 类目 9：门窗 + if ($catId === 9) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['measure', '测量', 0.4, 50], + ['remove', '拆旧', 0.5], + ['glue', '打胶', 0.4, 40], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + + // 类目 10：家电（区分空调、厨电、洗衣机冰箱） + if ($catId === 10) { + if (strpos($name, '空调') !== false) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['move', '移机', 1.2], + ['remove', '拆旧', 0.5], + ['clean', '保洁清洗', 0.6, 80], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.45], + ['clean', '保洁清洗', 0.6, 70], + ['drill', '打孔', 0.4, 40], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + + // 类目 11：电视/投影 + if ($catId === 11) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['move', '移机', 1.0], + ['remove', '拆旧', 0.4], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + + // 类目 12：淋浴房 + if ($catId === 12) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['measure', '测量', 0.3, 50], + ['remove', '拆旧', 0.45], + ['glue', '打胶', 0.3, 40], + ['film', '贴膜', 0.4, 80], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + + // 类目 13：商用厨电 + if ($catId === 13) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['clean', '保洁', 0.8], + ['remove', '拆旧', 0.5], + ['deliver_install', '送货到家并安装', 1.25], + ]); + } + + // 类目 14：健身器材 + if ($catId === 14) { + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['move', '移机', 1.1], + ['remove', '拆旧', 0.5], + ['deliver', '送货到家', 0.6, 60], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + + return $make([ + ['install', '安装', 1.0], + ['repair', '维修', 0.7], + ['remove', '拆旧', 0.5], + ['deliver', '送货到家', 0.6, 50], + ['deliver_install', '送货到家并安装', 1.3], + ]); + } + + /** + * 根据具体商品名称与所属类目返回极简增值服务（增项）列表（1:1 对标奇兵到家：仅保留“拆旧”、“切割”等 1~2 项极简短词） + */ + protected function resolveServiceAddons($row) + { + $catId = (int)$row['cat_id']; + $name = (string)$row['name']; + + $codeMap = [ + '拆旧' => 'remove', + '切割' => 'cut', + '打孔' => 'drill', + '开孔' => 'open_hole', + ]; + $build = function ($items) use ($codeMap) { + $res = []; + foreach ($items as $idx => $it) { + $res[] = [ + 'id' => $idx + 1, + 'code' => isset($codeMap[$it[0]]) ? $codeMap[$it[0]] : ('addon_' . ($idx + 1)), + 'name' => $it[0], + 'unit' => $it[1], + 'price' => (float)$it[2], + ]; + } + return $res; + }; + + // 类目 1：家具（对标视频 00:06 / 00:17：电脑桌仅“拆旧 50元/份”，柜类多一项“切割 20元/份”） + if ($catId === 1) { + if (preg_match('/(柜)/u', $name)) { + return $build([ + ['拆旧', '份', 50], + ['切割', '份', 20], + ]); + } + return $build([ + ['拆旧', '份', 50], + ]); + } + + // 类目 2：卫浴（对标奇兵到家截图 frame_010：洗衣柜/浴室柜为“拆旧 50元/份”、“切割 20元/份”，马桶/花洒为“拆旧”） + if ($catId === 2) { + if (preg_match('/(浴室柜|洗衣柜|面盆|洗面盆|水槽|拖把池)/u', $name)) { + return $build([ + ['拆旧', '份', 50], + ['切割', '份', 20], + ]); + } + if (preg_match('/(马桶|便器)/u', $name)) { + return $build([ + ['拆旧', '份', 50], + ]); + } + if (preg_match('/(浴缸)/u', $name)) { + return $build([ + ['拆旧', '份', 80], + ]); + } + return $build([ + ['拆旧', '份', 30], + ]); + } + + // 类目 3：灯具 + if ($catId === 3) { + return $build([ + ['拆旧', '份', 20], + ]); + } + + // 类目 4：锁具 + if ($catId === 4) { + return $build([ + ['拆旧', '份', 30], + ['开孔', '份', 30], + ]); + } + + // 类目 5：窗帘 + if ($catId === 5) { + return $build([ + ['拆旧', '份', 30], + ]); + } + + // 类目 6：墙纸/壁画 + if ($catId === 6) { + return $build([ + ['拆旧', '份', 30], + ]); + } + + // 类目 7：净水器 + if ($catId === 7) { + return $build([ + ['拆旧', '份', 30], + ['打孔', '份', 30], + ]); + } + + // 类目 8：晾衣架 + if ($catId === 8) { + return $build([ + ['拆旧', '份', 30], + ]); + } + + // 类目 9：门窗 + if ($catId === 9) { + return $build([ + ['拆旧', '份', 50], + ]); + } + + // 类目 10：家电 + if ($catId === 10) { + if (strpos($name, '空调') !== false) { + return $build([ + ['拆旧', '份', 80], + ['打孔', '份', 50], + ]); + } + return $build([ + ['拆旧', '份', 40], + ]); + } + + // 类目 11：电视/投影 + if ($catId === 11) { + return $build([ + ['拆旧', '份', 30], + ]); + } + + // 类目 12：淋浴房 + if ($catId === 12) { + return $build([ + ['拆旧', '份', 80], + ]); + } + + // 类目 13：商用厨电 + if ($catId === 13) { + return $build([ + ['拆旧', '份', 80], + ]); + } + + // 类目 14：健身器材 + if ($catId === 14) { + return $build([ + ['拆旧', '份', 60], + ]); + } + + return $build([ + ['拆旧', '份', 30], + ]); + } + /** * 相对时间计算（更具真实动态感） */ @@ -784,223 +1585,92 @@ class Home extends Base } /** - * 公开工单案例详情（含脱敏订单信息、现场施工、师傅名片与真实评价） + * 公开业主晒单详情（直接读取独立晒单表 fa_showcase，仅返回必要脱敏晒单信息） */ public function orderCase() { $id = (int)$this->request->param('id'); if ($id <= 0) { - $this->error('工单参数错误'); + $this->error('晒单参数错误'); } - $order = Db::name('order')->where('id', $id)->find(); - if (!$order) { - $this->error('工单案例不存在'); + // 优先按晒单主键 id 查询，兼容从本人订单详情跳转时传入的 order_id + $sc = Db::name('showcase')->where('id', $id)->where('status', 'normal')->find(); + if (!$sc) { + $sc = Db::name('showcase')->where('order_id', $id)->where('status', 'normal')->find(); + } + if (!$sc) { + $this->error('该晒单不存在或已取消公开'); } - $service = Db::name('service')->where('id', (int)$order['service_id'])->find(); - $cat = Db::name('service_cat')->where('id', (int)$order['cat_id'])->find(); + $service = Db::name('service')->where('id', (int)$sc['service_id'])->find(); + $basePrice = ($service && (float)$service['base_price'] > 0) ? (float)$service['base_price'] : 50.00; - // 订单状态文本映射 - $statusMap = [ - 0 => '待支付', 1 => '待接单', 2 => '待确认', 3 => '已接单', - 4 => '待上门', 5 => '已到达', 6 => '施工中', 7 => '待验收', 8 => '已完成' - ]; - $st = (int)$order['status']; - $statusText = isset($statusMap[$st]) ? $statusMap[$st] : '已完成'; - - // 封面图提取（优先非矢量真实图片） - $img = ''; - if (!empty($order['service_image']) && substr($order['service_image'], -4) !== '.svg') { - $img = $order['service_image']; - } elseif (!empty($order['goods_images'])) { - $gImgs = is_array($order['goods_images']) ? $order['goods_images'] : explode(',', (string)$order['goods_images']); - $firstG = reset($gImgs); - if ($firstG && substr($firstG, -4) !== '.svg') { - $img = $firstG; - } - } elseif ($service && !empty($service['image']) && substr($service['image'], -4) !== '.svg') { - $img = $service['image']; - } - if (empty($img) || substr($img, -4) === '.svg') { - $fallbackImg = Db::name('service') - ->where('cat_id', (int)$order['cat_id']) - ->where('image', '<>', '') - ->where('image', 'not like', '%.svg%') - ->order('weigh desc, id asc') - ->value('image'); - if ($fallbackImg) { - $img = $fallbackImg; - } elseif ($cat && !empty($cat['icon'])) { - $img = $cat['icon']; - } - } - $imageUrl = $img ? cdnurl($img, true) : ''; - - // 区域脱敏 - $city = trim((string)$order['city']); - $district = trim((string)$order['district']); - $address = trim((string)$order['address']); - $cleanAddr = $address; - if ($cleanAddr !== '') { - $cleanAddr = preg_replace('/^(?:.*?省)?(?:.*?市)?(?:.*?区)?/u', '', $cleanAddr); - $cleanAddr = preg_replace('/[0-9]+[室号单元栋层].*$/u', '', $cleanAddr); - $cleanAddr = preg_replace('/[0-9]{3,}$/u', '', $cleanAddr); - $cleanAddr = trim($cleanAddr, " -_·"); - } - $locPrefix = $district ?: $city; - if ($locPrefix && $cleanAddr) { - $loc = $locPrefix . ' · ' . $cleanAddr; - } elseif ($cleanAddr) { - $loc = $cleanAddr; - } elseif ($locPrefix) { - $loc = $locPrefix; - } else { - $loc = '同城上门服务'; + $imageUrl = $sc['cover_image'] ? cdnurl($sc['cover_image'], true) : ''; + $tags = []; + if (!empty($sc['tags'])) { + $dec = json_decode((string)$sc['tags'], true); + $tags = is_array($dec) ? $dec : array_values(array_filter(explode(',', (string)$sc['tags']))); } - // 订单号脱敏 - $orderNo = (string)$order['order_no']; - if (strlen($orderNo) > 10) { - $maskedOrderNo = substr($orderNo, 0, 6) . '****' . substr($orderNo, -4); - } else { - $maskedOrderNo = $orderNo; - } - - // 商品列表 - $goodsRows = Db::name('order_goods')->where('order_id', $id)->select(); - $goodsList = []; - foreach ($goodsRows as $gr) { - $goodsList[] = [ - 'id' => (int)$gr['id'], - 'goods_name' => $gr['goods_name'], - 'goods_model' => $gr['goods_model'], - 'goods_num' => (int)$gr['goods_num'], - 'addon_services' => $gr['addon_services'], - 'base_price' => (float)$gr['base_price'], - ]; - } - - // 施工现场媒体图片 - $mediaRows = Db::name('order_media')->where('order_id', $id)->order('id asc')->select(); + $rImgs = []; $mediaList = []; - foreach ($mediaRows as $mr) { - $mUrl = $mr['url'] ? cdnurl($mr['url'], true) : ''; - if ($mUrl) { - $mediaList[] = [ - 'id' => (int)$mr['id'], - 'type' => $mr['type'] ?: 'image', - 'url' => $mUrl, - 'tag' => $mr['tag'] ?: '施工实况', - ]; - } - } - // 如果 order_media 为空，但有 repair_images，补充展示 - if (empty($mediaList) && !empty($order['repair_images'])) { - $rArr = explode(',', $order['repair_images']); - foreach ($rArr as $rIdx => $rImg) { - if ($rImg) { + if (!empty($sc['images'])) { + $decImgs = json_decode((string)$sc['images'], true); + $rawImgArr = is_array($decImgs) ? $decImgs : array_values(array_filter(explode(',', (string)$sc['images']))); + foreach ($rawImgArr as $idx => $imgItem) { + $imgItem = trim((string)$imgItem); + if ($imgItem !== '') { + $fullUrl = cdnurl($imgItem, true); + $rImgs[] = $fullUrl; $mediaList[] = [ - 'id' => $rIdx + 1, + 'id' => $idx + 1, 'type' => 'image', - 'url' => cdnurl(trim($rImg), true), - 'tag' => '现场实况', + 'url' => $fullUrl, + 'tag' => '晒单实拍', ]; } } } - // 师傅信息（脱敏展示） - $master = null; - if ((int)$order['master_id'] > 0) { - $m = Db::name('master')->where('id', $order['master_id'])->find(); - if ($m) { - $mName = $m['realname'] ?: '优匠师傅'; - $master = [ - 'id' => (int)$m['id'], - 'realname' => mb_substr($mName, 0, 1) . '师傅', - 'score' => (float)($m['score'] > 0 ? $m['score'] : 5.0), - 'order_count' => (int)$m['order_count'], - 'avatar' => $m['avatar'] ? cdnurl($m['avatar'], true) : '', - ]; - } - } - - // 真实评价信息 - $reviewRow = Db::name('review')->where('order_id', $id)->where('status', 'normal')->find(); - $review = null; - if ($reviewRow) { - $u = Db::name('user')->where('id', (int)$reviewRow['user_id'])->find(); - $uname = '客户'; - if ((int)$reviewRow['is_anonymous'] === 1) { - $uname = '匿名客户'; - } elseif ($u && !empty($u['nickname'])) { - $uname = mb_substr($u['nickname'], 0, 1) . '**'; - } - $tags = []; - if (!empty($reviewRow['tags'])) { - $dec = json_decode($reviewRow['tags'], true); - $tags = is_array($dec) ? $dec : array_filter(explode(',', $reviewRow['tags'])); - } - $rImgs = []; - if (!empty($reviewRow['images'])) { - $decImgs = json_decode($reviewRow['images'], true); - $rawImgArr = is_array($decImgs) ? $decImgs : array_filter(explode(',', $reviewRow['images'])); - foreach ($rawImgArr as $imgItem) { - if ($imgItem) $rImgs[] = cdnurl(trim($imgItem), true); - } - } - $review = [ - 'id' => (int)$reviewRow['id'], - 'score' => (int)$reviewRow['score'], - 'tags' => array_values($tags), - 'content' => $reviewRow['content'] ?: '师傅很专业，准时上门，施工规范细致，验收很满意！', - 'images' => array_values($rImgs), - 'reply' => (string)$reviewRow['reply'], - 'user_name' => $uname, - 'user_avatar' => ($u && !(int)$reviewRow['is_anonymous'] && $u['avatar']) ? cdnurl($u['avatar'], true) : '', - 'time_text' => date('Y-m-d', (int)$reviewRow['createtime']), - ]; - } - - $goodsName = ''; - if (!empty($goodsList)) { - $goodsName = $goodsList[0]['goods_name']; - } - if (!$goodsName) { - $goodsName = $order['goods_name'] ?: $order['service_name']; - } - $catName = $cat ? $cat['name'] : ($order['cat_name'] ?: '优选品类'); + $dateText = !empty($sc['createtime']) ? date('Y-m-d', (int)$sc['createtime']) : date('Y-m-d'); + $catName = $sc['cat_name'] ?: '上门服务'; + $serviceName = $sc['service_name'] ?: '上门服务'; $this->success('', [ 'order' => [ - 'id' => (int)$order['id'], - 'order_no' => $maskedOrderNo, - 'service_id' => (int)$order['service_id'], - 'service_name' => $order['service_name'] ?: '上门服务', - 'cat_id' => (int)$order['cat_id'], + 'id' => (int)$sc['id'], + 'service_id' => (int)$sc['service_id'], + 'service_name' => $serviceName, + 'cat_id' => (int)$sc['cat_id'], 'cat_name' => $catName, - 'goods_name' => $goodsName, 'image_url' => $imageUrl, - 'status' => $st, - 'status_text' => $statusText, - 'pay_amount' => (float)$order['pay_amount'], - 'location' => $loc, - 'appoint_text' => $order['appoint_time'] ? date('Y-m-d H:i', (int)$order['appoint_time']) : '', - 'create_text' => date('Y-m-d H:i', (int)$order['createtime']), - 'finish_text' => !empty($order['finish_time']) ? date('Y-m-d H:i', (int)$order['finish_time']) : (!empty($order['verify_time']) ? date('Y-m-d H:i', (int)$order['verify_time']) : ''), - 'goods_list' => $goodsList, + 'status_text' => '业主晒单', + 'location' => $sc['region'] ?: '同城服务', + 'finish_text' => $dateText, 'media' => $mediaList, ], - 'master' => $master, - 'review' => $review, + 'master' => [ + 'realname' => $sc['master_name'] ?: '优匠师傅', + 'score' => (float)($sc['master_score'] > 0 ? $sc['master_score'] : 5.0), + ], + 'review' => [ + 'id' => (int)$sc['id'], + 'score' => (int)$sc['score'] ?: 5, + 'tags' => $tags, + 'content' => $sc['content'] ?: '师傅很专业，准时上门，施工规范细致，验收很满意！', + 'images' => $rImgs, + 'user_name' => $sc['user_name'] ?: '匿名业主', + 'user_avatar' => $sc['user_avatar'] ? cdnurl($sc['user_avatar'], true) : '', + 'time_text' => $dateText, + ], 'service_info' => [ - 'cat_id' => (int)$order['cat_id'], + 'cat_id' => (int)$sc['cat_id'], 'cat_name' => $catName, - 'service_id' => (int)$order['service_id'], - 'service_name' => $order['service_name'] ?: '上门服务', - 'goods_name' => $goodsName, - 'base_price' => (float)$order['pay_amount'], + 'service_id' => (int)$sc['service_id'], + 'service_name' => $serviceName, + 'goods_name' => $serviceName, + 'base_price' => $basePrice, ] ]); } diff --git a/server/application/api/controller/Merchant.php b/server/application/api/controller/Merchant.php index 56a97e5..543f18b 100644 --- a/server/application/api/controller/Merchant.php +++ b/server/application/api/controller/Merchant.php @@ -248,33 +248,92 @@ class Merchant extends Base } /** - * 开票记录 + * 开票记录与可开票额度（个人用户与认证商家通用） */ public function invoices() { - $merchant = $this->requireMerchant(); - $list = Db::name('invoice')->where('merchant_id', $merchant['id'])->order('id desc')->limit(30)->select(); + $merchant = $this->merchantInfo(); + $isPassMerchant = ($merchant && $merchant['verify_status'] === 'pass'); + + if ($isPassMerchant) { + $uids = $this->merchantUserIds($merchant); + $mid = (int)$merchant['id']; + $list = Db::name('invoice') + ->where(function ($q) use ($mid, $uids) { + $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids); + }) + ->order('id desc') + ->limit(30) + ->select(); + $paid = (float)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->sum('pay_amount'); + $used = (float)Db::name('invoice') + ->where(function ($q) use ($mid, $uids) { + $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids); + }) + ->where('status', 'in', ['wait', 'issued']) + ->sum('amount'); + $issued = (float)Db::name('invoice') + ->where(function ($q) use ($mid, $uids) { + $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids); + }) + ->where('status', 'issued') + ->sum('amount'); + } else { + $uid = $this->uid(); + $list = Db::name('invoice')->where('user_id', $uid)->order('id desc')->limit(30)->select(); + $paid = (float)Db::name('order')->where('user_id', $uid)->where('pay_status', 1)->sum('pay_amount'); + $used = (float)Db::name('invoice')->where('user_id', $uid)->where('status', 'in', ['wait', 'issued'])->sum('amount'); + $issued = (float)Db::name('invoice')->where('user_id', $uid)->where('status', 'issued')->sum('amount'); + } + $statusText = ['wait' => '开票中', 'issued' => '已开票', 'reject' => '已驳回']; foreach ($list as &$row) { $row['amount'] = (float)$row['amount']; $row['status_text'] = isset($statusText[$row['status']]) ? $statusText[$row['status']] : $row['status']; $row['type_text'] = $row['type'] === 'special' ? '专用发票' : '普通发票'; + $row['title_type'] = !empty($row['tax_no']) ? 'enterprise' : 'personal'; + $row['title_type_text'] = !empty($row['tax_no']) ? '企业单位' : '个人/非企业'; $row['time_text'] = date('Y-m-d H:i', (int)$row['createtime']); } unset($row); - $this->success('', ['list' => $list]); + + $userRow = Db::name('user')->where('id', $this->uid())->field('nickname,mobile')->find(); + $personalDefaultTitle = ($userRow && !empty($userRow['nickname'])) ? (string)$userRow['nickname'] : '个人'; + + $this->success('', [ + 'list' => $list, + 'quota' => [ + 'available' => round(max(0, $paid - $used), 2), + 'paid_amount' => round($paid, 2), + 'used_amount' => round($used, 2), + 'issued_amount' => round($issued, 2), + 'is_merchant' => $isPassMerchant, + 'default_title_type' => $isPassMerchant ? 'enterprise' : 'personal', + 'default_title' => $isPassMerchant ? ($merchant['invoice_title'] ?: $merchant['name']) : $personalDefaultTitle, + 'default_tax_no' => $isPassMerchant ? (string)$merchant['invoice_tax_no'] : '', + 'enterprise_title' => $merchant ? (string)($merchant['invoice_title'] ?: $merchant['name']) : '', + 'enterprise_tax_no' => $merchant ? (string)$merchant['invoice_tax_no'] : '', + 'personal_title' => $personalDefaultTitle, + ], + ]); } /** - * 申请开票 + * 申请开票（支持个人用户与认证商家） * @ApiMethod (POST) */ public function invoice() { - $merchant = $this->requireMerchant(); + $merchant = $this->merchantInfo(); + $isPassMerchant = ($merchant && $merchant['verify_status'] === 'pass'); + $amount = round((float)$this->request->post('amount'), 2); $type = $this->request->post('type', 'normal'); - $email = trim((string)$this->request->post('email')); + $titleType = trim((string)$this->request->post('title_type', '')); + $title = trim((string)$this->request->post('title', '')); + $taxNo = strtoupper(trim((string)$this->request->post('tax_no', ''))); + $email = trim((string)$this->request->post('email', '')); + $remark = trim((string)$this->request->post('remark', '')); if ($amount <= 0) { $this->error('请填写开票金额'); @@ -283,21 +342,64 @@ class Merchant extends Base $this->error('发票类型错误'); } - $paid = (float)Db::name('order')->where('user_id', 'in', $this->merchantUserIds($merchant))->where('pay_status', 1)->sum('pay_amount'); - $used = (float)Db::name('invoice')->where('merchant_id', $merchant['id'])->where('status', 'in', ['wait', 'issued'])->sum('amount'); + if (!in_array($titleType, ['personal', 'enterprise'], true)) { + $titleType = ($isPassMerchant || $taxNo !== '' || $type === 'special') ? 'enterprise' : 'personal'; + } + + if ($titleType === 'personal') { + if ($type === 'special') { + $this->error('个人抬头仅支持开具普通发票'); + } + if ($title === '') { + $userRow = Db::name('user')->where('id', $this->uid())->field('nickname')->find(); + $title = ($userRow && !empty($userRow['nickname'])) ? (string)$userRow['nickname'] : '个人'; + } + $taxNo = ''; + } else { + if ($title === '' && $isPassMerchant) { + $title = (string)($merchant['invoice_title'] ?: $merchant['name']); + } + if ($taxNo === '' && $isPassMerchant) { + $taxNo = strtoupper(trim((string)$merchant['invoice_tax_no'])); + } + if ($title === '') { + $this->error('请填写企业发票抬头'); + } + if ($taxNo === '') { + $this->error('请填写纳税人识别号（税号）'); + } + } + + if ($isPassMerchant) { + $uids = $this->merchantUserIds($merchant); + $mid = (int)$merchant['id']; + $paid = (float)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->sum('pay_amount'); + $used = (float)Db::name('invoice') + ->where(function ($q) use ($mid, $uids) { + $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids); + }) + ->where('status', 'in', ['wait', 'issued']) + ->sum('amount'); + } else { + $uid = $this->uid(); + $paid = (float)Db::name('order')->where('user_id', $uid)->where('pay_status', 1)->sum('pay_amount'); + $used = (float)Db::name('invoice')->where('user_id', $uid)->where('status', 'in', ['wait', 'issued'])->sum('amount'); + } + $available = round(max(0, $paid - $used), 2); if ($amount > $available) { $this->error('可开票金额不足，当前可开 ¥' . $available); } Db::name('invoice')->insert([ - 'merchant_id' => (int)$merchant['id'], + 'merchant_id' => $isPassMerchant ? (int)$merchant['id'] : 0, 'user_id' => $this->uid(), 'amount' => $amount, 'type' => $type, - 'title' => $merchant['invoice_title'] ?: $merchant['name'], - 'tax_no' => $merchant['invoice_tax_no'], + 'title' => $title, + 'tax_no' => $taxNo, 'email' => $email, + 'remark' => $remark, 'status' => 'wait', 'createtime' => time(), 'updatetime' => time(), diff --git a/server/application/api/controller/Order.php b/server/application/api/controller/Order.php index 2a8fe75..b139397 100644 --- a/server/application/api/controller/Order.php +++ b/server/application/api/controller/Order.php @@ -18,6 +18,118 @@ class Order extends Base $this->success('', ['list' => OrderStatus::all()]); } + /** + * 物流单号智能识别物流公司（支持线上快递100识别 + 本地单号特征规则库双保险） + */ + public function detectExpress() + { + $raw = strtoupper(trim((string)$this->request->param('express_no', $this->request->param('logistics_no', '')))); + $no = preg_replace('/[^A-Z0-9]/', '', $raw); + if ($no === '' || strlen($no) < 5) { + $this->error('请输入正确的物流单号'); + } + + $codeMap = [ + 'shunfeng' => '顺丰速运', + 'debangwuliu' => '德邦快递', + 'debangkuaidi' => '德邦快递', + 'jd' => '京东快递', + 'kuayue' => '跨越速运', + 'shentong' => '申通快递', + 'yuantong' => '圆通速递', + 'zhongtong' => '中通快递', + 'yunda' => '韵达', + 'huitongkuaidi' => '百世快递', + 'baishiwuliu' => '百世快递', + 'tiantian' => '天天快递', + 'ems' => '邮政特快专递', + 'youzhengguonei' => '中国邮政', + 'youzhengbk' => '中国邮政', + 'zhaijisong' => '宅急送', + 'jtexpress' => '极兔速递', + 'annengwuliu' => '安能物流', + ]; + + $companyName = ''; + + // 1. 优先匹配高确定性的标准物流单号前缀规则 + if (strpos($no, 'SF') === 0) { + $companyName = '顺丰速运'; + } elseif (strpos($no, 'DP') === 0 || strpos($no, 'DB') === 0) { + $companyName = '德邦快递'; + } elseif (strpos($no, 'JD') === 0 || strpos($no, 'KK') === 0) { + $companyName = '京东快递'; + } elseif (strpos($no, 'KY') === 0) { + $companyName = '跨越速运'; + } elseif (strpos($no, 'YT') === 0) { + $companyName = '圆通速递'; + } elseif (strpos($no, 'ST') === 0 || strpos($no, '77') === 0) { + $companyName = '申通快递'; + } elseif (strpos($no, 'ZT') === 0 || preg_match('/^(73|75|76|78)\d{10,12}$/', $no)) { + $companyName = '中通快递'; + } elseif (strpos($no, 'YD') === 0 || preg_match('/^(31|43|46)\d{11,13}$/', $no)) { + $companyName = '韵达'; + } elseif (strpos($no, 'BS') === 0 || strpos($no, 'HT') === 0 || preg_match('/^55\d{11,13}$/', $no)) { + $companyName = '百世快递'; + } elseif (strpos($no, 'TT') === 0 || preg_match('/^66\d{10,12}$/', $no)) { + $companyName = '天天快递'; + } elseif (preg_match('/^(EMS|EA|EB|EC|ED|EE|EF|10|11)\d{7,11}/', $no)) { + $companyName = '邮政特快专递'; + } elseif (preg_match('/^(98|99|YZ)\d{9,13}$/', $no)) { + $companyName = '中国邮政'; + } elseif (strpos($no, 'ZJS') === 0) { + $companyName = '宅急送'; + } elseif (strpos($no, 'JT') === 0) { + $companyName = '极兔速递'; + } elseif (strpos($no, 'ANE') === 0) { + $companyName = '安能物流'; + } + + // 2. 若前缀未命中，尝试快递100智能单号识别接口（1.5秒超时保护） + if ($companyName === '') { + try { + $ctx = stream_context_create([ + 'http' => ['timeout' => 1.5, 'ignore_errors' => true], + 'ssl' => ['verify_peer' => false, 'verify_peer_name' => false], + ]); + $resp = @file_get_contents('https://www.kuaidi100.com/autonumber/autoComNum?text=' . urlencode($no), false, $ctx); + if ($resp) { + $json = json_decode($resp, true); + if (!empty($json['auto']) && is_array($json['auto'])) { + foreach ($json['auto'] as $item) { + $code = isset($item['comCode']) ? strtolower((string)$item['comCode']) : ''; + if (isset($codeMap[$code])) { + $companyName = $codeMap[$code]; + break; + } + } + } + } + } catch (\Exception $e) {} + } + + // 3. 常见纯数字位数兜底识别 + if ($companyName === '') { + if (preg_match('/^\d{15}$/', $no)) { + $companyName = '德邦快递'; + } elseif (preg_match('/^\d{12}$/', $no)) { + $companyName = '顺丰速运'; + } elseif (preg_match('/^\d{13}$/', $no)) { + $companyName = '圆通速递'; + } elseif (preg_match('/^\d{14}$/', $no)) { + $companyName = '中通快递'; + } else { + $companyName = '德邦快递'; + } + } + + $this->success('已识别物流公司', [ + 'express_no' => $no, + 'company_name' => $companyName, + 'matched' => true, + ]); + } + /** * 下单（创建待支付订单） * @ApiMethod (POST) @@ -203,6 +315,15 @@ class Order extends Base $goodsImagesPayload = json_encode($extraPayload, JSON_UNESCAPED_UNICODE); } + $orderContact = trim((string)$this->request->post('order_contact', '')); + $expressNo = trim((string)$this->request->post('express_no', $this->request->post('logistics_no', ''))); + $expressCompany = trim((string)$this->request->post('express_company', $this->request->post('logistics_company', ''))); + $goodsArrived = (int)$this->request->post('goods_arrived', 1); + $orderSource = trim((string)$this->request->post('order_source', '')); + $sourceOrderNo = trim((string)$this->request->post('source_order_no', '')); + $qualReq = trim((string)$this->request->post('qual_req', '')); + $masterReq = trim((string)$this->request->post('master_req', '')); + $id = Db::name('order')->insertGetId([ 'order_no' => $orderNo, 'user_id' => $this->uid(), @@ -227,6 +348,14 @@ class Order extends Base 'address' => $address['address'], 'lng' => $address['lng'], 'lat' => $address['lat'], + 'order_contact' => mb_substr($orderContact, 0, 100), + 'express_no' => mb_substr($expressNo, 0, 64), + 'express_company' => mb_substr($expressCompany, 0, 64), + 'goods_arrived' => $goodsArrived ? 1 : 0, + 'order_source' => mb_substr($orderSource, 0, 100), + 'source_order_no' => mb_substr($sourceOrderNo, 0, 64), + 'qual_req' => mb_substr($qualReq, 0, 255), + 'master_req' => mb_substr($masterReq, 0, 255), 'appoint_time' => $appointTime ?: null, 'base_amount' => $amount['base_amount'], 'floor_amount' => $amount['floor_amount'], @@ -510,6 +639,93 @@ class Order extends Base $this->success('订单已删除'); } + /** + * 一键晒单 / 取消晒单（仅限已完成订单，控制是否在首页服务动态公开展示） + * @ApiMethod (POST) + */ + public function showcase() + { + $orderId = (int)$this->request->post('order_id'); + $isShowcase = (int)$this->request->post('is_showcase', 1) ? 1 : 0; + $content = trim((string)$this->request->post('content', '')); + + $order = $this->ownOrder($orderId, 'user'); + if ((int)$order['status'] !== OrderStatus::COMPLETED) { + $this->error('仅已完成的订单支持晒单操作'); + } + + $now = time(); + Db::startTrans(); + try { + if ($isShowcase === 1) { + $existingReview = Db::name('review')->where('order_id', $orderId)->find(); + if ($existingReview) { + $updateRev = ['is_showcase' => 1]; + if ($content !== '') { + $updateRev['content'] = mb_substr($content, 0, 500); + } + Db::name('review')->where('id', (int)$existingReview['id'])->update($updateRev); + } else { + // 若尚未评价直接点击一键晒单，自动复用完工验收图生成五星好评晒单 + $mediaUrls = Db::name('order_media') + ->where('order_id', $orderId) + ->order('id desc') + ->limit(6) + ->column('url'); + $imagesStr = !empty($mediaUrls) ? json_encode(array_values($mediaUrls), JSON_UNESCAPED_UNICODE) : ''; + $defaultContent = $content !== '' ? mb_substr($content, 0, 500) : '师傅准时上门，施工专业细致，验收非常满意，主动晒单推荐！'; + Db::name('review')->insert([ + 'order_id' => $orderId, + 'user_id' => $this->uid(), + 'master_id' => (int)$order['master_id'], + 'score' => 5, + 'tags' => '准时,专业,值得推荐', + 'content' => $defaultContent, + 'images' => $imagesStr, + 'is_anonymous' => 0, + 'is_showcase' => 1, + 'status' => 'normal', + 'createtime' => $now, + ]); + $masterId = (int)$order['master_id']; + if ($masterId > 0) { + $avg = Db::name('review')->where('master_id', $masterId)->where('status', 'normal')->avg('score'); + Db::name('master')->where('id', $masterId)->update([ + 'score' => round((float)$avg, 2), + 'updatetime' => $now, + ]); + } + } + Db::name('order')->where('id', $orderId)->update([ + 'is_review' => 1, + 'is_showcase' => 1, + 'showcase_time' => $now, + 'updatetime' => $now, + ]); + $showcaseId = $this->syncOrderShowcase($order, 1); + } else { + Db::name('order')->where('id', $orderId)->update([ + 'is_showcase' => 0, + 'updatetime' => $now, + ]); + Db::name('review')->where('order_id', $orderId)->update([ + 'is_showcase' => 0, + ]); + $showcaseId = $this->syncOrderShowcase($order, 0); + } + Db::commit(); + } catch (\Exception $e) { + Db::rollback(); + $this->error('操作失败：' . $e->getMessage()); + } + + $this->success($isShowcase ? '已公开晒单至首页服务动态' : '已取消公开晒单', [ + 'is_showcase' => $isShowcase, + 'showcase_id' => isset($showcaseId) ? (int)$showcaseId : 0, + 'is_review' => 1, + ]); + } + /** * 订单详情（含状态轨迹与师傅信息） */ @@ -600,7 +816,8 @@ class Order extends Base if (empty($goodsList)) { $goodsList = [ [ - 'goods_name' => $formattedOrder['goods_name'] ?: $formattedOrder['service_name'], + // fa_order 表无 goods_name 字段，回退使用 service_name + 'goods_name' => $formattedOrder['service_name'], 'goods_model' => $formattedOrder['goods_model'] ?: '', 'goods_num' => max(1, (int)$formattedOrder['goods_num']), 'goods_image' => $formattedOrder['goods_image_url'], @@ -610,6 +827,39 @@ class Order extends Base ]; } + $review = null; + $revRow = Db::name('review')->where('order_id', $orderId)->where('status', 'normal')->find(); + if ($revRow) { + $revTags = []; + if (!empty($revRow['tags'])) { + $decTags = json_decode($revRow['tags'], true); + $revTags = is_array($decTags) ? $decTags : array_values(array_filter(explode(',', (string)$revRow['tags']))); + } + $revImgs = []; + if (!empty($revRow['images'])) { + $decImgs = json_decode($revRow['images'], true); + $rawImgs = is_array($decImgs) ? $decImgs : array_values(array_filter(explode(',', (string)$revRow['images']))); + foreach ($rawImgs as $rImg) { + if ($rImg) { + $revImgs[] = cdnurl(trim($rImg), true); + } + } + } + $review = [ + 'id' => (int)$revRow['id'], + 'score' => (int)$revRow['score'], + 'tags' => $revTags, + 'content' => (string)$revRow['content'], + 'images' => $revImgs, + 'is_anonymous' => (int)$revRow['is_anonymous'], + 'is_showcase' => isset($revRow['is_showcase']) ? (int)$revRow['is_showcase'] : (int)$formattedOrder['is_showcase'], + 'time_text' => date('Y-m-d H:i', (int)$revRow['createtime']), + ]; + } + + $showcaseRow = Db::name('showcase')->where('order_id', $orderId)->where('status', 'normal')->find(); + $formattedOrder['showcase_id'] = $showcaseRow ? (int)$showcaseRow['id'] : 0; + $this->success('', [ 'order' => $formattedOrder, 'goods_list' => $goodsList, @@ -617,6 +867,7 @@ class Order extends Base 'logs' => $logs, 'media' => $media, 'quotes' => $quotes, + 'review' => $review, 'can_choose_quote' => $order['price_type'] === 'quote' && (int)$order['status'] === OrderStatus::QUOTING && (int)$order['master_id'] === 0, @@ -941,6 +1192,8 @@ class Order extends Base 'can_delete' => in_array($status, [OrderStatus::CANCELLED, OrderStatus::COMPLETED], true), 'can_verify' => $status === OrderStatus::PENDING_VERIFY, 'can_review' => $status === OrderStatus::COMPLETED && (int)$row['is_review'] === 0, + 'can_showcase' => $status === OrderStatus::COMPLETED, + 'is_showcase' => isset($row['is_showcase']) ? (int)$row['is_showcase'] : 0, 'can_pay' => $status === OrderStatus::PENDING_PAY, 'pay_amount' => (float)$row['pay_amount'], 'total_amount' => (float)$row['total_amount'], diff --git a/server/application/api/controller/Review.php b/server/application/api/controller/Review.php index 467b1c0..4db1fde 100644 --- a/server/application/api/controller/Review.php +++ b/server/application/api/controller/Review.php @@ -22,8 +22,9 @@ class Review extends Base $score = (int)$this->request->post('score', 5); $content = trim((string)$this->request->post('content')); $tags = $this->request->post('tags', ''); - $images = $this->request->post('images', ''); + $images = $this->request->post('images', '', null); $anonymous = (int)$this->request->post('is_anonymous', 0); + $isShowcase = (int)$this->request->post('is_showcase', 1); $order = $this->ownOrder($orderId, 'user'); if ((int)$order['status'] !== OrderStatus::COMPLETED) { @@ -36,6 +37,7 @@ class Review extends Base $this->error('请选择 1-5 星'); } + $now = time(); Db::startTrans(); try { Db::name('review')->insert([ @@ -47,10 +49,16 @@ class Review extends Base 'content' => mb_substr($content, 0, 500), 'images' => is_array($images) ? json_encode($images, JSON_UNESCAPED_UNICODE) : (string)$images, 'is_anonymous' => $anonymous ? 1 : 0, + 'is_showcase' => $isShowcase ? 1 : 0, 'status' => 'normal', - 'createtime' => time(), + 'createtime' => $now, + ]); + Db::name('order')->where('id', $orderId)->update([ + 'is_review' => 1, + 'is_showcase' => $isShowcase ? 1 : 0, + 'showcase_time' => $isShowcase ? $now : null, + 'updatetime' => $now, ]); - Db::name('order')->where('id', $orderId)->update(['is_review' => 1, 'updatetime' => time()]); // 刷新师傅综合评分 $masterId = (int)$order['master_id']; @@ -61,6 +69,9 @@ class Review extends Base 'updatetime' => time(), ]); } + + // 同步至独立晒单表 fa_showcase + $this->syncOrderShowcase($order, $isShowcase ? 1 : 0); Db::commit(); } catch (\Exception $e) { Db::rollback(); diff --git a/server/application/extra/site.php b/server/application/extra/site.php index a3efc33..7201395 100755 --- a/server/application/extra/site.php +++ b/server/application/extra/site.php @@ -4,7 +4,7 @@ return array ( 'name' => '优匠优服', 'beian' => '', 'cdnurl' => '', - 'version' => '1.0.24', + 'version' => '1.0.43', 'timezone' => 'Asia/Shanghai', 'forbiddenip' => '', 'languages' => diff --git a/server/application/route.php b/server/application/route.php index 7ef002c..49ff554 100755 --- a/server/application/route.php +++ b/server/application/route.php @@ -21,6 +21,12 @@ Route::rule('service.cat', 'admin/service.cat/index'); Route::rule('service/addon/:action', 'admin/service.addon/:action'); Route::rule('service/addon', 'admin/service.addon/index'); +Route::rule('service/type/:action', 'admin/service.type/:action'); +Route::rule('service/type', 'admin/service.type/index'); + +Route::rule('service.type/:action', 'admin/service.type/:action'); +Route::rule('service.type', 'admin/service.type/index'); + Route::rule('service.addon/:action', 'admin/service.addon/:action'); Route::rule('service.addon', 'admin/service.addon/index'); diff --git a/tests/local_report_data.json b/tests/local_report_data.json index a3ed862..1eb931d 100644 --- a/tests/local_report_data.json +++ b/tests/local_report_data.json @@ -1,17 +1,17 @@ { "base": "http://yjyf:9560/api", - "time": "2026/11/9 09:54:14", + "time": "2026/11/9 16:05:22", "pass": 152, "fail": 0, "accounts": { - "user": "13989228367", - "master": "13789228367", - "merchant": "13889228367" + "user": "13911496725", + "master": "13711496725", + "merchant": "13811496725" }, "keyIds": { - "orderId": 145, - "masterId": 46, - "merchantId": "18" + "orderId": 175, + "masterId": 51, + "merchantId": "24" }, "results": [ { @@ -24,7 +24,7 @@ "module": "A-用户端登录与首页", "name": "手机号验证码登录（自动注册）", "status": "pass", - "extra": "uid=120" + "extra": "uid=135" }, { "module": "A-用户端登录与首页", @@ -36,7 +36,7 @@ "module": "A-用户端登录与首页", "name": "获取个人信息", "status": "pass", - "extra": "nickname=139****8367" + "extra": "nickname=139****6725" }, { "module": "A-用户端登录与首页", @@ -120,13 +120,13 @@ "module": "B-地址管理", "name": "新增地址(含经纬度)", "status": "pass", - "extra": "addr_id=99" + "extra": "addr_id=124" }, { "module": "B-地址管理", "name": "新增第二个地址", "status": "pass", - "extra": "addr_id=100" + "extra": "addr_id=125" }, { "module": "B-地址管理", @@ -162,13 +162,13 @@ "module": "B-地址管理", "name": "重建服务地址", "status": "pass", - "extra": "addr_id=101" + "extra": "addr_id=126" }, { "module": "C-下单与支付", "name": "创建固定价订单", "status": "pass", - "extra": "order_no=20261109095350776760" + "extra": "order_no=20261109160458819384" }, { "module": "C-下单与支付", @@ -246,13 +246,13 @@ "module": "D-师傅入驻与审核", "name": "提交师傅入驻申请", "status": "pass", - "extra": "master_id=46" + "extra": "master_id=51" }, { "module": "D-师傅入驻与审核", "name": "待审核状态重复提交=编辑资料（不产生重复档案）", "status": "pass", - "extra": "master_id=46" + "extra": "master_id=51" }, { "module": "D-师傅入驻与审核", @@ -288,19 +288,19 @@ "module": "D-师傅入驻与审核", "name": "恢复接单后大厅可用", "status": "pass", - "extra": "共 13 单" + "extra": "共 28 单" }, { "module": "E-订单大厅与抢单", "name": "大厅可见新订单", "status": "pass", - "extra": "共 13 单" + "extra": "共 28 单" }, { "module": "E-订单大厅与抢单", "name": "大厅手机号脱敏", "status": "pass", - "extra": "139****8367" + "extra": "139****6725" }, { "module": "E-订单大厅与抢单", @@ -354,7 +354,7 @@ "module": "F-报价单流程", "name": "创建报价类订单", "status": "pass", - "extra": "order_no=20261109095356870100" + "extra": "order_no=20261109160504362469" }, { "module": "F-报价单流程", @@ -462,7 +462,7 @@ "module": "G-师傅履约流转", "name": "生成验收码", "status": "pass", - "extra": "6058" + "extra": "5767" }, { "module": "G-师傅履约流转", @@ -570,7 +570,7 @@ "module": "J-优惠券", "name": "领券中心可见测试券", "status": "pass", - "extra": "5 张在发放" + "extra": "10 张在发放" }, { "module": "J-优惠券", @@ -684,7 +684,7 @@ "module": "M-商家全流程", "name": "提交企业入驻资料", "status": "pass", - "extra": "merchant_id=18" + "extra": "merchant_id=24" }, { "module": "M-商家全流程", @@ -738,13 +738,13 @@ "module": "M-商家全流程", "name": "商家逐单创建并支付", "status": "pass", - "extra": "147,148" + "extra": "177,178" }, { "module": "M-商家全流程", "name": "订单归属同一批次", "status": "pass", - "extra": "batch_no=20261109095408474" + "extra": "batch_no=20261109160516772" }, { "module": "M-商家全流程", @@ -870,7 +870,7 @@ "module": "O-超时回流硬规则", "name": "创建回流验证订单", "status": "pass", - "extra": "order_no=20261109095409937617" + "extra": "order_no=20261109160518135532" }, { "module": "O-超时回流硬规则", diff --git a/yjyf-app/components/AddonServiceDrawer.vue b/yjyf-app/components/AddonServiceDrawer.vue index a272659..66c7d0b 100644 --- a/yjyf-app/components/AddonServiceDrawer.vue +++ b/yjyf-app/components/AddonServiceDrawer.vue @@ -1,7 +1,7 @@