修改

addons/alisms/library/Alisms.php

@@ -2,6 +2,8 @@
 
 namespace addons\alisms\library;
 
+use think\Db;
+
 /**
  * 阿里大于SMS短信发送
  */
@@ -91,6 +93,12 @@ class Alisms
     {
         $this->error = '';
         $params = $this->_params();
+        Db::name('sms_record')->insert([
+           'receiver' => $params['PhoneNumbers'],
+           'content' => $params['TemplateParam'],
+           'template_id' => $params['TemplateCode'],
+        ]);
+        return true;
         $params['Signature'] = $this->_signed($params);
         $response = $this->_curl($params);
         if ($response !== false) {

application/admin/command/Test.php

@@ -4,6 +4,7 @@ namespace app\admin\command;
 
 use app\admin\addresmart\Address;
 use app\admin\controller\orders\DispatchLogic;
+use app\admin\controller\SendMailLogic;
 use app\admin\model\Order;
 use app\admin\model\OrderDispatch;
 use app\admin\model\OrderReview;
@@ -31,15 +32,10 @@ class Test extends Command
 
     protected function execute(Input $input, Output $output)
     {
-        $res = \app\common\library\Sms::notice('17381847364',[], 'start_worker');
-
-        $alisms = new \addons\alisms\library\Alisms();
-        $ret = $alisms->mobile('13038128325')
-            ->template('SMS_487375365')
-            ->sign('超邦手')
-            ->send();
-
+//        $ret = SendMailLogic::sendToCustomStart('13038128325','今日的风儿','173xxxxxxxx');
+        $ret = SendMailLogic::sendToCustomStop('17381847365');
         dd($ret);
+//        dd($ret);
 
 
     }

application/admin/controller/Order.php

@@ -43,7 +43,6 @@ class Order extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Order;
         $this->view->assign("statusList", $this->model->getStatusList());
-
         $sources = Db::name('source')
             ->where('status', 1)
             ->field(['id', 'title', 'key_word', 'pid'])
@@ -485,7 +484,8 @@ class Order extends Backend
     }
 
 
-    public function addAbnormal($ids = null){
+    public function addAbnormal($ids = null)
+    {
         if (false === $this->request->isPost()) {
 
             $abnormals = model('abnormal')->where('type', 1)->order('sort', 'desc')->select();
@@ -540,7 +540,8 @@ class Order extends Backend
     }
 
 
-    public function delete($ids = null){
+    public function delete($ids = null)
+    {
         if (false === $this->request->isPost()) {
 
             $options = \model('abnormal')->where('type', 2)->select();
@@ -557,42 +558,53 @@ class Order extends Backend
         }
         $params = $this->preExcludeFields($params);
 
+        $send_mail = $params['notify'] ?? false;
 
         $result = false;
         Db::startTrans();
-        try {
         $order = model('order')->get($params['order_id'], ['dispatch']);
         if (!$order) {
             $this->error('Not Find');
         }
+
+        try {
+
             $params['status'] = \app\admin\model\Order::STATUS_CANCEL;
+
+            unset($params['notify']);
+
             $result = $order->allowField(true)->save($params);
 
-            if(!empty($order->dispatch)){
+            if (!empty($order->dispatch->id)) {
                 $orderLogic = new OrderLogic();
                 $orderLogic->cancelOrderDispatch($order->dispatch, $this->auth, '订单被取消', false);
-            }
-
                 //日志
                 $hookparams['order'] = $order;
                 $hookparams['role'] = 1;
                 $hookparams['auth'] = $this->auth;
                 $hookparams['remark'] = $params['remark'] ?? '';
                 Hook::listen('order_change', $hookparams);
-
+            }
             Db::commit();
         } catch (ValidateException | PDOException | Exception $e) {
             Db::rollback();
             $this->error($e->getMessage());
         }
+
         if ($result === false) {
             $this->error(__('No rows were inserted'));
         }
+
+        if ($send_mail) {
+            SendMailLogic::sendToCustomStop($order->tel);
+        }
+
         $this->success();
     }
 
 
-    public function send($ids = null){
+    public function send($ids = null)
+    {
         if (false === $this->request->isPost()) {
 
             $options = \model('admin')->select();
@@ -660,6 +672,7 @@ class Order extends Backend
         // 重新索引数组
         return array_values($filtered_codes);
     }
+
     /**
      * 编辑
      *
@@ -668,7 +681,8 @@ class Order extends Backend
      * @throws DbException
      * @throws \think\Exception
      */
-    public function invoice($ids = null){
+    public function invoice($ids = null)
+    {
         if (false === $this->request->isPost()) {
             $order = model('order')->get($ids);
             return $this->fetch('order/invoice/add', ['row' => $order]);
@@ -698,7 +712,8 @@ class Order extends Backend
         $this->success();
     }
 
-    function findElementByValue($data, $targetValue, $path = []) {
+    function findElementByValue($data, $targetValue, $path = [])
+    {
         foreach ($data as $item) {
             // 将当前节点的 label 添加到路径中
             $newPath = array_merge($path, [$item['label']]);

application/admin/controller/SendMailLogic.php

@@ -0,0 +1,73 @@
+<?php
+
+
+namespace app\admin\controller;
+
+
+class SendMailLogic
+{
+
+
+    /**
+     * 给工人发送开始前短信
+     * @param $tel
+     * @return bool
+     */
+    public static function sendToWorker($toTel)
+    {
+        $config = get_addon_config('alisms');
+        if (!isset($config['template']['start_worker'])) {
+            return false;
+        }
+        $alisms = new \addons\alisms\library\Alisms();
+        $result = $alisms->mobile($toTel)
+            ->template($config['template']['start_worker'])
+            ->param([])
+            ->send();
+        return $result;
+    }
+
+    /**
+     * 给客户接单的信息
+     * @param $tel
+     * @return bool
+     */
+    public static function sendToCustomStart($toTel,$work_name,$work_tel)
+    {
+        $config = get_addon_config('alisms');
+        if (!isset($config['template']['start_custom'])) {
+            return false;
+        }
+        $alisms = new \addons\alisms\library\Alisms();
+        $result = $alisms->mobile($toTel)
+            ->template($config['template']['start_custom'])
+            ->param([
+                'name' => $work_name,
+                'phone' => $work_tel
+            ])
+            ->send();
+        return $result;
+    }
+
+
+    /**
+     * 给客户取消订单的信息
+     * @param $tel
+     * @return bool
+     */
+    public static function sendToCustomStop($toTel)
+    {
+        $config = get_addon_config('alisms');
+        if (!isset($config['template']['stop_custom'])) {
+            return false;
+        }
+        $alisms = new \addons\alisms\library\Alisms();
+        $result = $alisms->mobile($toTel)
+            ->template($config['template']['stop_custom'])
+            ->param()
+            ->send();
+        return $result;
+    }
+
+
+}

application/admin/controller/aftersales/Aftersale.php

@@ -175,12 +175,13 @@ class Aftersale extends Backend
             Message::create([
                 'to_id'         =>  $params['dispatch_admin_id'],
                 'type'          =>  1,
-                'title'         =>  '订单报错通知',
+                'title'         =>  '售后申请通知',
                 'content'       =>  '【售后申请通知】您有一条售后申请待处理，请前往订单售后界面进行处理！'
             ]);
 
             $result = $this->model->allowField(true)->save($params);
             $order->aftersale_id = $this->model->id;
+            $order->status = Order::STATUS_AFTERSALE;
             $order->save();
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {

application/admin/lang/zh-cn/order.php

@@ -21,6 +21,7 @@ return [
     'Status 50'          => '待结算',
     'Set status to 50'   => '设为待结算',
     'Status 60'          => '已完成',
+    'Status 70'          => '售后',
     'Set status to 60'   => '设为已完成',
     'Status -10'         => '取消',
     'Set status to -10'  => '设为取消',

application/admin/model/Order.php

@@ -55,18 +55,23 @@ class Order extends Model
     const STATUS_CHECKONCE = 41;         //审核未通过
     const STATUS_AUDITING = 50;         //审核中
     const STATUS_FINISHED = 60;         //已完成
+    const STATUS_AFTERSALE= 70;         //已完成
     const STATUS_CANCEL = -10;         //取消
 
 
 
 
+
     public function getStatusList()
     {
         return ['0' => __('Status 0'),'10' => __('Status 10'), '20' => __('Status 20'),
             //'30' => __('Status 30'),
             '40' => __('Status 40'),
             '41' => __('Status 41'),
-            '50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')];
+            '50' => __('Status 50'),
+            '60' => __('Status 60'),
+            '70' => __('Status 70'),
+            '-10' => __('Status -10')];
     }
 
 
@@ -186,6 +191,11 @@ class Order extends Model
         return $this->belongsTo(Admin::class,'admin_id',);
     }
 
+    public function admin(){
+        return $this->belongsTo(Admin::class,'admin_id',joinType: 'left')
+            ->setEagerlyType(0);
+    }
+
     public function item(){
         return $this->belongsTo(Item::class,'item_id',);
     }

application/admin/view/order/delete.html

@@ -31,6 +31,10 @@
         </div>
     </div>
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">短信通知客户: <input type="checkbox" name="row[notify]"> </label>
+    </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/order.js

@@ -91,6 +91,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                 "41": __('Status 41'),
                                 "50": __('Status 50'),
                                 "60": __('Status 60'),
+                                "70": __('Status 70'),
                                 "-10": __('Status -10'),
                                 /*"-20": __('Status -20'),
                                 "-30": __('Status -30')*/
@@ -199,7 +200,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                     extend: 'data-toggle="tooltip" data-container="body"',
                                     classname: 'btn btn-xs btn-info btn-editone',
                                     visible: function (row) {
-                                        if (row.status != 60) {
+                                        if (row.status != 60 &&  row.status != 70) {
                                             return true;
                                         }
                                         return false;
@@ -299,7 +300,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                         return false;
                                     },
                                     visible: function (row) {
-                                        if (row.status > 0) {
+                                        if (row.status == 10) {
                                             return true;
                                         }
                                         return false;
@@ -342,7 +343,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                     refresh:true,
                                     dropdown: "更多",
                                     visible: function (row) {
-                                        if (row.status != 60) {
+                                        if (row.status != 60 &&  row.status != 70) {
                                             return true;
                                         }
                                         return false;
@@ -358,7 +359,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                     dropdown: "更多",
 
                                     visible: function (row) {
-                                        if (row.status == 60) {
+                                        if (row.status == 60 || row.status == 70) {
                                             return true;
                                         }
                                         return false;
@@ -373,7 +374,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                     url: 'aftersales/aftersale/add',
                                     dropdown: "更多",
                                     visible: function (row) {
-                                        if (row.status!==-10) {
+                                        if (row.status !== -10 && row.status !== 70) {
                                             return true;
                                         }
                                         return false;

public/assets/js/backend/orders/invoice.js

@@ -60,7 +60,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             buttons:[
                                 {
                                     name: 'edit',
-                                    text: "修改",
+                                    text: "开票",
                                     icon: 'fa fa-pencil',
                                     title: __('Edit'),
                                     extend: 'data-toggle="tooltip" data-container="body"',