From d18a46286f3871338b0d78e62613b8fc4e0a8b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 22 Mar 2021 15:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopGoods.php    |  7 +++++--
 app/data/controller/UserDiscount.php |  7 ++-----
 app/data/controller/UserUpgrade.php  |  3 +--
 app/data/service/ExpressService.php  | 12 ++++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/data/controller/ShopGoods.php b/app/data/controller/ShopGoods.php
index d69e60fe0..a08dce82a 100644
--- a/app/data/controller/ShopGoods.php
+++ b/app/data/controller/ShopGoods.php
@@ -2,7 +2,9 @@
 
 namespace app\data\controller;
 
+use app\data\service\ExpressService;
 use app\data\service\GoodsService;
+use app\data\service\UserUpgradeService;
 use think\admin\Controller;
 use think\admin\extend\CodeExtend;
 
@@ -152,11 +154,12 @@ class ShopGoods extends Controller
             $data['marks'] = str2arr($data['marks'] ?? '');
             $data['payment'] = str2arr($data['payment'] ?? '');
             $data['cateids'] = str2arr($data['cateids'] ?? '');
+            // 其他表单数据
             $this->marks = GoodsService::instance()->getMarkData();
             $this->cates = GoodsService::instance()->getCateData();
-            $this->trucks = $this->app->db->name('ShopTruckTemplate')->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('code,name', 'code');
+            $this->trucks = ExpressService::instance()->templates();
+            $this->upgrades = UserUpgradeService::instance()->levels();
             $this->payments = $this->app->db->name('ShopPayment')->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('type,code,name', 'code');
-            $this->upgrades = $this->app->db->name('DataUserUpgrade')->where(['status' => 1, 'deleted' => 0])->order('number asc,id desc')->column('number,name', 'id');
             $this->discounts = $this->app->db->name('DataUserDiscount')->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('id,name,items', 'id');
             // 商品规格处理
             $fields = 'goods_sku `sku`,goods_code,goods_spec `key`,price_selling `selling`,price_market `market`,number_virtual `virtual`,number_express `express`,reward_balance `balance`,reward_integral `integral`,status';
diff --git a/app/data/controller/UserDiscount.php b/app/data/controller/UserDiscount.php
index 801ba2ac0..d3b9a31e2 100644
--- a/app/data/controller/UserDiscount.php
+++ b/app/data/controller/UserDiscount.php
@@ -2,6 +2,7 @@
 
 namespace app\data\controller;
 
+use app\data\service\UserUpgradeService;
 use think\admin\Controller;
 
 /**
@@ -70,9 +71,6 @@ class UserDiscount extends Controller
     /**
      * 表单数据处理
      * @param array $vo
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     protected function _form_filter(array &$vo)
     {
@@ -84,8 +82,7 @@ class UserDiscount extends Controller
             }
             $vo['items'] = json_encode($rule, JSON_UNESCAPED_UNICODE);
         } else {
-            $query = $this->app->db->name('DataUserUpgrade');
-            $this->levels = $query->where(['status' => 1])->order('number asc')->select()->toArray();
+            $this->levels = UserUpgradeService::instance()->levels();
             if (empty($this->levels)) $this->error('未配置用户等级！');
             if (!empty($vo['items'])) foreach (json_decode($vo['items'], true) as $item) {
                 $vo["_level_{$item['level']}"] = $item['discount'];
diff --git a/app/data/controller/UserUpgrade.php b/app/data/controller/UserUpgrade.php
index 164fc8cad..be3d82e41 100644
--- a/app/data/controller/UserUpgrade.php
+++ b/app/data/controller/UserUpgrade.php
@@ -29,8 +29,7 @@ class UserUpgrade extends Controller
     public function index()
     {
         $this->title = '用户等级管理';
-        $query = $this->_query($this->table);
-        $query->where(['deleted' => 0])->order('number asc')->page();
+        $this->_query($this->table)->order('number asc')->page();
     }
 
     /**
diff --git a/app/data/service/ExpressService.php b/app/data/service/ExpressService.php
index f35a438c5..c9fe4634a 100644
--- a/app/data/service/ExpressService.php
+++ b/app/data/service/ExpressService.php
@@ -49,6 +49,18 @@ class ExpressService extends Service
         }
     }
 
+
+    /**
+     * 获取快递模板数据
+     * @return array
+     */
+    public function templates(): array
+    {
+        $map = ['status' => 1, 'deleted' => 0];
+        $query = $this->app->db->name('ShopTruckTemplate')->where($map);
+        return $query->order('sort desc,id desc')->column('code,name,normal,content', 'code');
+    }
+
     /**
      * 配送区域树型数据
      * @param integer $level 最大级别