From 9814f3b0edfefc5aef0f503f1b6959c01b93fde6 Mon Sep 17 00:00:00 2001 From: qinzexin <“731344816@qq.com”> Date: Tue, 17 Jun 2025 18:35:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=90=86=E4=BA=BA=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=EF=BC=9A=E5=8F=91=E7=A5=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/activity/order/Order.php | 5 + .../admin/controller/user/invoice/Apply.php | 5 +- .../admin/controller/user/invoice/Header.php | 5 +- .../model/school/activity/order/Order.php | 30 +- .../school/activity/order/order/index.html | 10 +- .../admin/view/user/invoice/apply/add.html | 10 +- .../admin/view/user/invoice/apply/edit.html | 13 +- .../admin/view/user/invoice/apply/index.html | 22 +- .../admin/view/user/invoice/header/add.html | 10 +- .../admin/view/user/invoice/header/edit.html | 13 +- .../model/school/activity/order/Order.php | 92 +- .../common/model/user/invoice/Apply.php | 203 + .../common/model/user/invoice/Header.php | 82 + .../school/activity/order/Order.php | 5 + .../controller/user/invoice/Apply.php | 87 + .../controller/user/invoice/Header.php | 230 + .../lang/zh-cn/user/invoice/apply.php | 32 + .../lang/zh-cn/user/invoice/header.php | 27 + .../model/school/activity/order/Order.php | 31 +- .../manystore/model/user/invoice/Apply.php | 107 + .../manystore/model/user/invoice/Header.php | 82 + .../manystore/validate/user/invoice/Apply.php | 27 + .../validate/user/invoice/Header.php | 27 + .../school/activity/order/order/index.html | 10 +- .../view/user/invoice/apply/add.html | 124 + .../view/user/invoice/apply/edit.html | 124 + .../view/user/invoice/apply/index.html | 44 + .../view/user/invoice/header/add.html | 100 + .../view/user/invoice/header/edit.html | 100 + .../view/user/invoice/header/index.html | 34 + .../最终敏感词库_去过敏常用词加强版.txt | 19995 ++++++++++++++++ .../js/backend/school/activity/order/order.js | 44 + .../manystore/school/activity/order/order.js | 66 + .../assets/js/manystore/user/invoice/apply.js | 70 + .../js/manystore/user/invoice/header.js | 67 + 35 files changed, 21900 insertions(+), 33 deletions(-) create mode 100644 application/common/model/user/invoice/Apply.php create mode 100644 application/common/model/user/invoice/Header.php create mode 100644 application/manystore/controller/user/invoice/Apply.php create mode 100644 application/manystore/controller/user/invoice/Header.php create mode 100644 application/manystore/lang/zh-cn/user/invoice/apply.php create mode 100644 application/manystore/lang/zh-cn/user/invoice/header.php create mode 100644 application/manystore/model/user/invoice/Apply.php create mode 100644 application/manystore/model/user/invoice/Header.php create mode 100644 application/manystore/validate/user/invoice/Apply.php create mode 100644 application/manystore/validate/user/invoice/Header.php create mode 100644 application/manystore/view/user/invoice/apply/add.html create mode 100644 application/manystore/view/user/invoice/apply/edit.html create mode 100644 application/manystore/view/user/invoice/apply/index.html create mode 100644 application/manystore/view/user/invoice/header/add.html create mode 100644 application/manystore/view/user/invoice/header/edit.html create mode 100644 application/manystore/view/user/invoice/header/index.html create mode 100644 extend/bw/sensitivewords/Vocabulary/最终敏感词库_去过敏常用词加强版.txt create mode 100644 public/assets/js/manystore/user/invoice/apply.js create mode 100644 public/assets/js/manystore/user/invoice/header.js diff --git a/application/admin/controller/school/activity/order/Order.php b/application/admin/controller/school/activity/order/Order.php index 67fbb51..88b7594 100644 --- a/application/admin/controller/school/activity/order/Order.php +++ b/application/admin/controller/school/activity/order/Order.php @@ -28,6 +28,10 @@ class Order extends Backend $this->view->assign("serverStatusList", $this->model->getServerStatusList()); $this->view->assign("authStatusList", $this->model->getAuthStatusList()); $this->view->assign("suspendStatusList", $this->model->getSuspendStatusList()); + $this->view->assign("invoiceStatusList", $this->model->getInvoiceStatusList()); + + $this->view->assign("invoiceStatusListJson", json_encode($this->model->getInvoiceStatusList(), JSON_UNESCAPED_UNICODE)); + } @@ -305,6 +309,7 @@ class Order extends Backend if(isset($param['ids']))$ids = $param['ids']; $order = \app\common\model\school\activity\order\Order::getHaveOrder($ids); + \app\common\model\school\activity\order\Order::orderRefund($order,$order['sub_refundprice'],'admin',$this->auth->id,true,true); diff --git a/application/admin/controller/user/invoice/Apply.php b/application/admin/controller/user/invoice/Apply.php index 43bac1c..3bbdfac 100644 --- a/application/admin/controller/user/invoice/Apply.php +++ b/application/admin/controller/user/invoice/Apply.php @@ -17,11 +17,14 @@ class Apply extends Backend * @var \app\admin\model\user\invoice\Apply */ protected $model = null; + protected $qSwitch = true; + protected $qFields = ["user_id"]; public function _initialize() { - parent::_initialize(); $this->model = new \app\admin\model\user\invoice\Apply; + parent::_initialize(); + $this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("applyTypeList", $this->model->getApplyTypeList()); $this->view->assign("headTypeList", $this->model->getHeadTypeList()); diff --git a/application/admin/controller/user/invoice/Header.php b/application/admin/controller/user/invoice/Header.php index 5d1dc39..476d962 100644 --- a/application/admin/controller/user/invoice/Header.php +++ b/application/admin/controller/user/invoice/Header.php @@ -17,11 +17,14 @@ class Header extends Backend * @var \app\admin\model\user\invoice\Header */ protected $model = null; + protected $qSwitch = true; + protected $qFields = ["user_id"]; public function _initialize() { - parent::_initialize(); $this->model = new \app\admin\model\user\invoice\Header; + parent::_initialize(); + $this->view->assign("headTypeList", $this->model->getHeadTypeList()); $this->view->assign("invoiceTypeList", $this->model->getInvoiceTypeList()); $this->view->assign("isDefaultList", $this->model->getIsDefaultList()); diff --git a/application/admin/model/school/activity/order/Order.php b/application/admin/model/school/activity/order/Order.php index 78336c2..6aec871 100644 --- a/application/admin/model/school/activity/order/Order.php +++ b/application/admin/model/school/activity/order/Order.php @@ -3,6 +3,7 @@ namespace app\admin\model\school\activity\order; use app\admin\model\school\activity\Activity; +use app\admin\model\user\invoice\Apply; use think\Model; use traits\model\SoftDelete; @@ -38,11 +39,28 @@ class Order extends Model 'finishtime_text', 'refundtime_text', 'auth_status_text', - 'refundsendtime_text' + 'refundsendtime_text', + 'invoice_status_text', ]; - - + public function getInvoiceStatusList() + { + return ['0' => __('未申请'), '1' => __('申请中'), '2' => __('已开票')]; + } + + + public function getInvoiceStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['invoice_status']) ? $data['invoice_status'] : ''); + $list = $this->getInvoiceStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + + public function getPayTypeList() { return ['yue' => __('Pay_type yue'), 'wechat' => __('Pay_type wechat')]; @@ -225,4 +243,10 @@ class Order extends Model { return $this->belongsTo(OrderDetail::class, 'activity_order_detail_id', 'id', [], 'LEFT')->setEagerlyType(0); } + + + public function invoiceapply(){ + return $this->belongsTo(Apply::class, 'user_invoice_apply_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + } diff --git a/application/admin/view/school/activity/order/order/index.html b/application/admin/view/school/activity/order/order/index.html index ec11ca3..123ab4c 100644 --- a/application/admin/view/school/activity/order/order/index.html +++ b/application/admin/view/school/activity/order/order/index.html @@ -4,7 +4,12 @@ {:build_heading(null,FALSE)} - +