物流详情，全额退款原因，

addons/shopro/controller/order/Express.php

@@ -5,6 +5,7 @@ namespace addons\shopro\controller\order;
 use addons\shopro\controller\Common;
 use app\admin\model\shopro\order\Express as OrderExpressModel;
 use addons\shopro\library\express\Express as ExpressLib;
+use think\Db;
 //物流
 class Express extends Common
 {
@@ -20,11 +21,20 @@ class Express extends Common
         // 更新包裹信息（5分钟缓存）
         (new ExpressLib)->updateOrderExpress($order_id);
 
-        $expresses = OrderExpressModel::with(['logs', 'items' => function ($query) use ($order_id) {
+        $expresses = OrderExpressModel::with(['logs'/*, 'items' => function ($query) use ($order_id) {
             return $query->where('order_id', $order_id);
-        }])->where('user_id', $user->id)->where('order_id', $order_id)->select();
+        }*/])->where('user_id', $user->id)->where('order_id', $order_id)->select();
 
-        $this->success('获取成功', $expresses);
+        $address = Db::name('shopro_order_address')->where('order_id',$order_id)->find();
+        $order_sn  = Db::name('shopro_order')->where('id',$order_id)->value('order_sn');
+
+        $result = [
+            'order_sn' => $order_sn,
+            'address' => $address,
+            'expresses' => $expresses,
+        ];
+
+        $this->success('获取成功', $result);
     }
 
 

addons/shopro/controller/order/Order.php

@@ -253,15 +253,16 @@ class Order extends Common
     {
         $user = auth_user();
         $id = $this->request->param('id');
+        $reason = $this->request->param('reason');
 
         $order = OrderModel::paid()->where('user_id', $user->id)->where('id', $id)->find();
         if (!$order) {
             $this->error(__('No Results were found'));
         }
 
-        $order = Db::transaction(function () use ($order, $user) {
+        $order = Db::transaction(function () use ($order, $user, $reason) {
             $orderOper = new OrderOper();
-            $order = $orderOper->applyRefund($order, $user, 'user');
+            $order = $orderOper->applyRefund($order, $user, 'user',$reason);
 
             return $order;
         });

addons/shopro/service/order/OrderOper.php

@@ -78,7 +78,7 @@ class OrderOper
      * @param string $type
      * @return object
      */
-    public function applyRefund($order, $user, $type = 'user')
+    public function applyRefund($order, $user, $type = 'user',$reason = '')
     {
         $items = OrderItem::where('order_id', $order->id)->lock(true)->select();
 
@@ -99,7 +99,7 @@ class OrderOper
         $order->ext = array_merge($order->ext, ['apply_refund_time' => time()]);      // 申请时间
         $order->save();
 
-        Action::add($order, null, $user, $type, $this->getOperText($type) . '申请全额退款');
+        Action::add($order, null, $user, $type, $this->getOperText($type) . '申请全额退款。' . $reason);
 
         // 订单申请全额退款  orderApplyRefundAfter
         $data = ['order' => $order, 'user' => $user];