diff --git a/application/admin/controller/Area.php b/application/admin/controller/Area.php new file mode 100644 index 0000000..89edbe1 --- /dev/null +++ b/application/admin/controller/Area.php @@ -0,0 +1,30 @@ +get('keyword'); + if (!$keyword){ + $this->success(data:[]); + }else{ + $data = model('area') + ->where('merge_name','like','%'.$keyword.'%') + ->where('level','=',3) + ->field('area_code, merge_name') + ->limit(0,10) + ->select(); + $this->success(data:$data); + } + } +} diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 94d7899..36cdcdb 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -73,7 +73,6 @@ class Order extends Backend if ($this->dataLimit && $this->dataLimitFieldAutoFill) { $params[$this->dataLimitField] = $this->auth->id; } - dd($params); $result = false; Db::startTrans(); try { @@ -83,6 +82,12 @@ class Order extends Backend $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; $this->model->validateFailException()->validate($validate); } + + $params['enter_admin_id'] = $this->auth->id; + $params['status'] = 10; + $params['order_no'] = $this->generateOrderNumber(); + + $result = $this->model->allowField(true)->save($params); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { @@ -94,4 +99,16 @@ class Order extends Backend } $this->success(); } + + function generateOrderNumber($prefix = 'ORD') { + // 获取当前时间戳(精确到毫秒) + $timestamp = microtime(true); + $date = date('YmdHis', (int)$timestamp); // 格式:YYYYMMDDHHMMSS + $randomNum = strtoupper(substr(md5($timestamp), 0, 4)); // 从时间戳生成一个随机字符串,取前四个字符 + + // 组合生成的订单编号 + $orderNumber = $prefix . $date . $randomNum; + + return $orderNumber; + } } diff --git a/application/admin/model/Area.php b/application/admin/model/Area.php new file mode 100644 index 0000000..68bc67c --- /dev/null +++ b/application/admin/model/Area.php @@ -0,0 +1,15 @@ + -