售后寄回

addons/shopro/controller/data/Express.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace addons\shopro\controller\data;
+
+use addons\shopro\controller\Common;
+use think\Db;
+
+/**
+ * 快递公司
+ */
+class Express extends Common
+{
+
+    protected $noNeedLogin = ['index'];
+    protected $noNeedRight = ['*'];
+
+
+
+
+
+    /**
+     * 查看
+     *
+     * @return string|Json
+     * @throws \think\Exception
+     * @throws DbException
+     */
+    public function index()
+    {
+        $model = new \app\admin\model\shopro\data\Express;
+
+        $list = $model->sheepFilter()->select();
+        $this->success('', null, $list);
+    }
+
+
+
+}

addons/shopro/controller/order/Aftersale.php

@@ -68,6 +68,21 @@ class Aftersale extends Common
             $content = $params['content'] ?? '';
             $images = $params['images'] ? json_decode(htmlspecialchars_decode($params['images']),true) : [];
 
+            //寄回信息
+            $express_id = $params['express_id'] ?? 0;
+            $express_no = $params['express_no'] ?? '';
+            if($type == 'return'){
+                if(!$express_id || !$express_no){
+                    error_stop('请输入快递公司和运单号');
+                }
+
+                $express = Db::name('shopro_data_express')->where('id',$express_id)->find();
+                if(!$express){
+                    error_stop('请输入快递公司和运单号');
+                }
+            }
+
+
             //订单状态：已支付，已完成
             $order = OrderModel::canAftersale()->where('user_id', $user->id)->lock(true)->where('id', $order_id)->find();
             if (!$order) {
@@ -112,6 +127,13 @@ class Aftersale extends Common
             $aftersale->refund_fee = 0;
             $aftersale->reason = $reason;
             $aftersale->content = $content;
+
+            if($type == 'return'){
+                $aftersale->express_name = $express['name'];
+                $aftersale->express_code = $express['code'];
+                $aftersale->express_no   = $express_no;
+            }
+
             $aftersale->save();
 
             // 增加售后单变动记录、